Merge remote-tracking branch 'origin/dev' into dev

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

@@ -143,16 +143,32 @@ public class KwpSettlementLogisticsService {
         settlementReq.setEntId(LoginUserHolder.getEntId());
     }
 
+    /**
+     * 分页查询结算物流(运费)相关订单数据，并查询出对应合计
+     *
+     * @author Aick Spt
+     * @date 2023-08-03 10:29
+     */
     private PageMoreRes<SettlementLogisticsDto> pageSelect(SettlementReq settlementReq) {
+        //验证相关参数
         validSettlementReq(settlementReq);
+        //添加默认分页数据
         PageHelper.startPage(settlementReq.getPage(), settlementReq.getPageSize());
+        //查询分页数据
         List<SettlementLogisticsDto> kwpLedgerLogisticsList = settlementLogisticsMapper.pageSelect(settlementReq);
+        //查询同样条件下的合计
         SettlementLogisticsSumVo settlementLogisticsSum = settlementLogisticsMapper.selectSum(settlementReq);
 
-        // 对查询结果进行处理，转换 status 到 desc
+        // 对查询结果进行处理，转换 status 等状态值为对应中文描述
         return new PageMoreRes<>(getSettlementLogisticsDtoPageRes(kwpLedgerLogisticsList), settlementLogisticsSum);
     }
 
+    /**
+     * 对查询结果进行处理，转换 status 等状态值为对应中文描述
+     *
+     * @author Aick Spt
+     * @date 2023-08-03 10:44
+     */
     private PageInfo<SettlementLogisticsDto> getSettlementLogisticsDtoPageRes(List<SettlementLogisticsDto> kwpLedgerLogisticsList) {
         for (SettlementLogisticsDto entity : kwpLedgerLogisticsList) {
             setDetailDesc(entity);
@@ -160,6 +176,12 @@ public class KwpSettlementLogisticsService {
         return new PageInfo<>(kwpLedgerLogisticsList);
     }
 
+    /**
+     * 根据条件获取列表头部汇总数据
+     *
+     * @author Aick Spt
+     * @date 2023-08-03 10:44
+     */
     public List<TableTop> getCountList(SettlementReq settlementReq) {
         validSettlementReq(settlementReq);
         SettlementLogisticsStatusCountVo settlementLogisticsStatusCountVos = new SettlementLogisticsStatusCountVo();
@@ -201,6 +223,12 @@ public class KwpSettlementLogisticsService {
         return tableTops;
     }
 
+    /**
+     * 运费-物流订单详情
+     *
+     * @author Aick Spt
+     * @date 2023-08-07 10:14
+     */
     private SettlementLogisticsDto detail(Long id, Integer unitType) {
         SettlementLogisticsDto settlementLogisticsDto = settlementLogisticsMapper.detail(id, unitType);
         if (settlementLogisticsDto == null) {
@@ -210,6 +238,12 @@ public class KwpSettlementLogisticsService {
         return settlementLogisticsDto;
     }
 
+    /**
+     * 增加 创建、更新人名称及字段
+     *
+     * @author Aick Spt
+     * @date 2023-08-07 10:14
+     */
     private void setDetailDesc(SettlementLogisticsDto settlementLogisticsDto) {
         settlementLogisticsDto.setStatusText(SettlementEnum.getStatusDesc(settlementLogisticsDto.getStatus()));
         if (settlementLogisticsDto.getLedgerSettlePrice() != null) {
@@ -229,18 +263,22 @@ public class KwpSettlementLogisticsService {
         Long updateBy = settlementLogisticsDto.getUpdateBy();
         UserCacheResDto userCacheResDto = map.get(createBy);
         if (Objects.isNull(userCacheResDto)) {
+            //通过缓存拿对应数据
             userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
             map.put(createBy, userCacheResDto);
         }
         if (Objects.nonNull(userCacheResDto)) {
+            //写入对应数据
             settlementLogisticsDto.setCreateByText(userCacheResDto.getName());
         }
         userCacheResDto = map.get(updateBy);
         if (Objects.isNull(userCacheResDto)) {
+            //通过缓存拿对应数据
             userCacheResDto = remoteSystemService.queryUserCacheById(updateBy);
             map.put(updateBy, userCacheResDto);
         }
         if (Objects.nonNull(userCacheResDto)) {
+            //写入对应数据
             settlementLogisticsDto.setUpdateByText(userCacheResDto.getName());
         }
     }

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

@@ -72,13 +72,13 @@ public class KwpSettlementOfflineService {
      */
     public PageRes<SettlementOfflineVo> pageListLogisticsCollection(SettlementOfflineReq settlementOfflineReq) {
         PageHelper.startPage(settlementOfflineReq.getPage(), settlementOfflineReq.getPageSize());
-
+        //查询对应数据
         List<SettlementOfflineDto> settlementOfflineLogisticsList = settlementOfflineMapper.pageListLogisticsCollection(settlementOfflineReq);
 
         if (CollectionUtils.isEmpty(settlementOfflineLogisticsList)) {
             return new PageRes<>(new PageInfo<>());
         }
-
+        //增加对应创建人和更新人名称
         for (SettlementOfflineDto entity : settlementOfflineLogisticsList) {
             entity.setCreateByText("创建人名称");
             entity.setUpdateByText("更新人名称");

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

@@ -88,7 +88,7 @@ public class KwpSettlementWalletService {
         if (CollectionUtils.isEmpty(settlementWalletLogisticsList)) {
             return new PageRes<>();
         }
-
+        //增加对应创建人和更新人名称
         for (SettlementWalletDto entity : settlementWalletLogisticsList) {
             entity.setCreateByText("创建人名称");
             entity.setUpdateByText("更新人名称");
@@ -374,6 +374,7 @@ public class KwpSettlementWalletService {
         if (CollectionUtils.isEmpty(settlementWalletDto)) {
             return new PageRes<>();
         }
+        //增加对应创建人和更新人名称
         Map<Long, UserCacheResDto> map = new HashMap<>();
         PageInfo<SettlementWalletDto> pageInfo = new PageInfo<>(settlementWalletDto);
         //指定返回值

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/utils/CommonValidator.java

@@ -1,9 +1,19 @@
 package com.sckw.payment.utils;
 
 import com.sckw.core.exception.BusinessException;
+import com.sckw.payment.model.constant.SettlementEnum;
+import com.sckw.payment.model.dto.SettlementLogisticsDto;
+import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.poi.ss.formula.functions.T;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
@@ -15,6 +25,8 @@ public class CommonValidator {
 
     // 时间格式的正则表达式
     private static final String TIME_PATTERN = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}";
+    @DubboReference(version = "2.0.0", group = "design", check = false)
+    private RemoteSystemService remoteSystemService;
 
     /**
      * 判断时间段的开始时间和结束时间是否同时存在或同时不存在，且格式为 yyyy-MM-dd HH:mm:ss