修改汇总头部和其他过滤信息

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

@@ -26,7 +26,7 @@ public class KwpSettlementOfflineController {
     //  =========  运费收款  =========
 
     @PostMapping(name = "物流-线下付款(运费收款)记录-列表", path = "pageListLogisticsCollection")
-    public HttpResult pageListLogisticsCollection(@RequestBody @Valid SettlementOfflineReq settlementOfflineReq) {
+    public HttpResult pageListLogisticsCollection(SettlementOfflineReq settlementOfflineReq) {
         return HttpResult.ok(kwpSettlementOfflineService.pageListLogisticsCollection(settlementOfflineReq));
     }
 

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

@@ -12,14 +12,39 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SettlementOfflineReq extends BasePara {
+//    /**
+//     * 结算单id
+//     */
+//    @NotBlank(message = "结算单id不能为空")
+//    private String id;
+//
+//    /**
+//     * 订单类型 1-物流 2-贸易
+//     */
+//    private Integer orderType;
+
+
+
     /**
-     * 结算单id
+     * 交易方式
      */
-    @NotBlank(message = "结算单id不能为空")
-    private String id;
+    private String trading;
 
     /**
-     * 订单类型 1-物流 2-贸易
+     * 支付方式 预付款、货到付款
+     */
+    private Integer payType;
+    /**
+     * 订单类型  1-物流 2-贸易
      */
     private Integer orderType;
+    /**
+     * 结算单id
+     */
+    @NotBlank(message = "结算单id不能为空")
+    private String id;
+
+
+
+
 }

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

@@ -3,6 +3,7 @@ package com.sckw.payment.service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.utils.StringTimeUtil;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.dao.KwpSettlementLogisticsMapper;
@@ -26,10 +27,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -54,7 +52,7 @@ public class KwpSettlementLogisticsService {
      * @author Aick Spt
      * @date 2023-07-24 16:21
      */
-    public SettlementLogisticsStatusCountVo getCountListCollection(SettlementReq settlementReq) {
+    public List<TableTop> getCountListCollection(SettlementReq settlementReq) {
         settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
         return getCountList(settlementReq);
     }
@@ -65,7 +63,7 @@ public class KwpSettlementLogisticsService {
      * @author Aick Spt
      * @date 2023-07-24 16:23
      */
-    public SettlementLogisticsStatusCountVo getCountListPayment(SettlementReq settlementReq) {
+    public List<TableTop> getCountListPayment(SettlementReq settlementReq) {
         settlementReq.setUnitType(LogisticsUnitType.CARRIER);
         return getCountList(settlementReq);
     }
@@ -165,30 +163,45 @@ public class KwpSettlementLogisticsService {
         return new PageInfo<>(kwpLedgerLogisticsList);
     }
 
-    public SettlementLogisticsStatusCountVo getCountList(SettlementReq settlementReq) {
+    public List<TableTop> getCountList(SettlementReq settlementReq) {
         validSettlementReq(settlementReq);
         SettlementLogisticsStatusCountVo settlementLogisticsStatusCountVos = new SettlementLogisticsStatusCountVo();
 
         //加上当前登录者顶级企业id用于过滤数据
         settlementReq.setEntId(LoginUserHolder.getEntId());
 
+        List<TableTop> tableTops = new ArrayList<>();
+        TableTop tableTop = new TableTop();
         //总
         settlementReq.setStatus(null);
         settlementLogisticsStatusCountVos.setAllCount(settlementLogisticsMapper.getCountList(settlementReq));
+        tableTop.setName("全部").setValue(settlementReq.getStatus()).setTotal(Math.toIntExact(settlementLogisticsStatusCountVos.getAllCount()));
+        tableTops.add(tableTop);
 
         //待结算
         settlementReq.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());
-        settlementLogisticsStatusCountVos.setWaitingPaymentCount(settlementLogisticsMapper.getCountList(settlementReq));
+//        settlementLogisticsStatusCountVos.setWaitingPaymentCount(settlementLogisticsMapper.getCountList(settlementReq));
+        Long a = settlementLogisticsMapper.getCountList(settlementReq);
+        settlementLogisticsStatusCountVos.setWaitingPaymentCount(a);
+        TableTop tableTop1 = new TableTop();
+        tableTop1.setName("待结算").setValue(SettlementEnum.WAITING_PAYMENT.getStatus()).setTotal(Math.toIntExact(a));
+        tableTops.add(tableTop1);
 
         //部分结算
         settlementReq.setStatus(SettlementEnum.PARTIAL_PAYMENT.getStatus());
         settlementLogisticsStatusCountVos.setPartialPaymentCount(settlementLogisticsMapper.getCountList(settlementReq));
+        TableTop tableTop2 = new TableTop();
+        tableTop2.setName("部分结算").setValue(SettlementEnum.PARTIAL_PAYMENT.getStatus()).setTotal(Math.toIntExact(settlementLogisticsStatusCountVos.getPartialPaymentCount()));
+        tableTops.add(tableTop2);
 
         //全部结算
         settlementReq.setStatus(SettlementEnum.ALL_PAYMENT.getStatus());
         settlementLogisticsStatusCountVos.setAllPaymentCount(settlementLogisticsMapper.getCountList(settlementReq));
+        TableTop tableTop3 = new TableTop();
+        tableTop3.setName("全部结算").setValue(SettlementEnum.ALL_PAYMENT.getStatus()).setTotal(Math.toIntExact(settlementLogisticsStatusCountVos.getAllPaymentCount()));
+        tableTops.add(tableTop3);
 
-        return settlementLogisticsStatusCountVos;
+        return tableTops;
     }
 
     private SettlementLogisticsDto detail(Long id, Integer unitType) {

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

@@ -81,11 +81,6 @@ public class KwpSettlementOfflineService {
      * @date 2023-07-26 17:15
      */
     public PageRes<SettlementOfflineVo> pageListLogisticsCollection(SettlementOfflineReq settlementOfflineReq) {
-//        //todo 查询缓存，获取客户企业id
-//        String keywords = settlementReq.getKeywords();
-//        if (StringUtils.isNotBlank(keywords)) {
-//            System.out.println("关键之：" + keywords);
-//        }
         PageHelper.startPage(settlementOfflineReq.getPage(), settlementOfflineReq.getPageSize());
 
         List<SettlementOfflineDto> settlementOfflineLogisticsList = settlementOfflineMapper.pageListLogisticsCollection(settlementOfflineReq);
@@ -153,6 +148,12 @@ public class KwpSettlementOfflineService {
         Long id = offlinePaymentReq.getIdLong();
         BigDecimal price = offlinePaymentReq.getPrice();
         String url = offlinePaymentReq.getUrl();
+        if (id == 0) {
+            throw new BusinessException("结算参数ID必填");
+        }
+        if (price == null || price.compareTo(BigDecimal.ZERO) == 0) {
+            throw new BusinessException("结算参数金额必填");
+        }
         if (StringUtils.isBlank(url)) {
             throw new BusinessException("附件必传");
         }

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

@@ -147,9 +147,15 @@ public class KwpSettlementWalletService {
     public Integer confirmLogisticsPayment(OfflinePaymentReq offlinePaymentReq) {
         Long id = offlinePaymentReq.getIdLong();
         BigDecimal price = offlinePaymentReq.getPrice();
+        if (id == 0) {
+            throw new BusinessException("结算参数ID必填");
+        }
+        if (price == null || price.compareTo(BigDecimal.ZERO) == 0) {
+            throw new BusinessException("结算参数金额必填");
+        }
+
         //先查询出结算单情况
         SettlementLogisticsDto settlementLogisticsDto = kwpSettlementLogisticsService.detailPayment(id);
-        log.info(String.valueOf(settlementLogisticsDto));
         //检查结算单状态和所差金额
         if (settlementLogisticsDto == null) {
             log.error("非法请求，查无数据：" + id);

sckw-modules/sckw-system/src/main/resources/bootstrap-pdy.yml

@@ -0,0 +1,24 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 10.10.10.230:8848
+        # 命名空间
+        namespace: sckw_pdy
+        # 共享配置
+        group: sckw-service-platform
+      config:
+        # 配置中心地址
+        server-addr: 10.10.10.230:8848
+        # 配置文件格式
+        file-extension: yaml
+        # 命名空间
+        namespace: sckw_pdy
+        # 共享配置
+        group: sckw-service-platform
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true