修改了物流结算确认收款、付款相关代码逻辑

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementOfflineController.java

@@ -28,6 +28,7 @@ public class KwpSettlementOfflineController {
 
     @PostMapping(name = "物流-线下付款(运费收款)记录-列表", path = "pageListLogisticsCollection")
     public HttpResult pageListLogisticsCollection(SettlementOfflineReq settlementOfflineReq) {
+        settlementOfflineReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
         return HttpResult.ok(kwpSettlementOfflineService.pageListLogisticsCollection(settlementOfflineReq));
     }
 
@@ -38,6 +39,7 @@ public class KwpSettlementOfflineController {
 
     @PostMapping(name = "物流-线下付款(运费收款)记录-新增", path = "confirmLogisticsCollection")
     public HttpResult confirmLogisticsCollection(@RequestBody @Valid OfflinePaymentReq offlinePaymentReq) {
+        offlinePaymentReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
         return HttpResult.ok(kwpSettlementOfflineService.confirmLogisticsCollection(offlinePaymentReq));
     }
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementWalletController.java

@@ -2,6 +2,7 @@ package com.sckw.payment.controller;
 
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
+import com.sckw.payment.model.constant.SettlementPayTypeEnum;
 import com.sckw.payment.model.constant.SettlementWalletPayTypeEnum;
 import com.sckw.payment.model.vo.req.OfflinePaymentReq;
 import com.sckw.payment.model.vo.req.SettlementWalletReq;
@@ -32,6 +33,8 @@ public class KwpSettlementWalletController {
 
     @PostMapping(name = "物流-电子钱包付款（货到付款）结算记录-列表", path = "pageListLogisticsPayment")
     public HttpResult pageListLogisticsPayment(SettlementWalletReq settlementWalletReq) {
+        settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
+        settlementWalletReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
         return HttpResult.ok(kwpSettlementWalletService.pageListLogisticsPayment(settlementWalletReq));
     }
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/OfflinePaymentReq.java

@@ -3,6 +3,7 @@ package com.sckw.payment.model.vo.req;
 import com.sckw.core.model.vo.BasePara;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
@@ -21,22 +22,26 @@ public class OfflinePaymentReq extends BasePara {
     @Serial
     private static final long serialVersionUID = -4568239842231210898L;
 
+    private Integer orderType;
+
     /**
      * 结算单id
      */
-    @NotBlank
+    @NotBlank(message = "结算单id不能为空")
     private String id;
 
     /**
      * 付款金额
      */
-    @NotNull
+    @NotNull(message = "结算单金额不能为空")
+    @Positive(message = "结算金额必须大于0")
     private BigDecimal price;
 
 
     /**
      * 附件地址
      */
+    @NotBlank(message = "相关附件不能为空")
     private String url;
 
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/SettlementOfflinePayReq.java

@@ -29,7 +29,7 @@ public class SettlementOfflinePayReq implements IdsList, Serializable {
     @NotNull(message = "结算单金额不能为空")
     @Positive(message = "结算金额必须大于0")
     private BigDecimal payPrice;
-    @NotBlank(message = "相关附近不能为空")
+    @NotBlank(message = "相关附件不能为空")
     private String url;
 
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementOfflineService.java

@@ -73,7 +73,7 @@ public class KwpSettlementOfflineService {
     public PageRes<SettlementOfflineVo> pageListLogisticsCollection(SettlementOfflineReq settlementOfflineReq) {
         PageHelper.startPage(settlementOfflineReq.getPage(), settlementOfflineReq.getPageSize());
         //查询对应数据
-        List<SettlementOfflineDto> settlementOfflineLogisticsList = settlementOfflineMapper.pageListLogisticsCollection(settlementOfflineReq);
+        List<SettlementOfflineDto> settlementOfflineLogisticsList = settlementOfflineMapper.pageList(settlementOfflineReq);
 
         if (CollectionUtils.isEmpty(settlementOfflineLogisticsList)) {
             return new PageRes<>(new PageInfo<>());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementWalletService.java

@@ -78,7 +78,6 @@ public class KwpSettlementWalletService {
      * @date 2023-07-26 16:43
      */
     public PageRes<SettlementWalletVo> pageListLogisticsPayment(SettlementWalletReq settlementWalletReq) {
-        settlementWalletReq.setPayType(SettlementPayTypeEnum.CASH_ON_DELIVERY.getStatus());//只筛选 货到付款
         PageHelper.startPage(settlementWalletReq.getPage(), settlementWalletReq.getPageSize());
         List<SettlementWalletDto> settlementWalletLogisticsList = settlementWalletMapper.pageListLogisticsPayment(settlementWalletReq);
         PageInfo<SettlementWalletDto> pageInfo = new PageInfo<>(settlementWalletLogisticsList);
@@ -220,7 +219,7 @@ public class KwpSettlementWalletService {
             kwpSettlementWallet.setUpdateTime(LocalDateTime.now());
             kwpSettlementWallet.setDelFlag(0);
             Integer insertKwpSettlementWallet = settlementWalletMapper.insert(kwpSettlementWallet);
-
+            log.info("新增一条电子钱包结算记录：" + insertKwpSettlementWallet);
             //物流货到付款电子钱包逻辑
             //todo 待处理费电子钱包逻辑