办卡清费

src/main/java/com/qmrb/system/controller/OrderController.java

@@ -1,6 +1,7 @@
 package com.qmrb.system.controller;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -105,8 +106,18 @@ public class OrderController extends CommonController {
             @ParameterObject PayOrderQuery queryParams
     ) {
         if(StrUtil.isNotBlank(queryParams.getUserId())){
-            Page<PayOrderVO> result = orderService.getPageByUserId(queryParams);
-            return PageResult.success(result);
+            Page<PayOrderVO> pageResult = orderService.getPageByUserId(queryParams);
+            if(CollectionUtil.isNotEmpty(pageResult.getRecords())){
+                List<PayOrderVO> list = pageResult.getRecords().stream().map(item -> {
+                    Integer amountsPayable = item.getAmountsPayable();
+                    if (amountsPayable != null) {
+                        item.setAmountActuallyPaid(new BigDecimal(amountsPayable).divide(new BigDecimal(100)));
+                    }
+                    return item;
+                }).collect(Collectors.toList());
+                pageResult.setRecords(list);
+            }
+            return PageResult.success(pageResult);
         }
         
         return PageResult.success(null);

src/main/java/com/qmrb/system/pojo/entity/CarParkStoredCard.java

@@ -57,12 +57,14 @@ public class CarParkStoredCard extends BaseEntity{
      * 开始时间
      */
     @TableField("start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 过期时间
      */
     @TableField("end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     /**

src/main/java/com/qmrb/system/pojo/query/BarnRecordQuery.java

@@ -98,4 +98,10 @@ public class BarnRecordQuery extends BasePageQuery{
      */
     @Schema(description = "状态",type="Integer")
     private Integer status;
+
+    /**
+     * 缴费模式
+     * true: 办卡清算
+     */
+    private Boolean isMonthlyCardMode;
 }

src/main/java/com/qmrb/system/service/impl/BarnRecordServiceImpl.java

@@ -142,9 +142,17 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
             }else{
                 record.setBillingAmount(record.getReceivedAmount());
             }
-            barnRecords.add(record);
+            if(queryParams.getIsMonthlyCardMode()){
+                if(record.getPendingAmount().compareTo(BigDecimal.ZERO) > 0){
+                    barnRecords.add(record);
+                }
+            }else{
+                barnRecords.add(record);
+            }
+            
         }
         pageResult.setRecords(barnRecords);
+        pageResult.setTotal(barnRecords.size());
         return pageResult;
     }
 

src/main/java/com/qmrb/system/service/impl/OrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmrb.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.text.StrFormatter;
@@ -60,8 +61,10 @@ import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 
 /**
  * <p>