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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/constant/Global.java

@@ -36,7 +36,9 @@ public class Global {
     public static final int SHOW = 1;
     public static final int HIDE = 0;
     public static final int MINUS_ONE = -1;
-
+    /*正常/删除*/
+    public static final int DELETED = 1;
+    public static final int UN_DELETED = 0;
     /**是/否*/
     public static final int YES = 1;
     public static final int NO = 0;

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/DateUtil.java

@@ -40,6 +40,11 @@ public class DateUtil {
         return LocalDateTime.now().format(DateTimeFormatter.ofPattern(pattern));
     }
 
+    /**
+     * 2023-07-14T09:43:40.511+00:00 -> 2023-07-14 09:13:40
+     * @param date
+     * @return
+     */
     public static String getDateTime(Date date) {
         Instant instant = date.toInstant();
         ZoneId zoneId = ZoneId.systemDefault();
@@ -47,6 +52,18 @@ public class DateUtil {
         return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
     }
 
+    /**
+     * data
+     * @param date  Date 时间
+     * @return
+     * @throws ParseException
+     */
+    public static String dateTimeFormatter(Date date){
+        String format = new SimpleDateFormat(DEFAULT_DATE_PATTERN).format(date);
+        return format;
+    }
+
+
     public static String dateToStr(LocalDate date) {
         return dateToStr(date, "yyyy-MM-dd");
     }

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwLogisticsOrder.java

@@ -1,12 +1,13 @@
 package com.sckw.mongo.model;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -397,6 +398,8 @@ public class SckwLogisticsOrder {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -412,6 +415,8 @@ public class SckwLogisticsOrder {
     /**
      * 更新时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/dubbo/TradeOrderInfoService.java

@@ -1,10 +1,7 @@
 package com.sckw.order.api.dubbo;
 
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.order.api.model.ContractSignCompletedParam;
-import com.sckw.order.api.model.OrderDetailRes;
-import com.sckw.order.api.model.UpdateOrderAmountParam;
-import com.sckw.order.api.model.UpdateOrderStatusParam;
+import com.sckw.order.api.model.*;
 
 /**
  * @desc: 贸易订单信息相关dubbo
@@ -32,6 +29,7 @@ public interface TradeOrderInfoService {
     HttpResult updateOrderStatus(UpdateOrderStatusParam param);
 
     /**
+     * @desc: 已废弃，请用orderAmountUpdate
      * @desc: 更新订单委托量、已履约量
      * @author: yzc
      * @date: 2023-07-18 18:34
@@ -40,6 +38,23 @@ public interface TradeOrderInfoService {
      */
     HttpResult updateOrderAmount(UpdateOrderAmountParam param);
 
+    /**
+     * @desc: 生成或撤销物流订单
+     * @author: yzc
+     * @date: 2023-08-03 10:57
+     * @Param param:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    HttpResult createOrCancelLogisticsOrder(CreateOrCancelLogisticsOrderParam param);
+    /**
+     * @desc: 完结物流订单
+     * @author: yzc
+     * @date: 2023-08-03 11:11
+     * @Param param:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    HttpResult completeLogisticsOrder(CompleteLogisticsOrderParam param);
+
     /**
      * @desc: 合同签约完成
      * @author: yzc

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/CompleteLogisticsOrderParam.java

@@ -0,0 +1,55 @@
+package com.sckw.order.api.model;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @desc: 更新订单委托量、已履约量
+ * @author: yzc
+ * @date: 2023-08-03 10:52
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class CompleteLogisticsOrderParam implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 8425395587373735142L;
+
+    /**
+     * 订单id
+     */
+    private Long tOrderId;
+
+    /**
+     * 任务量  传负数
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 实装量 传正数
+     */
+    private BigDecimal actualLoadAmount;
+
+    /**
+     * 实卸量  传正数
+     */
+    private BigDecimal actualUnloadAmount;
+
+    /**
+     * 更新用户id 需传，订单状态变化记录需要
+     */
+    private Long updateBy;
+
+    /**
+     * 更新者姓名 需传，订单状态变化记录需要
+     */
+    private String updateByName;
+
+}

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/CreateOrCancelLogisticsOrderParam.java

@@ -0,0 +1,45 @@
+package com.sckw.order.api.model;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @desc: 更新订单委托量、已履约量
+ * @author: yzc
+ * @date: 2023-08-03 10:52
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class CreateOrCancelLogisticsOrderParam implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 8425395587373735142L;
+
+    /**
+     * 订单id
+     */
+    private Long tOrderId;
+
+    /**
+     * 任务量  生成物流订单传正数，撤销物流订单传负数
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 更新用户id 需传，订单状态变化记录需要
+     */
+    private Long updateBy;
+
+    /**
+     * 更新者姓名 需传，订单状态变化记录需要
+     */
+    private String updateByName;
+
+}

sckw-modules/sckw-order/src/main/java/com/sckw/order/dubbo/TradeOrderInfoServiceImpl.java

@@ -10,10 +10,7 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.mongo.model.SckwTradeOrder;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
-import com.sckw.order.api.model.ContractSignCompletedParam;
-import com.sckw.order.api.model.OrderDetailRes;
-import com.sckw.order.api.model.UpdateOrderAmountParam;
-import com.sckw.order.api.model.UpdateOrderStatusParam;
+import com.sckw.order.api.model.*;
 import com.sckw.order.model.KwoTradeOrder;
 import com.sckw.order.model.KwoTradeOrderContract;
 import com.sckw.order.model.KwoTradeOrderTrack;
@@ -92,19 +89,30 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
         SckwTradeOrder updateParam = new SckwTradeOrder();
         updateParam.setTOrderId(order.getId()).setStatus(order.getStatus()).setUpdateBy(param.getUpdateBy())
                 .setUpdateByName(param.getUpdateByName()).setUpdateTime(new Date());
-        saveMongoDb(3, updateParam);
+        saveMongoDb(updateParam);
         return HttpResult.ok();
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public HttpResult updateOrderAmount(UpdateOrderAmountParam param) {
-        if (Objects.isNull(param.getUpdateBy()) || StringUtils.isBlank(param.getUpdateByName())) {
-            return HttpResult.error("操作人信息不能为空!");
-        }
+        return HttpResult.ok();
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult createOrCancelLogisticsOrder(CreateOrCancelLogisticsOrderParam param) {
         Long id = param.getTOrderId();
+        BigDecimal entrustAmount = param.getEntrustAmount();
         Long updateBy = param.getUpdateBy();
-        String lockKey = String.format(RedisConstant.GOODS_UPDATE_AMOUNT_KEY, id);
+        String updateByName = param.getUpdateByName();
+        if (Objects.isNull(updateBy) || StringUtils.isBlank(updateByName)) {
+            return HttpResult.error("操作人信息不能为空!");
+        }
+        if (Objects.isNull(entrustAmount)) {
+            return HttpResult.error("任务量不能为空!");
+        }
+        String lockKey = String.format(RedisConstant.TORDER_UPDATE_AMOUNT_KEY, id);
         if (Boolean.FALSE.equals(RedissonUtils.tryLock(lockKey, 10L, 30L))) {
             return HttpResult.error("业务繁忙，请稍后再试!");
         }
@@ -116,40 +124,76 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
             if (!Objects.equals(String.valueOf(order.getStatus()), DictEnum.TORDER_STATUS_4.getValue())) {
                 return HttpResult.error("执行中的订单才可物流托运！");
             }
-            BigDecimal amount = order.getAmount();
-            BigDecimal addEntrustAmount = order.getEntrustAmount();
-            if (Objects.nonNull(param.getEntrustAmount())) {
-                addEntrustAmount = addEntrustAmount.add(param.getActualAmount());
-                if (amount.compareTo(addEntrustAmount) < 0) {
-                    return HttpResult.error("物流已委托总量不可大于订单总量！");
-                }
+            BigDecimal totalEntrustAmount = Objects.isNull(order.getEntrustAmount()) ? entrustAmount : entrustAmount.add(order.getEntrustAmount());
+            if (order.getAmount().compareTo(totalEntrustAmount) < 0) {
+                return HttpResult.error("物流已委托总量不可大于订单总量！");
+            }
+            order.setEntrustAmount(totalEntrustAmount).setUpdateBy(param.getUpdateBy());
+            kwoTradeOrderService.updateById(order);
+            //更新mongodb
+            SckwTradeOrder updateParam = new SckwTradeOrder();
+            updateParam.setTOrderId(order.getId()).setEntrustAmount(totalEntrustAmount)
+                    .setUpdateBy(param.getUpdateBy()).setUpdateByName(param.getUpdateByName()).setUpdateTime(new Date());
+            saveMongoDb(updateParam);
+            return HttpResult.ok();
+        } finally {
+            RedissonUtils.unlock(lockKey);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult completeLogisticsOrder(CompleteLogisticsOrderParam param) {
+        Long id = param.getTOrderId();
+        BigDecimal entrustAmount = param.getEntrustAmount();
+        BigDecimal actualLoadAmount = param.getActualLoadAmount();
+        BigDecimal actualUnloadAmount = param.getActualUnloadAmount();
+        Long updateBy = param.getUpdateBy();
+        String updateByName = param.getUpdateByName();
+        if (Objects.isNull(updateBy) || StringUtils.isBlank(updateByName)) {
+            return HttpResult.error("操作人信息不能为空!");
+        }
+        if (Objects.isNull(entrustAmount) || Objects.isNull(actualLoadAmount) || Objects.isNull(actualUnloadAmount)) {
+            return HttpResult.error("任务量或装卸量不能为空!");
+        }
+        String lockKey = String.format(RedisConstant.TORDER_UPDATE_AMOUNT_KEY, id);
+        if (Boolean.FALSE.equals(RedissonUtils.tryLock(lockKey, 10L, 30L))) {
+            return HttpResult.error("业务繁忙，请稍后再试!");
+        }
+        try {
+            KwoTradeOrder order = kwoTradeOrderService.getById(id);
+            if (Objects.isNull(order)) {
+                return HttpResult.error("订单不存在!");
             }
-            BigDecimal addActualAmount = order.getActualAmount();
-            if (Objects.nonNull(param.getActualAmount())) {
-                addActualAmount = addActualAmount.add(param.getActualAmount());
-                if (amount.compareTo(addActualAmount) < 0) {
-                    return HttpResult.error("物流实际交付总量不可大于订单总量！");
-                }
+            if (!Objects.equals(String.valueOf(order.getStatus()), DictEnum.TORDER_STATUS_4.getValue())) {
+                return HttpResult.error("执行中的订单才可物流托运！");
             }
-            order.setEntrustAmount(addEntrustAmount).setActualAmount(addActualAmount).setUpdateBy(param.getUpdateBy());
-            //已履约量等于订单总量自动完结订单
-            if (amount.compareTo(addActualAmount) == 0) {
-                order.setStatus(Integer.valueOf(DictEnum.TORDER_STATUS_5.getValue()));
-                KwoTradeOrderTrack track = new KwoTradeOrderTrack();
-                track.setTOrderId(order.getId()).setTOrderNo(order.getTOrderNo()).setStatus(order.getStatus())
-                        .setCreateBy(updateBy).setUpdateBy(updateBy);
-                kwoTradeOrderTrackService.insert(track);
+            BigDecimal totalEntrustAmount = Objects.isNull(order.getEntrustAmount()) ? entrustAmount : order.getEntrustAmount().add(entrustAmount);
+            BigDecimal totalActualAmount;
+            if (Objects.equals(order.getDeliveryType(), DictEnum.DELIVERY_TYPE_0.getValue())) {
+                totalActualAmount = Objects.isNull(order.getActualAmount()) ? actualLoadAmount : order.getActualAmount().add(actualLoadAmount);
+            } else {
+                totalActualAmount = Objects.isNull(order.getActualAmount()) ? actualUnloadAmount : order.getActualAmount().add(actualUnloadAmount);
             }
+            order.setEntrustAmount(totalEntrustAmount).setActualAmount(totalActualAmount).setUpdateBy(param.getUpdateBy());
+            //todo 自动完结订单规则缺少
+//            if (amount.compareTo(addActualAmount) == 0) {
+//                order.setStatus(Integer.valueOf(DictEnum.TORDER_STATUS_5.getValue()));
+//                KwoTradeOrderTrack track = new KwoTradeOrderTrack();
+//                track.setTOrderId(order.getId()).setTOrderNo(order.getTOrderNo()).setStatus(order.getStatus())
+//                        .setCreateBy(updateBy).setUpdateBy(updateBy);
+//                kwoTradeOrderTrackService.insert(track);
+//            }
             kwoTradeOrderService.updateById(order);
             //更新mongodb
             SckwTradeOrder updateParam = new SckwTradeOrder();
-            updateParam.setTOrderId(order.getId()).setEntrustAmount(addEntrustAmount).setActualAmount(addActualAmount)
+            updateParam.setTOrderId(order.getId()).setEntrustAmount(totalEntrustAmount).setActualAmount(totalActualAmount)
                     .setStatus(order.getStatus()).setUpdateBy(param.getUpdateBy()).setUpdateByName(param.getUpdateByName()).setUpdateTime(new Date());
-            saveMongoDb(3, updateParam);
+            saveMongoDb(updateParam);
+            return HttpResult.ok();
         } finally {
             RedissonUtils.unlock(lockKey);
         }
-        return HttpResult.ok();
     }
 
     @Override
@@ -186,23 +230,20 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
             tradeOrders.add(updateParam);
         });
         kwoTradeOrderTrackService.insertBatch(tracks);
-        tradeOrders.forEach(e -> {
-            saveMongoDb(3, e);
-        });
+        tradeOrders.forEach(this::saveMongoDb);
     }
 
     /**
      * @desc: mq保存mongodb
      * @author: yzc
      * @date: 2023-07-17 8:43
-     * @Param method:
      * @Param order:
      * @return: void
      */
-    private void saveMongoDb(Integer method, Object order) {
+    private void saveMongoDb(Object order) {
         SckwBusSum busSum = new SckwBusSum();
         busSum.setBusSumType("tradeOrder");
-        busSum.setMethod(method);
+        busSum.setMethod(3);
         busSum.setObject(order);
         streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
     }

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

@@ -11,8 +11,10 @@ import com.sckw.payment.service.KwpLedgerLogisticsService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -23,6 +25,7 @@ import java.util.stream.Collectors;
  *
  * @author xucaiqin
  */
+@Validated
 @RestController
 @RequestMapping("/kwpLedgerLogistics")
 public class KwpLedgerLogisticsController {
@@ -32,7 +35,7 @@ public class KwpLedgerLogisticsController {
     /**
      * 物流对账单-发起对账(保存草稿)（承运方）
      *
-     * @param logisticsReq
+     * @param logisticsReq 保存物流对账单参数
      * @return
      */
     @PostMapping("sendDraft")
@@ -43,7 +46,7 @@ public class KwpLedgerLogisticsController {
     /**
      * 物流对账单-发起对账（承运方）
      *
-     * @param logisticsReq
+     * @param logisticsReq 保存物流对账单参数
      * @return
      */
     @PostMapping("send")
@@ -54,7 +57,7 @@ public class KwpLedgerLogisticsController {
     /**
      * 托运方物流对账单列表查询
      *
-     * @param logisticsReq
+     * @param logisticsReq 物流订单查询参数
      * @return
      */
     @PostMapping("shipperList")
@@ -65,7 +68,7 @@ public class KwpLedgerLogisticsController {
     /**
      * 承运方物流对账单列表查询（物流公司、收钱方）
      *
-     * @param logisticsReq
+     * @param logisticsReq 物流订单查询参数
      * @return
      */
     @PostMapping("carrierList")
@@ -76,40 +79,41 @@ public class KwpLedgerLogisticsController {
     /**
      * 承运方-查询物流对账单详情
      *
-     * @param id
-     * @return
+     * @param id 物流对账单id
+     * @return 物流对账单详情
      */
     @GetMapping("queryCarrierDetail")
-    public HttpResult queryCarrierDetail(@RequestParam("id") String id) {
+    public HttpResult queryCarrierDetail(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
         return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(Long.valueOf(id), LogisticsUnitType.SHIPPER));
     }
 
     /**
      * 托运方-查询物流对账单详情
      *
-     * @param id
-     * @return
+     * @param id 物流对账单id
+     * @return 物流对账单详情
      */
     @GetMapping("queryShipperDetail")
-    public HttpResult queryDetail(@RequestParam("id") String id) {
+    public HttpResult queryDetail(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
         return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(Long.valueOf(id), LogisticsUnitType.CARRIER));
     }
 
     /**
      * 修改物流对账单详情（修改物流对账单接口使用） 仅发起对账方支持修改
      *
-     * @param id
-     * @return
+     * @param id 物流对账单id
+     * @return 物流对账单详情
      */
     @GetMapping("queryUpdate")
-    public HttpResult queryUpdate(@RequestParam("id") String id) {
+    public HttpResult queryUpdate(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
         return HttpResult.ok(kwpLedgerLogisticsService.queryUpdate(Long.valueOf(id)));
     }
 
     /**
      * 托运方
      *
-     * @return
+     * @param logisticsReq 物流订单查询参数
+     * @return 物流对账单统计数据
      */
     @PostMapping("shipperCount")
     public HttpResult shipperCount(@RequestBody @Valid LogisticsReq logisticsReq) {
@@ -119,7 +123,8 @@ public class KwpLedgerLogisticsController {
     /**
      * 承运方
      *
-     * @return
+     * @param logisticsReq 物流订单查询参数
+     * @return 物流对账单统计数据
      */
     @PostMapping("carrierCount")
     public HttpResult carrierCount(@RequestBody @Valid LogisticsReq logisticsReq) {
@@ -130,22 +135,22 @@ public class KwpLedgerLogisticsController {
      * 删除对账单
      * 释放关联的订单（只有删除操作才释放订单）
      *
-     * @param id
+     * @param id 物流对账单id
      * @return
      */
     @DeleteMapping("delete")
-    public HttpResult delete(@RequestParam("id") String id) {
+    public HttpResult delete(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
         return HttpResult.ok(kwpLedgerLogisticsService.remove(Long.valueOf(id)));
     }
 
     /**
      * 物流对账单-撤回对账
      *
-     * @param id
+     * @param id 物流对账单id
      * @return
      */
     @PostMapping("back")
-    public HttpResult back(@RequestParam("id") String id) {
+    public HttpResult back(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
         return HttpResult.ok(kwpLedgerLogisticsService.backOrder(Long.valueOf(id)));
     }
 
@@ -163,18 +168,18 @@ public class KwpLedgerLogisticsController {
     /**
      * 物流对账单-驳回查询
      *
-     * @param id
+     * @param id 物流对账单id
      * @return
      */
     @GetMapping("queryBack")
-    public HttpResult queryBack(@RequestParam("id") String id) {
+    public HttpResult queryBack(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
         return HttpResult.ok(kwpLedgerLogisticsService.queryBack(Long.valueOf(id)));
     }
 
     /**
      * 物流对账单-驳回
      *
-     * @param ledgerReq
+     * @param ledgerReq 驳回参数
      * @return
      */
     @PostMapping("doBack")
@@ -188,7 +193,7 @@ public class KwpLedgerLogisticsController {
      * 生成结算单
      * </p>
      *
-     * @param ledgerReq
+     * @param ledgerReq 对账完成参数
      * @return
      */
     @PostMapping("success")

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

@@ -85,10 +85,6 @@ public class KwpSettlementTradeController {
         return this.export(response, list);
     }
 
-    @GetMapping(name = "收款-销售结算订单详情", path = "detailCollection")
-    public HttpResult detailCollection(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpSettlementTradeService.detailCollection(id));
-    }
 
 
     //   ========= 付款 采购 =========

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

@@ -12,18 +12,33 @@ import java.util.Objects;
  * @date 2023-07-13 15:40:37
  */
 public abstract class AbsLedger {
+    /**
+     * 订单校验
+     *
+     * @param order 订单数据
+     */
     public void orderCheck(Object order) {
         if (Objects.isNull(order)) {
             throw new BusinessException("对账单不存在!");
         }
     }
 
+    /**
+     * 驳回查询校验
+     *
+     * @param status 订单状态
+     */
     public void backQueryCheck(Integer status) {
         if (Objects.nonNull(status) && LedgerEnum.BACK.getStatus() != status) {
             throw new BusinessException("只有【已退回】的单据才支持驳回查询!");
         }
     }
 
+    /**
+     * 更新对账单校验
+     *
+     * @param status 订单状态
+     */
     public void updateCheck(Integer status) {
         List<Integer> objects = Lists.newArrayList(LedgerEnum.SAVE.getStatus(), LedgerEnum.BACK.getStatus(), LedgerEnum.REVOCATION.getStatus());
         if (Objects.nonNull(status) && !objects.contains(status)) {
@@ -31,18 +46,33 @@ public abstract class AbsLedger {
         }
     }
 
+    /**
+     * 驳回对账单校验
+     *
+     * @param status 订单状态
+     */
     public void backCheck(Integer status) {
         if (Objects.nonNull(status) && LedgerEnum.TO_LEDGER.getStatus() != status) {
             throw new BusinessException("只有【待对账】的单据才支持对账驳回!");
         }
     }
 
+    /**
+     * 对账确认校验
+     *
+     * @param status 订单状态
+     */
     public void confirmCheck(Integer status) {
         if (Objects.nonNull(status) && LedgerEnum.TO_LEDGER.getStatus() != status) {
             throw new BusinessException("只有【待对账】的单据才支持对账确认!");
         }
     }
 
+    /**
+     * 对账删除校验
+     *
+     * @param status 订单状态
+     */
     public void deleteCheck(Integer status) {
         List<Integer> objects = Lists.newArrayList(LedgerEnum.BACK.getStatus(), LedgerEnum.REVOCATION.getStatus());
         if (Objects.nonNull(status) && !objects.contains(status)) {
@@ -53,7 +83,7 @@ public abstract class AbsLedger {
     /**
      * 撤回订单校验
      *
-     * @param status
+     * @param status 订单状态
      */
     public void revokeCheck(Integer status) {
         if (Objects.nonNull(status) && LedgerEnum.TO_LEDGER.getStatus() != status) {
@@ -64,7 +94,7 @@ public abstract class AbsLedger {
     /**
      * 完结订单校验
      *
-     * @param status
+     * @param status 订单状态
      */
     public void successCheck(Integer status) {
         if (Objects.nonNull(status) && LedgerEnum.LEDGERED.getStatus() != status) {

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

@@ -22,6 +22,11 @@ import java.util.List;
 public class KwpLedgerLogisticsOrderService {
     private final KwpLedgerLogisticsOrderMapper logisticsOrderMapper;
 
+    /**
+     * 根据物流订单id删除物流订单
+     *
+     * @param lLedgerId 物流订单id
+     */
     public void remove(Long lLedgerId) {
         KwpLedgerLogisticsOrder logisticsOrder = new KwpLedgerLogisticsOrder();
         logisticsOrder.setDelFlag(1);
@@ -32,12 +37,23 @@ public class KwpLedgerLogisticsOrderService {
         logisticsOrderMapper.update(logisticsOrder, wrapper);
     }
 
+    /**
+     * 保存物流订单
+     *
+     * @param list 物流对账单关联物流订单
+     */
     public void saveList(List<KwpLedgerLogisticsOrder> list) {
         for (KwpLedgerLogisticsOrder logisticsOrder : list) {
             logisticsOrderMapper.insert(logisticsOrder);
         }
     }
 
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
     public List<KwpLedgerLogisticsOrder> queryList(Long id) {
         List<KwpLedgerLogisticsOrder> kwpLedgerLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwpLedgerLogisticsOrder>().eq(KwpLedgerLogisticsOrder::getLLedgerId, id).eq(KwpLedgerLogisticsOrder::getDelFlag, 0));
         if (CollectionUtils.isEmpty(kwpLedgerLogisticsOrders)) {
@@ -49,7 +65,7 @@ public class KwpLedgerLogisticsOrderService {
     /**
      * 校验当前物流订单是否已关联其它草稿单
      *
-     * @param ids
+     * @param ids 物流订单id列表
      */
     public void check(List<Long> ids) {
         List<KwpLedgerLogisticsOrder> kwpLedgerLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwpLedgerLogisticsOrder>()

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

@@ -2,8 +2,10 @@ package com.sckw.payment.service;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.utils.CollectionUtils;
@@ -16,7 +18,11 @@ import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.LedgerTrackEnum;
 import com.sckw.payment.model.constant.LogisticsUnitType;
-import com.sckw.payment.model.dto.*;
+import com.sckw.payment.model.constant.SettlementEnum;
+import com.sckw.payment.model.dto.ILedger;
+import com.sckw.payment.model.dto.LedgerCarrierDto;
+import com.sckw.payment.model.dto.LedgerLogisticsDto;
+import com.sckw.payment.model.dto.LedgerShipperDto;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.model.vo.res.LedgerLogisticsDetailVo;
 import com.sckw.system.api.RemoteSystemService;
@@ -29,7 +35,6 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -135,18 +140,23 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             logisticsReq.setGenerateTime(LocalDateTime.now());
             logisticsReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
             Long aLong = saveDraft(logisticsReq);
-            logisticsTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
+            logisticsTrackService.saveTrack(aLong, Global.EMPTY_STRING, LedgerTrackEnum.TO_LEDGER);
         } else {
             removeDraft(Long.parseLong(id));
             logisticsReq.setGenerateTime(LocalDateTime.now());
             logisticsReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
             Long aLong = saveDraft(logisticsReq);
-            logisticsTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
+            logisticsTrackService.saveTrack(aLong, Global.EMPTY_STRING, LedgerTrackEnum.TO_LEDGER);
 
         }
         return "保存对账单成功";
     }
 
+    /**
+     * 删除物流对账单相关联的其它数据
+     *
+     * @param id 物流对账单id
+     */
     private void removeDraft(Long id) {
         //删除 kwp_ledger_logistics_order
         logisticsOrderService.remove(id);
@@ -156,6 +166,12 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         logisticsUnitService.remove(id);
     }
 
+    /**
+     * 物流对账单保存草稿
+     *
+     * @param logisticsSendReq 物流对账单新增参数
+     * @return
+     */
     private Long saveDraft(LogisticsSendReq logisticsSendReq) {
         KwpLedgerLogistics kwpLedgerLogistics = new KwpLedgerLogistics();
         kwpLedgerLogistics.setId(Objects.isNull(logisticsSendReq.getIdLong()) ? new IdWorker(1).nextId() : logisticsSendReq.getIdLong());
@@ -173,15 +189,16 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setExTaxPrice(logisticsSendReq.getTotalPrice());//todo-xcq 不含税金额计算方式：订单含税金额总和/1.13(税率)
         kwpLedgerLogistics.setSettlePrice(logisticsSendReq.getSettlePrice());
         kwpLedgerLogistics.setActualPrice(new BigDecimal("0.0"));
-        kwpLedgerLogistics.setAuditUser("");
-        kwpLedgerLogistics.setAuditPhone("");
+        kwpLedgerLogistics.setAuditUser(Global.EMPTY_STRING);
+        kwpLedgerLogistics.setAuditPhone(Global.EMPTY_STRING);
         kwpLedgerLogistics.setReceiptTime(null);
         kwpLedgerLogistics.setOrderCount(logisticsSendReq.getIdList().size());
-        kwpLedgerLogistics.setUrl("");
+        kwpLedgerLogistics.setUrl(Global.EMPTY_STRING);
         kwpLedgerLogistics.setGenerateTime(logisticsSendReq.getGenerateTime());
-        kwpLedgerLogistics.setRemark("");
+        kwpLedgerLogistics.setRemark(Global.EMPTY_STRING);
         kwpLedgerLogistics.setStatus(logisticsSendReq.getStatus());
-        kwpLedgerLogistics.setDelFlag(0);
+        kwpLedgerLogistics.setDelFlag(Global.UN_DELETED);
+        //id为空，新增对账单
         if (Objects.isNull(logisticsSendReq.getId())) {
             kwpLedgerLogistics.setCreateBy(LoginUserHolder.getUserId());
             kwpLedgerLogistics.setCreateTime(LocalDateTime.now());
@@ -190,16 +207,18 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             kwpLedgerLogistics.setLLedgerNo(OrderGenerateUtils.generateOrderNo("LL"));
             logisticsMapper.insert(kwpLedgerLogistics);
         } else {
+            //校验是否可以修改对账单
             KwpLedgerLogistics ledgerLogistics = logisticsMapper.selectById(logisticsSendReq.getIdLong());
             orderCheck(ledgerLogistics);
             updateCheck(ledgerLogistics.getStatus());
+            //修改对账单
             kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
             logisticsMapper.updateById(kwpLedgerLogistics);
         }
         /*保存物流订单关联数据*/
         List<Long> ids = logisticsSendReq.getIdList();
-        //todo-xcq 校验当前订单是否已存在绑定的对账单
+        //验当前订单是否已存在绑定的对账单
         logisticsOrderService.check(ids);
         List<KwtLogisticsOrderVO> acceptCarriageOrderDetail = transportDubboService.getAcceptCarriageOrderDetail(logisticsSendReq.getIdsList());
         if (CollectionUtils.isEmpty(acceptCarriageOrderDetail) || acceptCarriageOrderDetail.size() < ids.size()) {
@@ -207,17 +226,17 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         }
         List<KwpLedgerLogisticsOrder> collect = acceptCarriageOrderDetail.stream().map(a -> {
             KwpLedgerLogisticsOrder logisticsOrder = new KwpLedgerLogisticsOrder();
-            logisticsOrder.setId(new IdWorker(1).nextId());
+            logisticsOrder.setId(new IdWorker(NumberConstant.ONE).nextId());
             logisticsOrder.setLLedgerId(kwpLedgerLogistics.getId());
             logisticsOrder.setLOrderId(a.getId());
             logisticsOrder.setLOrderNo(a.getLOrderNo());
-            logisticsOrder.setRemark("");
-            logisticsOrder.setStatus(0);
+            logisticsOrder.setRemark(Global.EMPTY_STRING);
+            logisticsOrder.setStatus(NumberConstant.ZERO);
             logisticsOrder.setCreateBy(LoginUserHolder.getUserId());
             logisticsOrder.setCreateTime(LocalDateTime.now());
             logisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
             logisticsOrder.setUpdateTime(LocalDateTime.now());
-            logisticsOrder.setDelFlag(0);
+            logisticsOrder.setDelFlag(Global.UN_DELETED);
             return logisticsOrder;
         }).collect(Collectors.toList());
 
@@ -233,7 +252,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
         List<KwpLedgerLogisticsUnit> logisticsUnits = new ArrayList<>();
         KwpLedgerLogisticsUnit kwpLedgerLogisticsUnit = new KwpLedgerLogisticsUnit();
-        kwpLedgerLogisticsUnit.setId(new IdWorker(1).nextId());
+        kwpLedgerLogisticsUnit.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwpLedgerLogisticsUnit.setLLedgerId(kwpLedgerLogistics.getId());
         kwpLedgerLogisticsUnit.setLLedgerNo(kwpLedgerLogistics.getLLedgerNo());
         kwpLedgerLogisticsUnit.setUnitType(LogisticsUnitType.SHIPPER);
@@ -242,13 +261,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogisticsUnit.setFirmName(entCacheResDto.getFirmName());
         kwpLedgerLogisticsUnit.setContacts(entCacheResDto.getContacts());
         kwpLedgerLogisticsUnit.setPhone(entCacheResDto.getPhone());
-        kwpLedgerLogisticsUnit.setRemark("");
-        kwpLedgerLogisticsUnit.setStatus(0);
+        kwpLedgerLogisticsUnit.setRemark(Global.EMPTY_STRING);
+        kwpLedgerLogisticsUnit.setStatus(NumberConstant.ZERO);
         kwpLedgerLogisticsUnit.setCreateBy(LoginUserHolder.getUserId());
         kwpLedgerLogisticsUnit.setCreateTime(LocalDateTime.now());
         kwpLedgerLogisticsUnit.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogisticsUnit.setUpdateTime(LocalDateTime.now());
-        kwpLedgerLogisticsUnit.setDelFlag(0);
+        kwpLedgerLogisticsUnit.setDelFlag(Global.UN_DELETED);
 
         logisticsUnits.add(kwpLedgerLogisticsUnit);
         Long entId = LoginUserHolder.getEntId();
@@ -258,7 +277,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             entCacheResDto1 = new EntCacheResDto();
         }
         KwpLedgerLogisticsUnit carrierUnit = new KwpLedgerLogisticsUnit();
-        carrierUnit.setId(new IdWorker(1).nextId());
+        carrierUnit.setId(new IdWorker(NumberConstant.ONE).nextId());
         carrierUnit.setLLedgerId(kwpLedgerLogistics.getId());
         carrierUnit.setLLedgerNo(kwpLedgerLogistics.getLLedgerNo());
         carrierUnit.setUnitType(LogisticsUnitType.CARRIER);
@@ -267,13 +286,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         carrierUnit.setFirmName(entCacheResDto1.getFirmName());
         carrierUnit.setContacts(entCacheResDto1.getContacts());
         carrierUnit.setPhone(entCacheResDto1.getPhone());
-        carrierUnit.setRemark("");
-        carrierUnit.setStatus(0);
+        carrierUnit.setRemark(Global.EMPTY_STRING);
+        carrierUnit.setStatus(NumberConstant.ZERO);
         carrierUnit.setCreateBy(LoginUserHolder.getUserId());
         carrierUnit.setCreateTime(LocalDateTime.now());
         carrierUnit.setUpdateBy(LoginUserHolder.getUserId());
         carrierUnit.setUpdateTime(LocalDateTime.now());
-        carrierUnit.setDelFlag(0);
+        carrierUnit.setDelFlag(Global.UN_DELETED);
 
         logisticsUnits.add(carrierUnit);
         logisticsUnitService.saveList(logisticsUnits);
@@ -283,7 +302,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     /**
      * 保存物流对账单草稿
      *
-     * @param logisticsReq
+     * @param logisticsReq 物流对账单保存的参数
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
@@ -291,7 +310,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         logisticsReq.setGenerateTime(null);
         logisticsReq.setStatus(LedgerEnum.SAVE.getStatus());
         Long aLong = saveDraft(logisticsReq);
-        logisticsTrackService.saveTrack(aLong, "", LedgerTrackEnum.SAVE);
+        logisticsTrackService.saveTrack(aLong, Global.EMPTY_STRING, LedgerTrackEnum.SAVE);
         return "草稿保存成功";
     }
 
@@ -301,15 +320,16 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      * @param id 物流对账单id
      * @return
      */
-    public Integer remove(Long id) {
+    public String remove(Long id) {
         KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         if (Objects.isNull(kwpLedgerLogistics)) {
             throw new BusinessException("对账单不存在!");
         }
         deleteCheck(kwpLedgerLogistics.getStatus());
-        kwpLedgerLogistics.setDelFlag(1);
+        kwpLedgerLogistics.setDelFlag(Global.DELETED);
         logisticsMapper.updateById(kwpLedgerLogistics);
-        return logisticsTrackService.saveTrack(id, "", LedgerTrackEnum.DELETE);
+        logisticsTrackService.saveTrack(id, Global.EMPTY_STRING, LedgerTrackEnum.DELETE);
+        return "删除成功";
     }
 
     /**
@@ -318,7 +338,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      * @param id 物流对账单id
      * @return
      */
-    public Integer backOrder(Long id) {
+    public String backOrder(Long id) {
         KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         if (Objects.isNull(kwpLedgerLogistics)) {
             throw new BusinessException("对账单不存在!");
@@ -329,7 +349,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         logisticsMapper.updateById(kwpLedgerLogistics);
-        return logisticsTrackService.saveTrack(id, "", LedgerTrackEnum.REVOKE);
+        logisticsTrackService.saveTrack(id, Global.EMPTY_STRING, LedgerTrackEnum.REVOKE);
+        return "撤回成功";
     }
 
     /**
@@ -351,7 +372,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      * @param ledgerReq 驳回参数
      * @return
      */
-    public Integer doBack(LedgerReq ledgerReq) {
+    public String doBack(LedgerReq ledgerReq) {
         KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(ledgerReq.getIdLong());
         if (Objects.isNull(kwpLedgerLogistics)) {
             throw new BusinessException("对账单不存在!");
@@ -361,18 +382,19 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         logisticsMapper.updateById(kwpLedgerLogistics);
-        return logisticsTrackService.saveTrack(ledgerReq.getIdLong(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
+        logisticsTrackService.saveTrack(ledgerReq.getIdLong(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
+        return "驳回成功";
     }
 
     /**
      * 对账确认
      * 订单变更为已对账
      *
-     * @param confirmReq
+     * @param confirmReq 对账确认请求参数
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public Integer confirmOrder(LedgerConfirmReq confirmReq) {
+    public String confirmOrder(LedgerConfirmReq confirmReq) {
         KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(confirmReq.getIdLong());
         orderCheck(kwpLedgerLogistics);
         confirmCheck(kwpLedgerLogistics.getStatus());
@@ -383,13 +405,14 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         logisticsMapper.updateById(kwpLedgerLogistics);
-        return logisticsTrackService.saveTrack(confirmReq.getIdLong(), "", LedgerTrackEnum.CONFIRM);
+        logisticsTrackService.saveTrack(confirmReq.getIdLong(), Global.EMPTY_STRING, LedgerTrackEnum.CONFIRM);
+        return "对账确认成功";
     }
 
     /**
      * 对账完成
      *
-     * @param ledgerReq
+     * @param ledgerReq 对账完成参数
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
@@ -398,7 +421,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         orderCheck(kwpLedgerLogistics);
 
         successCheck(kwpLedgerLogistics.getStatus());
-
+        //更新对账单状态
         kwpLedgerLogistics.setReceiptTime(LocalDateTime.of(ledgerReq.getReceiptTime(), LocalTime.MIN));
         kwpLedgerLogistics.setStatus(LedgerEnum.SUCCESS.getStatus());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
@@ -406,40 +429,43 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         logisticsMapper.updateById(kwpLedgerLogistics);
         //生成结算单
         KwpSettlementLogistics kwpSettlementLogistics = new KwpSettlementLogistics();
-        kwpSettlementLogistics.setId(new IdWorker(1).nextId());
+        kwpSettlementLogistics.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwpSettlementLogistics.setEntId(LoginUserHolder.getEntId());
         kwpSettlementLogistics.setLLedgerId(kwpLedgerLogistics.getId());
         kwpSettlementLogistics.setSlOrderNo(OrderGenerateUtils.generateOrderNo("SL"));
         kwpSettlementLogistics.setName(kwpLedgerLogistics.getName());//取物流对账单名称
         kwpSettlementLogistics.setTotalPrice(kwpLedgerLogistics.getTotalPrice());
         kwpSettlementLogistics.setActualPrice(kwpLedgerLogistics.getActualPrice());
-        kwpSettlementLogistics.setRemark("");
+        kwpSettlementLogistics.setRemark(Global.EMPTY_STRING);
         kwpSettlementLogistics.setAuditUser(kwpLedgerLogistics.getAuditUser());
         kwpSettlementLogistics.setAuditPhone(kwpLedgerLogistics.getAuditPhone());
         kwpSettlementLogistics.setSuccessUser(ledgerReq.getSuccessUser());
         kwpSettlementLogistics.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementLogistics.setReceiptTime(LocalDateTime.of(ledgerReq.getReceiptTime(), LocalTime.MIN));
-        kwpSettlementLogistics.setStatus(1);//1-待结算
+        kwpSettlementLogistics.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());//1-待结算
         kwpSettlementLogistics.setCreateBy(LoginUserHolder.getUserId());
         kwpSettlementLogistics.setCreateTime(LocalDateTime.now());
         kwpSettlementLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpSettlementLogistics.setUpdateTime(LocalDateTime.now());
-        kwpSettlementLogistics.setDelFlag(0);
+        kwpSettlementLogistics.setDelFlag(Global.UN_DELETED);
 
         settlementLogisticsService.save(kwpSettlementLogistics);
 
-        logisticsTrackService.saveTrack(ledgerReq.getIdLong(), "", LedgerTrackEnum.SUCCESS);
+        logisticsTrackService.saveTrack(ledgerReq.getIdLong(), Global.EMPTY_STRING, LedgerTrackEnum.SUCCESS);
         return "对账完成";
     }
 
     /**
+     * 按类型统计表头的数据
+     *
      * @param unitType 1-托运方 2-承运方
-     * @return
+     * @return 统计数据
      */
     public List<TableTop> orderCount(LogisticsReq logisticsReq, Integer unitType) {
         logisticsReq.setEntId(LoginUserHolder.getEntId());
         Map<String, Long> map = logisticsMapper.countOrder(logisticsReq, unitType);
         TableTop ledgerCountVo;
+        /*统计数据转换*/
         List<TableTop> res = new ArrayList<>();
         for (LedgerEnum value : LedgerEnum.values()) {
             ledgerCountVo = new TableTop();
@@ -452,10 +478,10 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     }
 
     /**
-     * 托运方
+     * 托运方 查询物流对账单
      *
-     * @param ids
-     * @return
+     * @param ids 对账单id列表
+     * @return 物流对账单列表
      */
     public List<ILedger> selectShipperList(List<Long> ids) {
         List<LedgerShipperDto> ledgerLogisticsDto = logisticsMapper.selectShipperIds(ids);
@@ -465,10 +491,10 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     }
 
     /**
-     * 承运方
+     * 承运方 查询物流对账单
      *
-     * @param ids
-     * @return
+     * @param ids 对账单id列表
+     * @return 物流对账单列表
      */
     public List<ILedger> selectCarrierList(List<Long> ids) {
         List<LedgerCarrierDto> ledgerLogisticsDto = logisticsMapper.selectCarrierIds(ids);
@@ -477,6 +503,12 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         return ledgerLogistics;
     }
 
+    /**
+     * 根据物流订单id查询对账单详情
+     *
+     * @param id 物流对账单id
+     * @return
+     */
     public LedgerLogisticsDetailVo queryUpdate(Long id) {
         LedgerLogisticsDto ledgerLogisticsDto = logisticsMapper.selectId(id, LogisticsUnitType.SHIPPER);
         orderCheck(ledgerLogisticsDto);
@@ -484,14 +516,27 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         return getLedgerLogisticsDetailVo(ledgerLogisticsDto);
     }
 
+    /**
+     * 查询物流对账单详情
+     *
+     * @param id       物流对账单id
+     * @param unitType 企业单位类型
+     * @return
+     */
     public LedgerLogisticsDetailVo queryDetail(Long id, Integer unitType) {
         LedgerLogisticsDto ledgerLogisticsDto = logisticsMapper.selectId(id, unitType);
         orderCheck(ledgerLogisticsDto);
         return getLedgerLogisticsDetailVo(ledgerLogisticsDto);
     }
 
-    @NotNull
+    /**
+     * 转换物流对账单详情数据
+     *
+     * @param ledgerLogisticsDto
+     * @return
+     */
     private LedgerLogisticsDetailVo getLedgerLogisticsDetailVo(LedgerLogisticsDto ledgerLogisticsDto) {
+        /*获取物流对账单关联的物流订单*/
         List<KwpLedgerLogisticsOrder> kwpLedgerLogisticsOrders = logisticsOrderService.queryList(ledgerLogisticsDto.getId());
         LedgerLogisticsDetailVo ledgerLogisticsDetailVo = new LedgerLogisticsDetailVo();
         ledgerLogisticsDetailVo.setId(ledgerLogisticsDto.getId());
@@ -505,7 +550,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         ledgerLogisticsDetailVo.setStartTime(ledgerLogisticsDto.getStartTime());
         ledgerLogisticsDetailVo.setEndTime(ledgerLogisticsDto.getEndTime());
         ledgerLogisticsDetailVo.setRemark(ledgerLogisticsDto.getRemark());
-
+        /*查询物流订单详情*/
         List<LogisticsOrderVO> acceptCarriageOrderList = transportDubboService.getAcceptCarriageOrderList(kwpLedgerLogisticsOrders.stream().map(a -> Long.toString(a.getLOrderId())).collect(Collectors.toList()));
         ledgerLogisticsDetailVo.setOrderList(acceptCarriageOrderList);
         return ledgerLogisticsDetailVo;

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

@@ -1,6 +1,8 @@
 package com.sckw.payment.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.payment.dao.KwpLedgerLogisticsTrackMapper;
 import com.sckw.payment.model.KwpLedgerLogisticsTrack;
@@ -28,13 +30,13 @@ public class KwpLedgerLogisticsTrackService {
      * @param remark      备注
      * @param status      状态值
      */
-    public Integer saveTrack(Long l_ledger_id, String remark, LedgerTrackEnum status) {
+    public void saveTrack(Long l_ledger_id, String remark, LedgerTrackEnum status) {
         KwpLedgerLogisticsTrack kwpLedgerLogisticsTrack = new KwpLedgerLogisticsTrack();
-        kwpLedgerLogisticsTrack.setId(new IdWorker(1).nextId());
+        kwpLedgerLogisticsTrack.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwpLedgerLogisticsTrack.setLLedgerId(l_ledger_id);
         kwpLedgerLogisticsTrack.setRemark(remark);
         kwpLedgerLogisticsTrack.setStatus(status.getStatus());
-        return logisticsTrackMapper.insert(kwpLedgerLogisticsTrack);
+        logisticsTrackMapper.insert(kwpLedgerLogisticsTrack);
     }
 
     /**
@@ -48,20 +50,23 @@ public class KwpLedgerLogisticsTrackService {
         LambdaQueryWrapper<KwpLedgerLogisticsTrack> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpLedgerLogisticsTrack::getLLedgerId, id);
         wrapper.eq(Objects.nonNull(status), KwpLedgerLogisticsTrack::getStatus, status.getStatus());
-        wrapper.eq(KwpLedgerLogisticsTrack::getDelFlag, 0);
+        wrapper.eq(KwpLedgerLogisticsTrack::getDelFlag, Global.UN_DELETED);
         wrapper.orderByDesc(KwpLedgerLogisticsTrack::getCreateTime);
         wrapper.last("limit 1");
         return logisticsTrackMapper.selectOne(wrapper);
     }
 
-
+    /**
+     * 删除物流对账记录表
+     * @param lLedgerId 物流对账单id
+     */
     public void remove(Long lLedgerId) {
         LambdaQueryWrapper<KwpLedgerLogisticsTrack> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpLedgerLogisticsTrack::getLLedgerId, lLedgerId);
-        wrapper.eq(KwpLedgerLogisticsTrack::getDelFlag, 0);
+        wrapper.eq(KwpLedgerLogisticsTrack::getDelFlag, Global.UN_DELETED);
         KwpLedgerLogisticsTrack logisticsTrack = new KwpLedgerLogisticsTrack();
         logisticsTrack.setUpdateTime(LocalDateTime.now());
-        logisticsTrack.setDelFlag(1);
+        logisticsTrack.setDelFlag(Global.DELETED);
         logisticsTrackMapper.update(logisticsTrack, wrapper);
     }
 }

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

@@ -1,9 +1,9 @@
 package com.sckw.payment.service;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.sckw.core.model.constant.Global;
 import com.sckw.payment.dao.KwpLedgerLogisticsUnitMapper;
 import com.sckw.payment.model.KwpLedgerLogisticsUnit;
-import com.sckw.payment.model.KwpLedgerTradeUnit;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -20,6 +20,11 @@ import java.util.List;
 public class KwpLedgerLogisticsUnitService {
     private final KwpLedgerLogisticsUnitMapper logisticsUnitMapper;
 
+    /**
+     * 批量保存对账单关联企业信息
+     *
+     * @param logisticsUnits 企业信息
+     */
     public void saveList(List<KwpLedgerLogisticsUnit> logisticsUnits) {
         if (!CollectionUtils.isEmpty(logisticsUnits)) {
             for (KwpLedgerLogisticsUnit logisticsUnit : logisticsUnits) {
@@ -28,13 +33,18 @@ public class KwpLedgerLogisticsUnitService {
         }
     }
 
+    /**
+     * 删除对账单关联的企业信息
+     *
+     * @param lLedgerId
+     */
     public void remove(Long lLedgerId) {
         KwpLedgerLogisticsUnit logisticsUnit = new KwpLedgerLogisticsUnit();
-        logisticsUnit.setDelFlag(1);
+        logisticsUnit.setDelFlag(Global.DELETED);
         logisticsUnit.setUpdateTime(LocalDateTime.now());
         LambdaUpdateWrapper<KwpLedgerLogisticsUnit> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(KwpLedgerLogisticsUnit::getLLedgerId, lLedgerId);
-        wrapper.eq(KwpLedgerLogisticsUnit::getDelFlag, 0);
+        wrapper.eq(KwpLedgerLogisticsUnit::getDelFlag, Global.UN_DELETED);
         logisticsUnitMapper.update(logisticsUnit, wrapper);
     }
 }

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

@@ -3,6 +3,7 @@ package com.sckw.payment.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.payment.dao.KwpLedgerTradeOrderMapper;
 import com.sckw.payment.model.KwpLedgerTradeOrder;
@@ -22,16 +23,26 @@ import java.util.List;
 public class KwpLedgerTradeOrderService {
     private final KwpLedgerTradeOrderMapper tradeOrderMapper;
 
+    /**
+     * 删除贸易结算单关联的贸易订单
+     *
+     * @param tLedgerId 结算单id
+     */
     public void remove(Long tLedgerId) {
         KwpLedgerTradeOrder kwpLedgerTradeOrder = new KwpLedgerTradeOrder();
-        kwpLedgerTradeOrder.setDelFlag(1);
+        kwpLedgerTradeOrder.setDelFlag(Global.DELETED);
         kwpLedgerTradeOrder.setUpdateTime(LocalDateTime.now());
         LambdaUpdateWrapper<KwpLedgerTradeOrder> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(KwpLedgerTradeOrder::getTLedgerId, tLedgerId);
-        wrapper.eq(KwpLedgerTradeOrder::getDelFlag, 0);
+        wrapper.eq(KwpLedgerTradeOrder::getDelFlag, Global.UN_DELETED);
         tradeOrderMapper.update(kwpLedgerTradeOrder, wrapper);
     }
 
+    /**
+     * 批量保存贸易结算单关联的贸易订单
+     *
+     * @param list 订单关联数据
+     */
     public void saveList(List<KwpLedgerTradeOrder> list) {
         if (!CollectionUtils.isEmpty(list)) {
             for (KwpLedgerTradeOrder kwpLedgerTradeOrder : list) {
@@ -40,6 +51,12 @@ public class KwpLedgerTradeOrderService {
         }
     }
 
+    /**
+     * 查询关联的订单数据
+     *
+     * @param id 对账单id
+     * @return
+     */
     public List<KwpLedgerTradeOrder> queryList(Long id) {
         List<KwpLedgerTradeOrder> kwpLedgerLogisticsOrders = tradeOrderMapper.selectList(new LambdaQueryWrapper<KwpLedgerTradeOrder>().eq(KwpLedgerTradeOrder::getTLedgerId, id).eq(KwpLedgerTradeOrder::getDelFlag, 0));
 
@@ -49,10 +66,15 @@ public class KwpLedgerTradeOrderService {
         return kwpLedgerLogisticsOrders;
     }
 
+    /**
+     * 校验订单是否绑定其它订单
+     *
+     * @param ids
+     */
     public void check(List<Long> ids) {
         List<KwpLedgerTradeOrder> kwpLedgerLogisticsOrders = tradeOrderMapper.selectList(new LambdaQueryWrapper<KwpLedgerTradeOrder>()
                 .in(KwpLedgerTradeOrder::getTOrderId, ids)
-                .eq(KwpLedgerTradeOrder::getDelFlag, 0)
+                .eq(KwpLedgerTradeOrder::getDelFlag, Global.UN_DELETED)
                 .select(KwpLedgerTradeOrder::getTLedgerId, KwpLedgerTradeOrder::getTOrderId, KwpLedgerTradeOrder::getTOrderNo));
         if (CollectionUtils.isNotEmpty(kwpLedgerLogisticsOrders)) {
             for (KwpLedgerTradeOrder kwpLedgerTradeOrder : kwpLedgerLogisticsOrders) {

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

@@ -3,8 +3,10 @@ package com.sckw.payment.service;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.utils.CollectionUtils;
@@ -18,8 +20,12 @@ import com.sckw.payment.dao.KwpLedgerTradeMapper;
 import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.LedgerTrackEnum;
+import com.sckw.payment.model.constant.SettlementEnum;
 import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.dto.*;
+import com.sckw.payment.model.dto.ILedger;
+import com.sckw.payment.model.dto.LedgerPurchaseDto;
+import com.sckw.payment.model.dto.LedgerSellDto;
+import com.sckw.payment.model.dto.LedgerTradeDto;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.model.vo.res.LedgerTradeDetailVo;
 import com.sckw.system.api.RemoteSystemService;
@@ -61,6 +67,11 @@ public class KwpLedgerTradeService extends AbsLedger {
     @DubboReference(version = "2.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
 
+    /**
+     * 转换字典数据
+     *
+     * @param list
+     */
     private void changeDict(List<ILedger> list) {
         List<SysDictResDto> taxRateDict = remoteSystemService.queryDictByType(DictTypeEnum.TAX_RATE.getType());
         Map<String, String> taxRateMap = new HashMap<>();
@@ -83,6 +94,11 @@ public class KwpLedgerTradeService extends AbsLedger {
         }
     }
 
+    /**
+     * 填充时间等参数
+     *
+     * @param tradeReq 请求参数
+     */
     private void fillPara(TradeReq tradeReq) {
         tradeReq.setEntId(LoginUserHolder.getEntId());
         if (StringUtils.isNotBlank(tradeReq.getStartCreateTime())) {
@@ -159,16 +175,16 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setExTaxPrice(tradeSendReq.getTotalPrice());//todo-xcq 不含税金额计算方式：订单含税金额总和/1.13(税率)
         kwpLedgerTrade.setSettlePrice(tradeSendReq.getSettlePrice());
         kwpLedgerTrade.setActualPrice(new BigDecimal("0.0"));
-        kwpLedgerTrade.setAuditUser("");
-        kwpLedgerTrade.setAuditPhone("");
+        kwpLedgerTrade.setAuditUser(Global.EMPTY_STRING);
+        kwpLedgerTrade.setAuditPhone(Global.EMPTY_STRING);
         kwpLedgerTrade.setGenerateTime(tradeSendReq.getGenerateTime());
         kwpLedgerTrade.setReceiptTime(null);
         kwpLedgerTrade.setOrderCount(tradeSendReq.getIdList().size());
-        kwpLedgerTrade.setUrl("");
-        kwpLedgerTrade.setRemark("");
+        kwpLedgerTrade.setUrl(Global.EMPTY_STRING);
+        kwpLedgerTrade.setRemark(Global.EMPTY_STRING);
         kwpLedgerTrade.setStatus(tradeSendReq.getStatus());
 
-        kwpLedgerTrade.setDelFlag(0);
+        kwpLedgerTrade.setDelFlag(Global.UN_DELETED);
         if (Objects.isNull(tradeSendReq.getId())) {
             kwpLedgerTrade.setTLedgerNo(OrderGenerateUtils.generateOrderNo("TL"));
             kwpLedgerTrade.setCreateBy(LoginUserHolder.getUserId());
@@ -203,13 +219,13 @@ public class KwpLedgerTradeService extends AbsLedger {
             kwpLedgerTradeOrder.setTLedgerId(kwpLedgerTrade.getId());
             kwpLedgerTradeOrder.setTOrderId(a.getId());
             kwpLedgerTradeOrder.setTOrderNo(a.getTOrderNo());
-            kwpLedgerTradeOrder.setRemark("");
-            kwpLedgerTradeOrder.setStatus(0);
+            kwpLedgerTradeOrder.setRemark(Global.EMPTY_STRING);
+            kwpLedgerTradeOrder.setStatus(NumberConstant.ZERO);
             kwpLedgerTradeOrder.setCreateBy(LoginUserHolder.getUserId());
             kwpLedgerTradeOrder.setCreateTime(LocalDateTime.now());
             kwpLedgerTradeOrder.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerTradeOrder.setUpdateTime(LocalDateTime.now());
-            kwpLedgerTradeOrder.setDelFlag(0);
+            kwpLedgerTradeOrder.setDelFlag(Global.UN_DELETED);
             return kwpLedgerTradeOrder;
         }).collect(Collectors.toList());
         tradeOrderService.saveList(collect);
@@ -221,9 +237,10 @@ public class KwpLedgerTradeService extends AbsLedger {
         if (Objects.isNull(entCacheResDto)) {
             entCacheResDto = new EntCacheResDto();
         }
+        //保存双方企业信息
         List<KwpLedgerTradeUnit> list = new ArrayList<>();
         KwpLedgerTradeUnit kwpLedgerTradeUnit = new KwpLedgerTradeUnit();
-        kwpLedgerTradeUnit.setId(new IdWorker(1).nextId());
+        kwpLedgerTradeUnit.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwpLedgerTradeUnit.setTLedgerId(kwpLedgerTrade.getId());
         kwpLedgerTradeUnit.setTLedgerNo(kwpLedgerTrade.getTLedgerNo());
         kwpLedgerTradeUnit.setUnitType(TradeUnitType.PURCHASE);
@@ -232,13 +249,13 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTradeUnit.setFirmName(entCacheResDto.getFirmName());
         kwpLedgerTradeUnit.setContacts(entCacheResDto.getContacts());
         kwpLedgerTradeUnit.setPhone(entCacheResDto.getPhone());
-        kwpLedgerTradeUnit.setRemark("");
-        kwpLedgerTradeUnit.setStatus(0);
+        kwpLedgerTradeUnit.setRemark(Global.EMPTY_STRING);
+        kwpLedgerTradeUnit.setStatus(NumberConstant.ZERO);
         kwpLedgerTradeUnit.setCreateBy(LoginUserHolder.getUserId());
         kwpLedgerTradeUnit.setCreateTime(LocalDateTime.now());
         kwpLedgerTradeUnit.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTradeUnit.setUpdateTime(LocalDateTime.now());
-        kwpLedgerTradeUnit.setDelFlag(0);
+        kwpLedgerTradeUnit.setDelFlag(Global.UN_DELETED);
 
         list.add(kwpLedgerTradeUnit);
         Long entId = LoginUserHolder.getEntId();
@@ -249,7 +266,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         }
         //非客户企业方，通过登录用户获取顶级企业
         KwpLedgerTradeUnit sellLedgerTradeUnit = new KwpLedgerTradeUnit();
-        sellLedgerTradeUnit.setId(new IdWorker(1).nextId());
+        sellLedgerTradeUnit.setId(new IdWorker(NumberConstant.ONE).nextId());
         sellLedgerTradeUnit.setTLedgerId(kwpLedgerTrade.getId());
         sellLedgerTradeUnit.setTLedgerNo(kwpLedgerTrade.getTLedgerNo());
         sellLedgerTradeUnit.setUnitType(TradeUnitType.SELL);
@@ -258,13 +275,13 @@ public class KwpLedgerTradeService extends AbsLedger {
         sellLedgerTradeUnit.setFirmName(entCacheResDto1.getFirmName());
         sellLedgerTradeUnit.setContacts(entCacheResDto1.getContacts());
         sellLedgerTradeUnit.setPhone(entCacheResDto1.getPhone());
-        sellLedgerTradeUnit.setRemark("");
-        sellLedgerTradeUnit.setStatus(0);
+        sellLedgerTradeUnit.setRemark(Global.EMPTY_STRING);
+        sellLedgerTradeUnit.setStatus(NumberConstant.ZERO);
         sellLedgerTradeUnit.setCreateBy(LoginUserHolder.getUserId());
         sellLedgerTradeUnit.setCreateTime(LocalDateTime.now());
         sellLedgerTradeUnit.setUpdateBy(LoginUserHolder.getUserId());
         sellLedgerTradeUnit.setUpdateTime(LocalDateTime.now());
-        sellLedgerTradeUnit.setDelFlag(0);
+        sellLedgerTradeUnit.setDelFlag(Global.UN_DELETED);
         list.add(sellLedgerTradeUnit);
 
         tradeUnitService.saveList(list);
@@ -285,7 +302,7 @@ public class KwpLedgerTradeService extends AbsLedger {
             tradeSendReq.setGenerateTime(LocalDateTime.now());
             tradeSendReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
             Long aLong = saveDraft(tradeSendReq);
-            tradeTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
+            tradeTrackService.saveTrack(aLong, Global.EMPTY_STRING, LedgerTrackEnum.TO_LEDGER);
         } else {
             //先删除
             removeDraft(tradeSendReq.getIdLong());
@@ -293,7 +310,7 @@ public class KwpLedgerTradeService extends AbsLedger {
             tradeSendReq.setGenerateTime(LocalDateTime.now());
             tradeSendReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
             Long aLong = saveDraft(tradeSendReq);
-            tradeTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
+            tradeTrackService.saveTrack(aLong, Global.EMPTY_STRING, LedgerTrackEnum.TO_LEDGER);
 
         }
         return "保存对账单成功";
@@ -311,29 +328,36 @@ public class KwpLedgerTradeService extends AbsLedger {
         tradeSendReq.setGenerateTime(null);
         tradeSendReq.setStatus(LedgerEnum.SAVE.getStatus());
         Long aLong = saveDraft(tradeSendReq);
-        tradeTrackService.saveTrack(aLong, "", LedgerTrackEnum.SAVE);
+        tradeTrackService.saveTrack(aLong, Global.EMPTY_STRING, LedgerTrackEnum.SAVE);
         return "草稿保存成功";
     }
 
-
+    /**
+     * 删除对账单
+     *
+     * @param id 对账单id
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
     public String remove(Long id) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         deleteCheck(kwpLedgerTrade.getStatus());
-        kwpLedgerTrade.setDelFlag(1);
+        kwpLedgerTrade.setDelFlag(Global.DELETED);
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
-        tradeTrackService.saveTrack(kwpLedgerTrade.getId(), "", LedgerTrackEnum.DELETE);
+        tradeTrackService.saveTrack(kwpLedgerTrade.getId(), Global.EMPTY_STRING, LedgerTrackEnum.DELETE);
         return "删除成功";
     }
 
     /**
      * 撤回对账单
      *
-     * @param id
+     * @param id 对账单id
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public String backOrder(Long id) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
@@ -343,14 +367,14 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
 
-        tradeTrackService.saveTrack(id, "", LedgerTrackEnum.REVOKE);
+        tradeTrackService.saveTrack(id, Global.EMPTY_STRING, LedgerTrackEnum.REVOKE);
         return "撤回成功";
     }
 
     /**
      * 查询贸易对账单驳回记录
      *
-     * @param id
+     * @param id 对账单id
      * @return
      */
     public KwpLedgerTradeTrack queryBack(Long id) {
@@ -366,6 +390,7 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @param ledgerReq
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public String doBack(LedgerReq ledgerReq) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(ledgerReq.getIdLong());
         orderCheck(kwpLedgerTrade);
@@ -381,7 +406,7 @@ public class KwpLedgerTradeService extends AbsLedger {
     /**
      * 对账确认
      *
-     * @param confirmReq
+     * @param confirmReq 对账确认参数
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
@@ -396,55 +421,61 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
-        tradeTrackService.saveTrack(confirmReq.getIdLong(), "", LedgerTrackEnum.CONFIRM);
+        tradeTrackService.saveTrack(confirmReq.getIdLong(), Global.EMPTY_STRING, LedgerTrackEnum.CONFIRM);
         return "对账确认成功";
     }
 
     /**
      * 对账完成
      *
-     * @param ledgerReq
+     * @param ledgerReq 对账完成参数
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
     public String orderSuccess(LedgerSuccessReq ledgerReq) {
         Long id = ledgerReq.getIdLong();
-
+        //校验对账单状态
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         successCheck(kwpLedgerTrade.getStatus());
-
+        //更新对账单
         kwpLedgerTrade.setReceiptTime(LocalDateTime.of(ledgerReq.getReceiptTime(), LocalTime.MIN));
         kwpLedgerTrade.setStatus(LedgerEnum.SUCCESS.getStatus());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
         //生成结算单
         KwpSettlementTrade kwpSettlementTrade = new KwpSettlementTrade();
-        kwpSettlementTrade.setId(new IdWorker(1).nextId());
+        kwpSettlementTrade.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwpSettlementTrade.setEntId(LoginUserHolder.getEntId());
         kwpSettlementTrade.setTLedgerId(kwpLedgerTrade.getId());
         kwpSettlementTrade.setStOrderNo(OrderGenerateUtils.generateOrderNo("ST"));
         kwpSettlementTrade.setName(kwpLedgerTrade.getName());
         kwpSettlementTrade.setTotalPrice(kwpLedgerTrade.getTotalPrice());
         kwpSettlementTrade.setActualPrice(kwpLedgerTrade.getActualPrice());
-        kwpSettlementTrade.setRemark("");
+        kwpSettlementTrade.setRemark(Global.EMPTY_STRING);
         kwpSettlementTrade.setAuditUser(kwpLedgerTrade.getAuditUser());
         kwpSettlementTrade.setAuditPhone(kwpLedgerTrade.getAuditPhone());
         kwpSettlementTrade.setSuccessUser(ledgerReq.getSuccessUser());
         kwpSettlementTrade.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementTrade.setReceiptTime(LocalDateTime.of(ledgerReq.getReceiptTime(), LocalTime.MIN));
-        kwpSettlementTrade.setStatus(1);//1-待结算
+        kwpSettlementTrade.setStatus(SettlementEnum.WAITING_PAYMENT.getStatus());//1-待结算
         kwpSettlementTrade.setCreateBy(LoginUserHolder.getUserId());
         kwpSettlementTrade.setCreateTime(LocalDateTime.now());
         kwpSettlementTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpSettlementTrade.setUpdateTime(LocalDateTime.now());
-        kwpSettlementTrade.setDelFlag(0);
+        kwpSettlementTrade.setDelFlag(Global.UN_DELETED);
         settlementTradeService.save(kwpSettlementTrade);
 
-        tradeTrackService.saveTrack(id, "", LedgerTrackEnum.SUCCESS);
+        tradeTrackService.saveTrack(id, Global.EMPTY_STRING, LedgerTrackEnum.SUCCESS);
         return "对账完成";
     }
 
+    /**
+     * 按分类统计对账单表头数量
+     *
+     * @param tradeReq 查询参数
+     * @return
+     */
     public List<TableTop> orderCount(TradeReq tradeReq) {
         tradeReq.setEntId(LoginUserHolder.getEntId());
         Map<String, Long> map = tradeMapper.countOrder(tradeReq);
@@ -452,7 +483,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         List<TableTop> res = new ArrayList<>();
         for (LedgerEnum value : LedgerEnum.values()) {
             ledgerCountVo = new TableTop();
-            ledgerCountVo.setTotal(Math.toIntExact(map.get(String.valueOf(value.getLabel()))));
+            ledgerCountVo.setTotal(Math.toIntExact(map.get(value.getLabel())));
             ledgerCountVo.setName(value.getDesc());
             ledgerCountVo.setValue(value.getStatus());
             res.add(ledgerCountVo);
@@ -460,6 +491,12 @@ public class KwpLedgerTradeService extends AbsLedger {
         return res;
     }
 
+    /**
+     * 根据id查询对账单列表
+     *
+     * @param ids 对账单id列表
+     * @return 对账单数据
+     */
     public List<ILedger> selectSellList(List<Long> ids) {
         List<LedgerSellDto> ledgerTradeDto = tradeMapper.selectSellIds(ids);
         List<ILedger> ledgerSellDto = new ArrayList<>(ledgerTradeDto);
@@ -467,6 +504,12 @@ public class KwpLedgerTradeService extends AbsLedger {
         return ledgerSellDto;
     }
 
+    /**
+     * 根据id查询对账单列表
+     *
+     * @param ids 对账单id列表
+     * @return 对账单数据
+     */
     public List<ILedger> selectPurchaseList(List<Long> ids) {
         List<LedgerPurchaseDto> ledgerTradeDto = tradeMapper.selectPurchaseIds(ids);
         List<ILedger> ledgerSellDto = new ArrayList<>(ledgerTradeDto);
@@ -474,10 +517,17 @@ public class KwpLedgerTradeService extends AbsLedger {
         return ledgerSellDto;
     }
 
+    /**
+     * 更新对账单查询
+     *
+     * @param id 对账单id
+     * @return 对账单详情数据
+     */
     public LedgerTradeDetailVo queryUpdate(Long id) {
         LedgerTradeDto ledgerTradeDto = tradeMapper.selectId(id, TradeUnitType.PURCHASE);
         orderCheck(ledgerTradeDto);
         updateCheck(ledgerTradeDto.getStatus());
+        //查询对账单关联的订单
         List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = tradeOrderService.queryList(ledgerTradeDto.getId());
         LedgerTradeDetailVo ledgerTradeDetailVo = new LedgerTradeDetailVo();
         ledgerTradeDetailVo.setId(ledgerTradeDto.getId());
@@ -494,6 +544,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         List<Long> collect = kwpLedgerTradeOrders.stream().map(KwpLedgerTradeOrder::getTOrderId).toList();
         List<OrderDetailRes> detailRes = new ArrayList<>();
         OrderDetailRes orderDetailById;
+        //查询贸易订单详情
         for (Long aLong : collect) {
             orderDetailById = tradeOrderInfoService.getOrderDetailById(aLong);
             detailRes.add(orderDetailById);
@@ -502,10 +553,17 @@ public class KwpLedgerTradeService extends AbsLedger {
         return ledgerTradeDetailVo;
     }
 
+    /**
+     * 查询对账单详情
+     *
+     * @param id       对账单id
+     * @param unitType 企业单位类型
+     * @return 对账单详情
+     */
     public LedgerTradeDetailVo queryDetail(Long id, Integer unitType) {
         LedgerTradeDto ledgerTradeDto = tradeMapper.selectId(id, unitType);
         orderCheck(ledgerTradeDto);
-
+        //查询对账单关联的贸易订单
         List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = tradeOrderService.queryList(ledgerTradeDto.getId());
         LedgerTradeDetailVo ledgerTradeDetailVo = new LedgerTradeDetailVo();
         ledgerTradeDetailVo.setId(ledgerTradeDto.getId());

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

@@ -1,6 +1,8 @@
 package com.sckw.payment.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.payment.dao.KwpLedgerTradeTrackMapper;
 import com.sckw.payment.model.KwpLedgerTradeTrack;
@@ -29,13 +31,13 @@ public class KwpLedgerTradeTrackService {
      * @param remark      备注
      * @param status      状态值
      */
-    public Integer saveTrack(Long t_ledger_id, String remark, LedgerTrackEnum status) {
+    public void saveTrack(Long t_ledger_id, String remark, LedgerTrackEnum status) {
         KwpLedgerTradeTrack tradeTrack = new KwpLedgerTradeTrack();
-        tradeTrack.setId(new IdWorker(1).nextId());
+        tradeTrack.setId(new IdWorker(NumberConstant.ONE).nextId());
         tradeTrack.setTLedgerId(t_ledger_id);
         tradeTrack.setRemark(remark);
         tradeTrack.setStatus(status.getStatus());
-        return tradeTrackMapper.insert(tradeTrack);
+        tradeTrackMapper.insert(tradeTrack);
     }
 
     /**
@@ -49,19 +51,24 @@ public class KwpLedgerTradeTrackService {
         LambdaQueryWrapper<KwpLedgerTradeTrack> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpLedgerTradeTrack::getTLedgerId, id);
         wrapper.eq(Objects.nonNull(status), KwpLedgerTradeTrack::getStatus, status.getStatus());
-        wrapper.eq(KwpLedgerTradeTrack::getDelFlag, 0);
+        wrapper.eq(KwpLedgerTradeTrack::getDelFlag, NumberConstant.ZERO);
         wrapper.orderByDesc(KwpLedgerTradeTrack::getCreateTime);
         wrapper.last("limit 1");
         return tradeTrackMapper.selectOne(wrapper);
     }
 
+    /**
+     * 根据对账单id删除队长记录
+     *
+     * @param tLedgerId
+     */
     public void remove(Long tLedgerId) {
         LambdaQueryWrapper<KwpLedgerTradeTrack> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpLedgerTradeTrack::getTLedgerId, tLedgerId);
-        wrapper.eq(KwpLedgerTradeTrack::getDelFlag, 0);
+        wrapper.eq(KwpLedgerTradeTrack::getDelFlag, NumberConstant.ZERO);
         KwpLedgerTradeTrack tradeTrack = new KwpLedgerTradeTrack();
         tradeTrack.setUpdateTime(LocalDateTime.now());
-        tradeTrack.setDelFlag(1);
+        tradeTrack.setDelFlag(Global.DELETED);
         tradeTrackMapper.update(tradeTrack, wrapper);
     }
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.payment.service;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.sckw.core.model.constant.Global;
 import com.sckw.payment.dao.KwpLedgerTradeUnitMapper;
 import com.sckw.payment.model.KwpLedgerTradeUnit;
 import lombok.AllArgsConstructor;
@@ -19,6 +20,11 @@ import java.util.List;
 public class KwpLedgerTradeUnitService {
     private final KwpLedgerTradeUnitMapper tradeUnitMapper;
 
+    /**
+     * 保存企业单位信息
+     *
+     * @param list
+     */
     public void saveList(List<KwpLedgerTradeUnit> list) {
         if (!CollectionUtils.isEmpty(list)) {
             for (KwpLedgerTradeUnit kwpLedgerTradeUnit : list) {
@@ -27,13 +33,18 @@ public class KwpLedgerTradeUnitService {
         }
     }
 
+    /**
+     * 删除企业关联信息
+     *
+     * @param tLedgerId
+     */
     public void remove(Long tLedgerId) {
         KwpLedgerTradeUnit kwpLedgerTradeUnit = new KwpLedgerTradeUnit();
-        kwpLedgerTradeUnit.setDelFlag(1);
+        kwpLedgerTradeUnit.setDelFlag(Global.DELETED);
         kwpLedgerTradeUnit.setUpdateTime(LocalDateTime.now());
         LambdaUpdateWrapper<KwpLedgerTradeUnit> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(KwpLedgerTradeUnit::getTLedgerId, tLedgerId);
-        wrapper.eq(KwpLedgerTradeUnit::getDelFlag, 0);
+        wrapper.eq(KwpLedgerTradeUnit::getDelFlag, Global.UN_DELETED);
         tradeUnitMapper.update(kwpLedgerTradeUnit, wrapper);
     }
 }

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

@@ -14,7 +14,6 @@ import com.sckw.payment.model.dto.SettlementLogisticsDto;
 import com.sckw.payment.model.vo.req.SettlementReq;
 import com.sckw.payment.model.vo.res.SettlementLogisticsStatusCountVo;
 import com.sckw.payment.model.vo.res.SettlementLogisticsSumVo;
-import com.sckw.payment.model.vo.res.SettlementWalletVo;
 import com.sckw.payment.utils.CommonValidator;
 import com.sckw.payment.utils.PageMoreRes;
 import com.sckw.system.api.RemoteSystemService;
@@ -23,12 +22,10 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author Aick Spt

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

@@ -9,17 +9,8 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.dao.KwpSettlementLogisticsMapper;
 import com.sckw.payment.dao.KwpSettlementLogisticsTrackMapper;
 import com.sckw.payment.dao.KwpSettlementOfflineMapper;
-import com.sckw.payment.model.KwpSettlementLogistics;
-import com.sckw.payment.model.KwpSettlementLogisticsTrack;
-import com.sckw.payment.model.KwpSettlementOffline;
-import com.sckw.payment.model.KwpSettlementTrade;
-import com.sckw.payment.model.constant.SettlementEnum;
-import com.sckw.payment.model.constant.SettlementOrderTypeEnum;
-import com.sckw.payment.model.KwpSettlementTradeTrack;
-import com.sckw.payment.model.constant.SettlementEnum;
-import com.sckw.payment.model.constant.SettlementTrackEnum;
-import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.constant.TradingEnum;
+import com.sckw.payment.model.*;
+import com.sckw.payment.model.constant.*;
 import com.sckw.payment.model.dto.SettlementLogisticsDto;
 import com.sckw.payment.model.dto.SettlementOfflineDto;
 import com.sckw.payment.model.dto.SettlementTradeDto;
@@ -27,7 +18,6 @@ import com.sckw.payment.model.vo.req.OfflinePaymentReq;
 import com.sckw.payment.model.vo.req.SettlementOfflinePayReq;
 import com.sckw.payment.model.vo.req.SettlementOfflineReq;
 import com.sckw.payment.model.vo.res.SettlementOfflineVo;
-import com.sckw.payment.model.vo.res.SettlementWalletVo;
 import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.system.api.RemoteSystemService;
@@ -230,6 +220,12 @@ public class KwpSettlementOfflineService {
         return null;
     }
 
+    /**
+     * 分页查询线下结算记录
+     *
+     * @param settlementOfflineReq
+     * @return
+     */
     public PageRes<SettlementOfflineVo> pageListTradeCollection(SettlementOfflineReq settlementOfflineReq) {
         PageHelper.startPage(settlementOfflineReq.getPage(), settlementOfflineReq.getPageSize());
         List<SettlementOfflineDto> settlementOfflineDto = settlementOfflineMapper.pageList(settlementOfflineReq);
@@ -244,6 +240,7 @@ public class KwpSettlementOfflineService {
 
             Long createBy = a.getCreateBy();
             Long updateBy = a.getUpdateBy();
+            //创建人赋值
             UserCacheResDto userCacheResDto = map.get(createBy);
             if (Objects.isNull(userCacheResDto)) {
                 userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
@@ -300,6 +297,7 @@ public class KwpSettlementOfflineService {
                 if (subtract1.compareTo(new BigDecimal("0.0")) < 0) {
                     throw new BusinessException("实际付款金额大于剩余待付款金额");
                 }
+                //更新结算单记录
                 KwpSettlementTrade kwpSettlementTrade = new KwpSettlementTrade();
                 kwpSettlementTrade.setId(byId.getId());
                 kwpSettlementTrade.setActualPrice(actualPrice.add(payPrice));//已收款加本次收款
@@ -313,7 +311,7 @@ public class KwpSettlementOfflineService {
                 kwpSettlementTrade.setUpdateBy(LoginUserHolder.getUserId());
                 kwpSettlementTrade.setUpdateTime(LocalDateTime.now());
                 settlementTradeService.updateById(kwpSettlementTrade);
-
+                //新增线下结算记录
                 KwpSettlementOffline kwpSettlementOffline = new KwpSettlementOffline();
                 kwpSettlementOffline.setId(new IdWorker(1).nextId());
                 kwpSettlementOffline.setEntId(LoginUserHolder.getEntId());

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

@@ -39,18 +39,41 @@ public class KwpSettlementTradeService {
     @DubboReference(version = "2.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
+    /**
+     * 查询结算单详情
+     *
+     * @param id 结算单id
+     * @param unitType 企业单位类型
+     * @return
+     */
     public SettlementTradeDto getById(Long id, Integer unitType) {
         return settlementTradeMapper.getById(id, unitType);
     }
 
+    /**
+     * 根据id查询结算单关联的企业信息
+     *
+     * @param id 结算单id
+     * @return
+     */
     public List<LedgerUnitDto> getListById(Long id) {
         return settlementTradeMapper.getListById(id);
     }
 
+    /**
+     * 保存结算单
+     *
+     * @param kwpSettlementTrade 结算单
+     */
     public void save(KwpSettlementTrade kwpSettlementTrade) {
         settlementTradeMapper.insert(kwpSettlementTrade);
     }
 
+    /**
+     * 字典转换
+     *
+     * @param list 结算单列表数据
+     */
     private void changeDict(List<ISettlement> list) {
         //字典等数据转换
         Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.TRADE_TYPE.getType());
@@ -64,12 +87,17 @@ public class KwpSettlementTradeService {
         }
     }
 
+    /**
+     * 分页查询结算单数据
+     * @param settlementReq 结算单查询参数
+     * @return
+     */
     public PageRes<ISettlement> pageListCollection(SettlementTradeReq settlementReq) {
         settlementReq.setEntId(LoginUserHolder.getEntId());
         PageHelper.startPage(settlementReq.getPage(), settlementReq.getPageSize());
         List<SettlementTradeDto> kwpLedgerLogisticsList = settlementTradeMapper.pageSelect(settlementReq);
         if (!CollectionUtils.isEmpty(kwpLedgerLogisticsList)) {
-            //根据企业类型进行对应的数据
+            //根据企业类型转换对应的数据
             if (Objects.equals(settlementReq.getUnitType(), TradeUnitType.PURCHASE)) {
                 List<SettlementPurchaseDto> list = kwpLedgerLogisticsList.stream().map(a -> {
                     SettlementPurchaseDto settlementSellDto = new SettlementPurchaseDto();
@@ -83,6 +111,7 @@ public class KwpSettlementTradeService {
                 changeDict(ledgerShipperDto);
                 return new PageRes<>(new PageInfo<>(ledgerShipperDto));
             }
+            //根据企业类型转换对应的数据
             if (Objects.equals(settlementReq.getUnitType(), TradeUnitType.SELL)) {
                 List<SettlementSellDto> list = kwpLedgerLogisticsList.stream().map(a -> {
                     SettlementSellDto settlementSellDto = new SettlementSellDto();
@@ -100,6 +129,11 @@ public class KwpSettlementTradeService {
         return new PageRes<>(new PageInfo<>());
     }
 
+    /**
+     * 统计列表的表头数据
+     * @param settlementReq 结算单查询参数
+     * @return
+     */
     public List<TableTop> getCount(SettlementTradeReq settlementReq) {
         Map<String, Long> stringIntegerMap = settlementTradeMapper.countOrder(settlementReq);
         List<TableTop> res = new ArrayList<>(4);
@@ -116,14 +150,20 @@ public class KwpSettlementTradeService {
     /**
      * 表尾统计数据
      *
-     * @param settlementReq
+     * @param settlementReq 结算单查询参数
      * @return
      */
     public SettlementSumVo getCountListCollection(SettlementTradeReq settlementReq) {
         return settlementTradeMapper.sumMoney(settlementReq);
     }
 
-
+    /**
+     * 列表查询
+     *
+     * @param ids      结算单id列表
+     * @param unitType 企业单位类型
+     * @return
+     */
     public List<ISettlement> selectList(List<Long> ids, int unitType) {
         List<SettlementTradeDto> kwpSettlementTrades = settlementTradeMapper.selectByIds(ids, unitType);
         if (!CollectionUtils.isEmpty(kwpSettlementTrades)) {
@@ -142,6 +182,7 @@ public class KwpSettlementTradeService {
                 return ledgerShipperDto;
             }
             if (unitType == TradeUnitType.SELL) {
+                //数据转换
                 List<SettlementSellDto> list = kwpSettlementTrades.stream().map(a -> {
                     SettlementSellDto settlementSellDto = new SettlementSellDto();
                     BeanUtils.copyProperties(a, settlementSellDto);
@@ -158,16 +199,7 @@ public class KwpSettlementTradeService {
         return new ArrayList<>();
     }
 
-    /**
-     * 结算-物流订单详情
-     *
-     * @param id 结算物流订单id
-     * @author Aick Spt
-     * @date 2023-07-19 09:11
-     */
-    public SettlementTradeDto detailCollection(Long id) {
-        return null;
-    }
+
 
     public PageRes<SettlementTradeDto> pageListPayment(SettlementReq settlementReq) {
 //        //todo 查询缓存，获取客户企业id
@@ -191,6 +223,10 @@ public class KwpSettlementTradeService {
         return null;
     }
 
+    /**
+     * 更新对账单
+     * @param kwpSettlementTrade 对账单数据
+     */
     public void updateById(KwpSettlementTrade kwpSettlementTrade) {
         settlementTradeMapper.updateById(kwpSettlementTrade);
     }

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

@@ -3,13 +3,13 @@ package com.sckw.payment.service;
 import com.sckw.payment.dao.KwpSettlementTradeTrackMapper;
 import com.sckw.payment.model.KwpSettlementTradeTrack;
 import org.springframework.stereotype.Service;
+
 /**
  * @author xucaiqin
  * @date 2023-07-10 16:38:36
  */
-
 @Service
-public class KwpSettlementTradeTrackService  {
+public class KwpSettlementTradeTrackService {
 
     private final KwpSettlementTradeTrackMapper settlementTradeTrackMapper;
 
@@ -17,6 +17,11 @@ public class KwpSettlementTradeTrackService  {
         this.settlementTradeTrackMapper = settlementTradeTrackMapper;
     }
 
+    /**
+     * 保存结算记录数据
+     *
+     * @param kwpSettlementTradeTrack 结算记录
+     */
     public void save(KwpSettlementTradeTrack kwpSettlementTradeTrack) {
         settlementTradeTrackMapper.insert(kwpSettlementTradeTrack);
     }

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

@@ -2,7 +2,9 @@ package com.sckw.payment.service;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
@@ -12,7 +14,6 @@ import com.sckw.payment.api.model.dto.WalletDto;
 import com.sckw.payment.api.model.dto.common.R;
 import com.sckw.payment.dao.KwpSettlementLogisticsMapper;
 import com.sckw.payment.dao.KwpSettlementLogisticsTrackMapper;
-import com.sckw.payment.dao.KwpSettlementTradeMapper;
 import com.sckw.payment.dao.KwpSettlementWalletMapper;
 import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.*;
@@ -214,7 +215,7 @@ public class KwpSettlementWalletService {
             kwpSettlementWallet.setPayPrice(price);
             kwpSettlementWallet.setTopayPrice(remainingReceivables);
             kwpSettlementWallet.setType(SettlementPayTypeEnum.CASH_ON_DELIVERY.getStatus());
-            kwpSettlementWallet.setRemark("");
+            kwpSettlementWallet.setRemark(Global.EMPTY_STRING);
             kwpSettlementWallet.setStatus(1);
             kwpSettlementWallet.setCreateBy(LoginUserHolder.getUserId());
             kwpSettlementWallet.setCreateTime(LocalDateTime.now());
@@ -279,7 +280,7 @@ public class KwpSettlementWalletService {
                     throw new BusinessException("只支持货货到付款方式订单进行当前操作");
                 }
                 List<LedgerUnitDto> listById = kwpSettlementTradeService.getListById(walletPayReq.getIdLong());
-                if (CollectionUtils.isEmpty(listById) || listById.size() != 2) {
+                if (CollectionUtils.isEmpty(listById) || listById.size() != NumberConstant.TWO) {
                     throw new BusinessException("对账单交易企业双方不存在或缺少");
                 }
                 Long uid = null;
@@ -315,12 +316,12 @@ public class KwpSettlementWalletService {
 //        }
                 //待付款金额-本次付款金额= 剩余待付款金额
                 BigDecimal subtract = byId.getWaitPrice().subtract(walletPayReq.getPrice());
-                if (subtract.compareTo(new BigDecimal("0.0")) < 0) {
+                if (subtract.compareTo(new BigDecimal("0.0")) < NumberConstant.ZERO) {
                     throw new BusinessException("付款金额不能大于待付款金额");
                 }
                 //新增电子钱包结算记录
                 KwpSettlementWallet kwpSettlementWallet = new KwpSettlementWallet();
-                kwpSettlementWallet.setId(new IdWorker(1).nextId());
+                kwpSettlementWallet.setId(new IdWorker(NumberConstant.ONE).nextId());
                 kwpSettlementWallet.setEntId(LoginUserHolder.getEntId());
                 kwpSettlementWallet.setSettlementId(walletPayReq.getIdLong());
                 kwpSettlementWallet.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
@@ -329,20 +330,20 @@ public class KwpSettlementWalletService {
                 kwpSettlementWallet.setPayPrice(walletPayReq.getPrice());
                 kwpSettlementWallet.setTopayPrice(subtract);
                 kwpSettlementWallet.setType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
-                kwpSettlementWallet.setRemark("");
-                kwpSettlementWallet.setStatus(0);
+                kwpSettlementWallet.setRemark(Global.EMPTY_STRING);
+                kwpSettlementWallet.setStatus(NumberConstant.ZERO);
                 kwpSettlementWallet.setCreateBy(LoginUserHolder.getUserId());
                 kwpSettlementWallet.setCreateTime(LocalDateTime.now());
                 kwpSettlementWallet.setUpdateBy(LoginUserHolder.getUserId());
                 kwpSettlementWallet.setUpdateTime(LocalDateTime.now());
-                kwpSettlementWallet.setDelFlag(0);
+                kwpSettlementWallet.setDelFlag(Global.UN_DELETED);
                 settlementWalletMapper.insert(kwpSettlementWallet);
 
                 //更新交易结算单状态和金额
                 KwpSettlementTrade kwpSettlementTrade = new KwpSettlementTrade();
                 kwpSettlementTrade.setId(byId.getId());
                 kwpSettlementTrade.setActualPrice(byId.getActualPrice().add(price));
-                kwpSettlementTrade.setStatus(subtract.compareTo(new BigDecimal("0.0")) == 0 ? SettlementEnum.ALL_PAYMENT.getStatus()
+                kwpSettlementTrade.setStatus(subtract.compareTo(new BigDecimal("0.0")) == NumberConstant.ZERO ? SettlementEnum.ALL_PAYMENT.getStatus()
                         : SettlementEnum.PARTIAL_PAYMENT.getStatus());
                 kwpSettlementTrade.setUpdateBy(LoginUserHolder.getUserId());
                 kwpSettlementTrade.setUpdateTime(LocalDateTime.now());
@@ -363,7 +364,7 @@ public class KwpSettlementWalletService {
      * 预付款、货到付款记录
      * 前端接口分开
      *
-     * @param settlementWalletReq
+     * @param settlementWalletReq 请求参数
      * @return
      */
     public PageRes<SettlementWalletVo> pageList(SettlementWalletReq settlementWalletReq) {
@@ -447,7 +448,7 @@ public class KwpSettlementWalletService {
     /**
      * 销售-预付款
      *
-     * @param id
+     * @param id 结算单id
      * @return
      */
     public String confirmTradeCollection(Long id) {
@@ -481,13 +482,13 @@ public class KwpSettlementWalletService {
                 kwpSettlementWallet.setPayPrice(byId.getTotalPrice());
                 kwpSettlementWallet.setTopayPrice(new BigDecimal("0.0"));
                 kwpSettlementWallet.setType(SettlementWalletPayTypeEnum.ADVANCE_PAYMENT.getStatus());
-                kwpSettlementWallet.setRemark("");
-                kwpSettlementWallet.setStatus(0);
+                kwpSettlementWallet.setRemark(Global.EMPTY_STRING);
+                kwpSettlementWallet.setStatus(NumberConstant.ZERO);
                 kwpSettlementWallet.setCreateBy(LoginUserHolder.getUserId());
                 kwpSettlementWallet.setCreateTime(LocalDateTime.now());
                 kwpSettlementWallet.setUpdateBy(LoginUserHolder.getUserId());
                 kwpSettlementWallet.setUpdateTime(LocalDateTime.now());
-                kwpSettlementWallet.setDelFlag(0);
+                kwpSettlementWallet.setDelFlag(Global.UN_DELETED);
                 settlementWalletMapper.insert(kwpSettlementWallet);
                 settlementTradeTrackService.save(KwpSettlementTradeTrack.build(byId.getId(), SettlementTrackEnum.PRE_PAY.getStatus()));
                 //todo-xcq 调用中台接口
@@ -502,9 +503,9 @@ public class KwpSettlementWalletService {
     }
 
     /**
-     * 电子钱包余额
+     * 货到付款-查询钱包余额
      *
-     * @param id
+     * @param id 结算单id
      * @return
      */
     public BigDecimal getConfirmTradePayment(Long id) {
@@ -516,7 +517,7 @@ public class KwpSettlementWalletService {
             throw new BusinessException("只支持货货到付款方式订单进行当前操作");
         }
         List<LedgerUnitDto> listById = kwpSettlementTradeService.getListById(id);
-        if (CollectionUtils.isEmpty(listById) || listById.size() != 2) {
+        if (CollectionUtils.isEmpty(listById) || listById.size() != NumberConstant.TWO) {
             throw new BusinessException("对账单交易企业双方不存在或缺少");
         }
         Long uid = null;
@@ -541,7 +542,7 @@ public class KwpSettlementWalletService {
             throw new BusinessException("暂未开通电子钱包");
         }
         List<WalletDto> data = wallet.getData();
-        return BigDecimal.valueOf(data.get(0).getMoney() / 100.0);
+        return BigDecimal.valueOf(data.get(NumberConstant.ZERO).getMoney() / 100.0);
     }
 }
 

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

@@ -23,6 +23,12 @@ public class KwpWalletRelationService {
     private KwpWalletRelationMapper relationMapper;
     private final ConcurrentHashMap<Long, String> map = new ConcurrentHashMap<>(12);
 
+    /**
+     * 根据企业id查询中台用户
+     *
+     * @param entId 企业id
+     * @return
+     */
     public String getRelation(Long entId) {
         if (Objects.isNull(entId)) {
             return null;

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -9,6 +9,7 @@ import com.sckw.report.service.KwConsignService;
 import com.sckw.report.service.KwTransportService;
 import com.sckw.report.service.param.AcceptCarriageOrderQuery;
 import com.sckw.report.service.param.ConsignOrderQuery;
+import com.sckw.report.service.param.ContractParam;
 import com.sckw.report.service.param.WaybillOrderQuery;
 import com.sckw.report.service.vo.AcceptCarriageOrderExcelVo;
 import com.sckw.report.service.vo.ConsignOrderExcelVo;
@@ -220,21 +221,16 @@ public class KwTransportController {
     }
 
     /**
-     * 托运合同-根据合同id获取托运订单列表
-     *
-     * @param contractId 合同id
-     * @param page  当前页
-     * @param pageSize  每页条数
+     * 承运合同/托运合同-根据合同id获取托运订单列表
+     * @param contractParam 请求参数
      * @return
      */
-    @RequestMapping(value = "/getLogisticsOrderContract", method = RequestMethod.GET)
-    public HttpResult getLogisticsOrderContract(@RequestParam("contractId") @NotBlank(message = "合同id不能为空") String contractId,
-                                                @RequestParam("page") @NotBlank(message = "分页不能为空") int page,
-                                                @RequestParam("pageSize") @NotBlank(message = "分页条数不能为空") int pageSize) {
+    @RequestMapping(value = "/getLogisticsOrderContract", method = RequestMethod.POST)
+    public HttpResult getLogisticsOrderContract(@Validated @RequestBody ContractParam contractParam) {
         try {
-            return transportService.getLogisticsOrderByContractId(contractId, page, pageSize);
+            return transportService.getLogisticsOrderByContractId(contractParam);
         } catch (Exception e) {
-            log.error("托运合同-根据合同id获取托运订单列表 error:{}", e.getMessage(), e);
+            log.error("承运合同/托运合同-根据合同id获取托运订单列表 error:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -1,7 +1,6 @@
 package com.sckw.report.service;
 
 import com.sckw.core.common.enums.NumberConstant;
-import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
@@ -16,6 +15,7 @@ import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TableTops;
 import com.sckw.report.dao.SckwLogisticsOrderRepository;
+import com.sckw.report.service.param.ContractParam;
 import com.sckw.report.service.param.WaybillOrderQuery;
 import com.sckw.report.service.vo.CarWaybillVo;
 import com.sckw.report.service.vo.WaybillsCountVo;
@@ -447,27 +447,47 @@ public class KwTransportService {
     }
 
     /**
-     * 托运合同-根据合同id获取托运订单列表
+     * 承运合同/托运合同-根据合同id获取托运订单列表
      *
-     * @param contractId 合同id
-     * @param page       当前页
-     * @param pageSize   每页条数
+     * @param contractParam
      * @return
      */
-    public HttpResult getLogisticsOrderByContractId(String contractId, int page, int pageSize) {
+    public HttpResult getLogisticsOrderByContractId(ContractParam contractParam) {
+        HttpResult result = new HttpResult();
+        if (String.valueOf(NumberConstant.ONE).equals(contractParam.getContractType())) {
+            result = getLogisticsOrderContract(contractParam);
+        } else if (String.valueOf(NumberConstant.ONE).equals(contractParam.getContractType())) {
+            result = getLogisticsOrderContract(contractParam);
+        } else {
+            return HttpResult.error("合同类型错误");
+        }
+        return result;
+    }
+
+    private HttpResult getLogisticsOrderContract(ContractParam contractParam) {
+        String contractIds = contractParam.getContractIds();
+        int page = contractParam.getPage();
+        int pageSize = contractParam.getPageSize();
         //模糊匹配
         //根据条件查询所有并排序，且分页
         //设置模糊查询匹配规则  忽略大小写
         // 创建条件对象
         Criteria criteria = new Criteria();
-        // 1. 全等于
-        if (StringUtils.isBlank(contractId)) {
-            return HttpResult.error("合同id为空");
-        } else {
-            criteria.and("contractId").is(contractId);
-        }
+        List<String> stringList = StringUtils.splitStrToList(contractIds, String.class);
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         Query query1 = new Query(criteria);
+        // 1. 模糊查询
+        if (CollectionUtils.isNotEmpty(stringList)) {
+            query1.addCriteria(Criteria.where("contractId").in(stringList));
+        } else {
+            PageResult build = PageResult.build(page, pageSize, 0L, null);
+            return HttpResult.ok(build);
+        }
+//        if (StringUtils.isBlank(contractIds)) {
+//            return HttpResult.error("合同id为空");
+//        } else {
+//            criteria.and("contractId").is(contractIds);
+//        }
         // 12. 总记录数
         long total = mongoTemplate.count(query1, SckwLogisticsOrder.class);
         // 10. 分页
@@ -491,13 +511,24 @@ public class KwTransportService {
                 logisticsOrder.setBillingModeLabel(sysDictResDto1.getLabel());
             }
             logisticsOrder.setStatusLabel(LogisticsOrderEnum.getDestination(logisticsOrder.getStatus()));
+//            logisticsOrder.setCreateTime(DateUtil.offsetDay(logisticsOrder.getCreateTime()))
         }
-        PageResult build = PageResult.build(page, pageSize, total, list);
+//        Map<String, List<SckwLogisticsOrder>> atomMap = list.stream().collect(Collectors.groupingBy(SckwLogisticsOrder::getContractId,Collectors.(
+//                        Comparator.comparing(SckwLogisticsOrder::getContractId).reversed())));
+
+        Map<String, List<SckwLogisticsOrder>> collect = list.stream().collect(Collectors.groupingBy(SckwLogisticsOrder::getContractId, Collectors.toList()));
+        List<SckwLogisticsOrder> returnList = new ArrayList<>();
+        for (List<SckwLogisticsOrder> value : collect.values()) {
+            returnList.addAll(value);
+        }
+//        PageResult build = PageResult.build(page, pageSize, total, list);
+        PageResult build = PageResult.build(page, pageSize, total, returnList);
         return HttpResult.ok(build);
     }
 
     /**
      * 运单管理-运单列表 运单地址查询接口
+     *
      * @param type
      * @return
      */
@@ -507,12 +538,12 @@ public class KwTransportService {
         criteria.and("delFlag").is(NumberConstant.ZERO);
         Query query = new Query(criteria);
         String field;
-        if(type == NumberConstant.ONE) {
+        if (type == NumberConstant.ONE) {
             field = "loadCityCode";
         } else {
             field = "unloadCityCode";
         }
-        List<Integer> list  = mongoTemplate.findDistinct(query, field ,SckwWaybillOrder.class, Integer.class);
+        List<Integer> list = mongoTemplate.findDistinct(query, field, SckwWaybillOrder.class, Integer.class);
         List<AreaTreeFrontResDto> areaTreeFrontResDtos = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             areaTreeFrontResDtos = remoteSystemService.queryAreaTreeFrontByCodeList(list);

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/ContractParam.java

@@ -0,0 +1,26 @@
+package com.sckw.report.service.param;
+
+import com.sckw.core.model.page.PageRequest;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * @author lfdc
+ * @description 合同查询列表param
+ * @date 2023-08-03 13:08:51
+ */
+@Data
+public class ContractParam extends PageRequest {
+
+    /**
+     * 合同id  “,”隔开
+     */
+    @NotBlank(message = "合同ids不能为空")
+    private String contractIds;
+    /**
+     * 类型 1 托运合同 2 承运合同
+     */
+    @NotBlank(message = "托运合同不能为空")
+    private String contractType;
+
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/OrderListRes.java

@@ -165,9 +165,9 @@ public class OrderListRes {
      */
     private String remark;
     /**
-     * 创建人
+     * 创建人e
      */
-    private String creatByName;
+    private String createByName;
     /**
      * 创建时间
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ConsignOrderService.java

@@ -6,7 +6,6 @@ import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.StringConstant;
-import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
@@ -1056,9 +1055,9 @@ public class ConsignOrderService {
         Map<Integer, List<Integer>> map = addressList.stream().collect(Collectors.
                 groupingBy(KwtLogisticsOrderAddress::getAddressType, Collectors.mapping(KwtLogisticsOrderAddress::getCityCode, Collectors.toList())));
         //装货地址下拉列表树
-        List<AreaTreeFrontResDto> loadTree = remoteSystemService.queryAreaTreeFrontByCodeList(map.get(DictEnum.TORDER_ADDRESS_TYPE_1.getValue()));
+        List<AreaTreeFrontResDto> loadTree = remoteSystemService.queryAreaTreeFrontByCodeList(map.get(NumberConstant.ONE));
         //卸货地址下拉列表树
-        List<AreaTreeFrontResDto> unloadTree = remoteSystemService.queryAreaTreeFrontByCodeList(map.get(DictEnum.TORDER_ADDRESS_TYPE_2.getValue()));
+        List<AreaTreeFrontResDto> unloadTree = remoteSystemService.queryAreaTreeFrontByCodeList(map.get(NumberConstant.TWO));
         res.setLoadAddressList(loadTree).setUnloadAddressList(unloadTree);
         return HttpResult.ok(res);
     }