ids相关问题修改为字符串，然后通过逗号分隔，id为long调整为字符串，

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

@@ -1,6 +1,8 @@
 package com.sckw.payment.controller;
 
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.dto.ILedger;
@@ -28,6 +30,15 @@ public class KwpLedgerLogisticsController {
     @Resource
     private KwpLedgerLogisticsService kwpLedgerLogisticsService;
 
+    private void fill(LogisticsSendReq logisticsSendReq) {
+        String ids = logisticsSendReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
+        if (CollectionUtils.isEmpty(longs)) {
+            throw new BusinessException("物流订单不能为空");
+        }
+        logisticsSendReq.setOrders(longs);
+    }
+
     /**
      * 物流对账单-发起对账(保存草稿)
      *
@@ -36,6 +47,7 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("sendDraft")
     public HttpResult sendDraft(@RequestBody @Valid LogisticsSendReq logisticsReq) {
+        fill(logisticsReq);
         return HttpResult.ok(kwpLedgerLogisticsService.sendLedgerDraft(logisticsReq));
     }
 
@@ -47,6 +59,7 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("send")
     public HttpResult send(@RequestBody @Valid LogisticsSendReq logisticsReq) {
+        fill(logisticsReq);
         return HttpResult.ok(kwpLedgerLogisticsService.sendLedger(logisticsReq));
     }
 
@@ -73,14 +86,25 @@ public class KwpLedgerLogisticsController {
     }
 
     /**
-     * 查询物流对账单详情（修改物流对账单接口使用）
+     * 查询物流对账单详情
      *
      * @param id
      * @return
      */
     @GetMapping("queryDetail")
-    public HttpResult queryDetail(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(id));
+    public HttpResult queryDetail(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.queryDetail(Long.valueOf(id)));
+    }
+
+    /**
+     * 修改物流对账单详情（修改物流对账单接口使用）
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("queryUpdate")
+    public HttpResult queryUpdate(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.queryUpdate(Long.valueOf(id)));
     }
 
     /**
@@ -105,13 +129,14 @@ public class KwpLedgerLogisticsController {
 
     /**
      * 删除对账单
+     * 释放关联的订单（只有删除操作才释放订单）
      *
      * @param id
      * @return
      */
     @DeleteMapping("delete")
-    public HttpResult delete(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.remove(id));
+    public HttpResult delete(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.remove(Long.valueOf(id)));
     }
 
     /**
@@ -121,8 +146,8 @@ public class KwpLedgerLogisticsController {
      * @return
      */
     @PostMapping("back")
-    public HttpResult back(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.backOrder(id));
+    public HttpResult back(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.backOrder(Long.valueOf(id)));
     }
 
     /**
@@ -143,8 +168,8 @@ public class KwpLedgerLogisticsController {
      * @return
      */
     @GetMapping("queryBack")
-    public HttpResult queryBack(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.queryBack(id));
+    public HttpResult queryBack(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.queryBack(Long.valueOf(id)));
     }
 
     /**
@@ -181,13 +206,14 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("exportShipper")
     public HttpResult exportShipper(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        List<Long> ids = logisticsReq.getIds();
+        String ids = logisticsReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(ids)) {
+        if (CollectionUtils.isEmpty(longs)) {
             PageRes<ILedger> pageResult = kwpLedgerLogisticsService.shipperList(logisticsReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerLogisticsService.selectShipperList(ids);
+            list = kwpLedgerLogisticsService.selectShipperList(longs);
         }
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
@@ -211,14 +237,15 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("exportCarrier")
     public HttpResult exportCarrier(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        List<Long> ids = logisticsReq.getIds();
+        String ids = logisticsReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(ids)) {
+        if (CollectionUtils.isEmpty(longs)) {
             PageRes<ILedger> pageResult = kwpLedgerLogisticsService.carrierList(logisticsReq);
             list = pageResult.getList();
 
         } else {
-            list = kwpLedgerLogisticsService.selectCarrierList(ids);
+            list = kwpLedgerLogisticsService.selectCarrierList(longs);
         }
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");

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

@@ -1,6 +1,8 @@
 package com.sckw.payment.controller;
 
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.dto.ILedger;
@@ -10,8 +12,10 @@ import com.sckw.payment.service.KwpLedgerTradeService;
 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;
@@ -24,10 +28,20 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/kwpLedgerTrade")
+@Validated
 public class KwpLedgerTradeController {
     @Resource
     private KwpLedgerTradeService kwpLedgerTradeService;
 
+    private void fill(TradeSendReq tradeSendReq) {
+        String ids = tradeSendReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
+        if (CollectionUtils.isEmpty(longs)) {
+            throw new BusinessException("销售订单不能为空");
+        }
+        tradeSendReq.setOrders(longs);
+    }
+
     /**
      * 贸易对账单-发起对账(保存草稿)
      *
@@ -36,6 +50,7 @@ public class KwpLedgerTradeController {
      */
     @PostMapping("sendDraft")
     public HttpResult sendDraft(@RequestBody @Valid TradeSendReq tradeSendReq) {
+        fill(tradeSendReq);
         return HttpResult.ok(kwpLedgerTradeService.sendLedgerDraft(tradeSendReq));
     }
 
@@ -47,6 +62,7 @@ public class KwpLedgerTradeController {
      */
     @PostMapping("send")
     public HttpResult send(@RequestBody @Valid TradeSendReq tradeSendReq) {
+        fill(tradeSendReq);
         return HttpResult.ok(kwpLedgerTradeService.sendLedger(tradeSendReq));
     }
 
@@ -73,14 +89,25 @@ public class KwpLedgerTradeController {
     }
 
     /**
-     * 查询物流对账单详情（修改物流对账单接口使用）
+     * 查询贸易对账单详情
      *
      * @param id
      * @return
      */
     @GetMapping("queryDetail")
-    public HttpResult queryDetail(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryDetail(id));
+    public HttpResult queryDetail(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id)));
+    }
+
+    /**
+     * 修改贸易对账单详情（修改物流对账单接口使用）
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("queryUpdate")
+    public HttpResult queryUpdate(@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerTradeService.queryUpdate(Long.valueOf(id)));
     }
 
     /**
@@ -110,8 +137,8 @@ public class KwpLedgerTradeController {
      * @return
      */
     @DeleteMapping("delete")
-    public HttpResult delete(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerTradeService.remove(id));
+    public HttpResult delete(@NotBlank(message = "id不能为空")String id) {
+        return HttpResult.ok(kwpLedgerTradeService.remove(Long.valueOf(id)));
     }
 
     /**
@@ -121,8 +148,8 @@ public class KwpLedgerTradeController {
      * @return
      */
     @PostMapping("back")
-    public HttpResult back(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerTradeService.backOrder(id));
+    public HttpResult back(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerTradeService.backOrder(Long.valueOf(id)));
     }
 
     /**
@@ -143,8 +170,8 @@ public class KwpLedgerTradeController {
      * @return
      */
     @GetMapping("queryBack")
-    public HttpResult queryBack(@RequestParam("id") Long id) {
-        return HttpResult.ok(kwpLedgerTradeService.queryBack(id));
+    public HttpResult queryBack(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+        return HttpResult.ok(kwpLedgerTradeService.queryBack(Long.valueOf(id)));
     }
 
     /**
@@ -182,11 +209,14 @@ public class KwpLedgerTradeController {
     @PostMapping("sellExport")
     public HttpResult sellExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(tradeReq.getIds())) {
+        String ids = tradeReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
+
+        if (CollectionUtils.isEmpty(longs)) {
             PageRes<ILedger> pageResult = kwpLedgerTradeService.sellList(tradeReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerTradeService.selectSellList(tradeReq.getIds());
+            list = kwpLedgerTradeService.selectSellList(longs);
         }
 
         if (CollectionUtils.isEmpty(list)) {
@@ -211,11 +241,14 @@ public class KwpLedgerTradeController {
     @PostMapping("purchaseExport")
     public HttpResult purchaseExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(tradeReq.getIds())) {
+        String ids = tradeReq.getIds();
+        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
+
+        if (CollectionUtils.isEmpty(longs)) {
             PageRes<ILedger> pageResult = kwpLedgerTradeService.purchaseList(tradeReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerTradeService.selectPurchaseList(tradeReq.getIds());
+            list = kwpLedgerTradeService.selectPurchaseList(longs);
         }
 
         if (CollectionUtils.isEmpty(list)) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerLogisticsOrder.java

@@ -4,23 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 
 /**
+ * 对账-物流订单-对账关联交易订单
  * @author xucaiqin
  * @date 2023-07-10 16:42:19
  */
-
-/**
- * 对账-物流订单-对账关联交易订单
- */
-@Getter
-@Setter
-@ToString
+@Data
 @TableName(value = "kwp_ledger_logistics_order")
 public class KwpLedgerLogisticsOrder {
     /**
@@ -41,6 +34,12 @@ public class KwpLedgerLogisticsOrder {
     @TableField(value = "l_order_id")
     private Long lOrderId;
 
+    /**
+     * 物流订单编号（kwt_logistics_order）
+     */
+    @TableField(value = "l_order_no")
+    private String lOrderNo;
+
     /**
      * 备注
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerTradeOrder.java

@@ -4,22 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.Data;
 
-/**
- * @author xucaiqin
- * @date 2023-07-10 16:42:19
- */
+import java.time.LocalDateTime;
 
 /**
  * 对账-交易订单-对账关联交易订单
- */
-@Getter
-@Setter
-@ToString
+* @date 2023-07-27 12:45:43
+* @author xucaiqin
+*/
+@Data
 @TableName(value = "kwp_ledger_trade_order")
 public class KwpLedgerTradeOrder {
     /**
@@ -40,6 +34,12 @@ public class KwpLedgerTradeOrder {
     @TableField(value = "t_order_id")
     private Long tOrderId;
 
+    /**
+     * 交易订单编号（kwo_trade_order）
+     */
+    @TableField(value = "t_order_no")
+    private String tOrderNo;
+
     /**
      * 备注
      */

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

@@ -16,7 +16,7 @@ import lombok.Setter;
 @Setter
 public class LedgerConfirmReq {
     @NotNull(message = "id不能为空")
-    private Long id;
+    private String id;
     /**
      * 对账审核人
      */

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

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Setter
 public class LedgerReq {
     @NotNull(message = "对账单id不能为空")
-    private Long id;
+    private String id;
     @NotBlank(message = "驳回原因不能为空")
     @Size(max = 200, message = "最大不能超过200字符")
     private String remark;

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

@@ -19,7 +19,7 @@ import java.time.LocalDate;
 @Setter
 public class LedgerSuccessReq {
     @NotNull(message = "物流对账单id不能为空")
-    private Long id;
+    private String id;
     @NotBlank(message = "财务联系人不能为空")
     @Size(max = 25, message = "财务联系人不能超过25个字符")
     private String successUser;

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

@@ -7,7 +7,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serial;
-import java.util.List;
 
 /**
  * @author xucaiqin
@@ -27,7 +26,7 @@ public class LogisticsReq extends BasePara {
      * @see LedgerEnum
      */
     private Integer status;
-    private List<Long> ids;
+    private String ids;
     private Long entId;
     private Integer unitType;
 }

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

@@ -18,12 +18,12 @@ import java.util.List;
 @Setter
 public class LogisticsSendReq {
 
-    private Long id;
+    private String id;
     /**
      * 托运单位（客户单位）
      */
     @NotNull(message = "客户单位不能为空")
-    private Long checkEntId;
+    private String checkEntId;
 
     /**
      * 名称
@@ -61,22 +61,6 @@ public class LogisticsSendReq {
      */
     @NotNull(message = "付款方式不能为空")
     private Integer trading;
-    /**
-     * 卸货量
-     */
-    private BigDecimal unloadAmount;
-    /**
-     * 装货量
-     */
-    private BigDecimal loadAmount;
-    /**
-     * 亏损量
-     */
-    private BigDecimal deficitAmount;
-    /**
-     * 合理损耗量
-     */
-    private BigDecimal loseAmount;
     /**
      * 总应收/元
      */
@@ -96,7 +80,9 @@ public class LogisticsSendReq {
      * 承运订单
      */
     @NotEmpty(message = "承运订单不能为空")
-    private List<String> ids;
+    private String ids;
+
+    private List<Long> orders;
     private LocalDateTime generateTime;
     private Integer status;
 

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

@@ -6,7 +6,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serial;
-import java.util.List;
 
 /**
  * @author xucaiqin
@@ -24,7 +23,7 @@ public class TradeReq extends BasePara {
      * @see LedgerEnum
      */
     private Integer status;
-    private List<Long> ids;
+    private String ids;
     private Long entId;
 
 }

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

@@ -1,7 +1,10 @@
 package com.sckw.payment.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -20,12 +23,12 @@ import java.util.List;
 @Setter
 public class TradeSendReq {
 
-    private Long id;
+    private String id;
     /**
      * 采购单位（客户单位）
      */
-    @NotNull(message = "客户单位不能为空")
-    private Long purchaseEntId;
+    @NotBlank(message = "客户单位不能为空")
+    private String purchaseEntId;
     /**
      * 名称
      */
@@ -77,9 +80,10 @@ public class TradeSendReq {
     /**
      * 销售订单
      */
-    @NotEmpty(message = "销售订单不能为空")
-    private List<Long> ids;
+    @NotBlank(message = "销售订单不能为空")
+    private String ids;
 
+    private List<Long> orders;
     private LocalDateTime generateTime;
     private Integer status;
 }

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

@@ -24,7 +24,7 @@ public abstract class AbsLedger {
         }
     }
 
-    public void detailCheck(Integer 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)) {
             throw new BusinessException("只有【已保存】、【已撤回】和【已退回】的单据才支持修改!");

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

@@ -2,6 +2,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.utils.CollectionUtils;
 import com.sckw.payment.dao.KwpLedgerLogisticsOrderMapper;
 import com.sckw.payment.model.KwpLedgerLogisticsOrder;
@@ -44,4 +45,23 @@ public class KwpLedgerLogisticsOrderService {
         }
         return kwpLedgerLogisticsOrders;
     }
+
+    /**
+     * 校验当前物流订单是否已关联其它草稿单
+     *
+     * @param ids
+     */
+    public void check(List<Long> ids) {
+        List<KwpLedgerLogisticsOrder> kwpLedgerLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwpLedgerLogisticsOrder>()
+                .in(KwpLedgerLogisticsOrder::getLOrderId, ids)
+                .eq(KwpLedgerLogisticsOrder::getDelFlag, 0)
+                .select(KwpLedgerLogisticsOrder::getLLedgerId, KwpLedgerLogisticsOrder::getLOrderId, KwpLedgerLogisticsOrder::getLOrderNo));
+        if (CollectionUtils.isNotEmpty(kwpLedgerLogisticsOrders)) {
+            for (KwpLedgerLogisticsOrder kwpLedgerLogisticsOrder : kwpLedgerLogisticsOrders) {
+                if (ids.contains(kwpLedgerLogisticsOrder.getLOrderId())) {
+                    throw new BusinessException(kwpLedgerLogisticsOrder.getLOrderNo() + "已绑定其它对账单");
+                }
+            }
+        }
+    }
 }

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

@@ -15,7 +15,6 @@ import com.sckw.payment.model.KwpLedgerLogisticsTrack;
 import com.sckw.payment.model.KwpLedgerLogisticsUnit;
 import com.sckw.payment.model.KwpSettlementLogistics;
 import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.payment.dao.KwpLedgerLogisticsMapper;
 import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.LedgerTrackEnum;
@@ -33,6 +32,7 @@ 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;
 
@@ -130,15 +130,15 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public String sendLedger(LogisticsSendReq logisticsReq) {
-        Long id = logisticsReq.getId();
-        if (Objects.isNull(id)) {
+        String id = logisticsReq.getId();
+        if (StringUtils.isBlank(id)) {
             //新增
             logisticsReq.setGenerateTime(LocalDateTime.now());
             logisticsReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
             Long aLong = saveDraft(logisticsReq);
             logisticsTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
         } else {
-            removeDraft(id);
+            removeDraft(Long.parseLong(id));
             logisticsReq.setGenerateTime(LocalDateTime.now());
             logisticsReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
             Long aLong = saveDraft(logisticsReq);
@@ -159,7 +159,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
     private Long saveDraft(LogisticsSendReq logisticsSendReq) {
         KwpLedgerLogistics kwpLedgerLogistics = new KwpLedgerLogistics();
-        kwpLedgerLogistics.setId(Objects.isNull(logisticsSendReq.getId()) ? new IdWorker(1).nextId() : logisticsSendReq.getId());
+        kwpLedgerLogistics.setId(StringUtils.isBlank(logisticsSendReq.getId()) ? new IdWorker(1).nextId() : Long.parseLong(logisticsSendReq.getId()));
         kwpLedgerLogistics.setEntId(LoginUserHolder.getEntId());
         kwpLedgerLogistics.setName(logisticsSendReq.getName());
         if (StringUtils.isNotBlank(logisticsSendReq.getStartTime())) {
@@ -177,7 +177,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setAuditUser("");
         kwpLedgerLogistics.setAuditPhone("");
         kwpLedgerLogistics.setReceiptTime(null);
-        kwpLedgerLogistics.setOrderCount(logisticsSendReq.getIds().size());
+        kwpLedgerLogistics.setOrderCount(logisticsSendReq.getOrders().size());
         kwpLedgerLogistics.setUrl("");
         kwpLedgerLogistics.setGenerateTime(logisticsSendReq.getGenerateTime());
         kwpLedgerLogistics.setRemark("");
@@ -191,15 +191,19 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             kwpLedgerLogistics.setLLedgerNo(OrderGenerateUtils.generateOrderNo("LL"));
             logisticsMapper.insert(kwpLedgerLogistics);
         } else {
+            KwpLedgerLogistics ledgerLogistics = logisticsMapper.selectById(logisticsSendReq.getId());
+            orderCheck(ledgerLogistics);
+            updateCheck(ledgerLogistics.getStatus());
             kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
             logisticsMapper.updateById(kwpLedgerLogistics);
         }
         /*保存物流订单关联数据*/
-        List<String> ids = logisticsSendReq.getIds();
+        List<Long> ids = logisticsSendReq.getOrders();
         //todo-xcq 校验当前订单是否已存在绑定的对账单
-        List<KwtLogisticsOrderVO> acceptCarriageOrderDetail = transportDubboService.getAcceptCarriageOrderDetail(ids);
-        if (CollectionUtils.isEmpty(acceptCarriageOrderDetail)) {
+        logisticsOrderService.check(ids);
+        List<KwtLogisticsOrderVO> acceptCarriageOrderDetail = transportDubboService.getAcceptCarriageOrderDetail(ids.stream().map(a -> Long.toString(a)).toList());
+        if (CollectionUtils.isEmpty(acceptCarriageOrderDetail) || acceptCarriageOrderDetail.size() < ids.size()) {
             throw new BusinessException("未找到物流订单!");
         }
         List<KwpLedgerLogisticsOrder> collect = acceptCarriageOrderDetail.stream().map(a -> {
@@ -207,6 +211,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             logisticsOrder.setId(new IdWorker(1).nextId());
             logisticsOrder.setLLedgerId(kwpLedgerLogistics.getId());
             logisticsOrder.setLOrderId(a.getId());
+            logisticsOrder.setLOrderNo(a.getLOrderNo());
             logisticsOrder.setRemark("");
             logisticsOrder.setStatus(0);
             logisticsOrder.setCreateBy(LoginUserHolder.getUserId());
@@ -219,7 +224,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
         logisticsOrderService.saveList(collect);
         /*保存企业相关信息*/
-        Long checkEntId = logisticsSendReq.getCheckEntId();
+        Long checkEntId = Long.parseLong(logisticsSendReq.getCheckEntId());
 
         Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(checkEntId));
         EntCacheResDto entCacheResDto = entMap.get(checkEntId);
@@ -348,7 +353,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      * @return
      */
     public Integer doBack(LedgerReq ledgerReq) {
-        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(ledgerReq.getId());
+        Long id = Long.parseLong(ledgerReq.getId());
+        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         if (Objects.isNull(kwpLedgerLogistics)) {
             throw new BusinessException("对账单不存在!");
         }
@@ -357,7 +363,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         logisticsMapper.updateById(kwpLedgerLogistics);
-        return logisticsTrackService.saveTrack(ledgerReq.getId(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
+        return logisticsTrackService.saveTrack(id, ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
     }
 
     /**
@@ -369,7 +375,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public Integer confirmOrder(LedgerConfirmReq confirmReq) {
-        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(confirmReq.getId());
+        Long id = Long.parseLong(confirmReq.getId());
+        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         orderCheck(kwpLedgerLogistics);
         confirmCheck(kwpLedgerLogistics.getStatus());
         kwpLedgerLogistics.setStatus(LedgerEnum.LEDGERED.getStatus());
@@ -379,7 +386,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         logisticsMapper.updateById(kwpLedgerLogistics);
-        return logisticsTrackService.saveTrack(confirmReq.getId(), "", LedgerTrackEnum.CONFIRM);
+        return logisticsTrackService.saveTrack(id, "", LedgerTrackEnum.CONFIRM);
     }
 
     /**
@@ -390,7 +397,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public String orderSuccess(LedgerSuccessReq ledgerReq) {
-        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(ledgerReq.getId());
+        Long id = Long.parseLong(ledgerReq.getId());
+        KwpLedgerLogistics kwpLedgerLogistics = logisticsMapper.selectById(id);
         orderCheck(kwpLedgerLogistics);
 
         successCheck(kwpLedgerLogistics.getStatus());
@@ -424,7 +432,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
         settlementLogisticsService.save(kwpSettlementLogistics);
 
-        logisticsTrackService.saveTrack(ledgerReq.getId(), "", LedgerTrackEnum.SUCCESS);
+        logisticsTrackService.saveTrack(id, "", LedgerTrackEnum.SUCCESS);
         return "对账完成";
     }
 
@@ -472,11 +480,21 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         return ledgerLogistics;
     }
 
+    public LedgerLogisticsDetailVo queryUpdate(Long id) {
+        LedgerLogisticsDto ledgerLogisticsDto = logisticsMapper.selectId(id);
+        orderCheck(ledgerLogisticsDto);
+        updateCheck(ledgerLogisticsDto.getStatus());
+        return getLedgerLogisticsDetailVo(ledgerLogisticsDto);
+    }
+
     public LedgerLogisticsDetailVo queryDetail(Long id) {
         LedgerLogisticsDto ledgerLogisticsDto = logisticsMapper.selectId(id);
         orderCheck(ledgerLogisticsDto);
-        detailCheck(ledgerLogisticsDto.getStatus());
+        return getLedgerLogisticsDetailVo(ledgerLogisticsDto);
+    }
 
+    @NotNull
+    private LedgerLogisticsDetailVo getLedgerLogisticsDetailVo(LedgerLogisticsDto ledgerLogisticsDto) {
         List<KwpLedgerLogisticsOrder> kwpLedgerLogisticsOrders = logisticsOrderService.queryList(ledgerLogisticsDto.getId());
         LedgerLogisticsDetailVo ledgerLogisticsDetailVo = new LedgerLogisticsDetailVo();
         ledgerLogisticsDetailVo.setId(ledgerLogisticsDto.getId());

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

@@ -2,6 +2,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.utils.CollectionUtils;
 import com.sckw.payment.dao.KwpLedgerTradeOrderMapper;
 import com.sckw.payment.model.KwpLedgerTradeOrder;
@@ -32,7 +33,7 @@ public class KwpLedgerTradeOrderService {
     }
 
     public void saveList(List<KwpLedgerTradeOrder> list) {
-        if(!CollectionUtils.isEmpty(list)){
+        if (!CollectionUtils.isEmpty(list)) {
             for (KwpLedgerTradeOrder kwpLedgerTradeOrder : list) {
                 tradeOrderMapper.insert(kwpLedgerTradeOrder);
             }
@@ -47,4 +48,18 @@ public class KwpLedgerTradeOrderService {
         }
         return kwpLedgerLogisticsOrders;
     }
+
+    public void check(List<Long> ids) {
+        List<KwpLedgerTradeOrder> kwpLedgerLogisticsOrders = tradeOrderMapper.selectList(new LambdaQueryWrapper<KwpLedgerTradeOrder>()
+                .in(KwpLedgerTradeOrder::getTOrderId, ids)
+                .eq(KwpLedgerTradeOrder::getDelFlag, 0)
+                .select(KwpLedgerTradeOrder::getTLedgerId, KwpLedgerTradeOrder::getTOrderId, KwpLedgerTradeOrder::getTOrderNo));
+        if (CollectionUtils.isNotEmpty(kwpLedgerLogisticsOrders)) {
+            for (KwpLedgerTradeOrder kwpLedgerTradeOrder : kwpLedgerLogisticsOrders) {
+                if (ids.contains(kwpLedgerTradeOrder.getTOrderId())) {
+                    throw new BusinessException(kwpLedgerTradeOrder.getTOrderNo() + "已绑定其它对账单");
+                }
+            }
+        }
+    }
 }

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

@@ -141,13 +141,13 @@ public class KwpLedgerTradeService extends AbsLedger {
 
     private Long saveDraft(TradeSendReq tradeSendReq) {
         KwpLedgerTrade kwpLedgerTrade = new KwpLedgerTrade();
-        kwpLedgerTrade.setId(Objects.isNull(tradeSendReq.getId()) ? new IdWorker(1).nextId() : tradeSendReq.getId());
+        kwpLedgerTrade.setId(StringUtils.isBlank(tradeSendReq.getId()) ? new IdWorker(1).nextId() : Long.parseLong(tradeSendReq.getId()));
         kwpLedgerTrade.setEntId(LoginUserHolder.getEntId());
         kwpLedgerTrade.setName(tradeSendReq.getName());
-        if(StringUtils.isNotBlank(tradeSendReq.getStartTime())){
+        if (StringUtils.isNotBlank(tradeSendReq.getStartTime())) {
             kwpLedgerTrade.setStartTime(StringTimeUtil.startDateTime(tradeSendReq.getStartTime()));
         }
-        if(StringUtils.isNotBlank(tradeSendReq.getEndTime())){
+        if (StringUtils.isNotBlank(tradeSendReq.getEndTime())) {
             kwpLedgerTrade.setEndTime(StringTimeUtil.endDateTime(tradeSendReq.getEndTime()));
         }
         kwpLedgerTrade.setTaxRate(tradeSendReq.getTaxRate());
@@ -160,7 +160,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setAuditPhone("");
         kwpLedgerTrade.setGenerateTime(tradeSendReq.getGenerateTime());
         kwpLedgerTrade.setReceiptTime(null);
-        kwpLedgerTrade.setOrderCount(tradeSendReq.getIds().size());
+        kwpLedgerTrade.setOrderCount(tradeSendReq.getOrders().size());
         kwpLedgerTrade.setUrl("");
         kwpLedgerTrade.setRemark("");
         kwpLedgerTrade.setStatus(tradeSendReq.getStatus());
@@ -174,14 +174,18 @@ public class KwpLedgerTradeService extends AbsLedger {
             kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
             tradeMapper.insert(kwpLedgerTrade);
         } else {
+            KwpLedgerTrade ledgerTrade = tradeMapper.selectById(tradeSendReq.getId());
+            orderCheck(ledgerTrade);
+            updateCheck(ledgerTrade.getStatus());
             kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
             tradeMapper.updateById(kwpLedgerTrade);
         }
 
         /*保存贸易订单关联数据*/
-        List<Long> ids = tradeSendReq.getIds();
+        List<Long> ids = tradeSendReq.getOrders();
         //todo-xcq 校验当前订单是否已存在绑定的对账单
+        tradeOrderService.check(ids);
         List<OrderDetailRes> resList = new ArrayList<>();
         for (Long id : ids) {
             OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(id);
@@ -207,7 +211,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         tradeOrderService.saveList(collect);
         /*保存企业单位相关信息*/
         //todo-xcq dubbo拿取采购客户单位的信息
-        Long purchaseEntId = tradeSendReq.getPurchaseEntId();
+        Long purchaseEntId = Long.parseLong(tradeSendReq.getPurchaseEntId());
         Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(purchaseEntId));
         EntCacheResDto entCacheResDto = entMap.get(purchaseEntId);
         if (Objects.isNull(entCacheResDto)) {
@@ -272,8 +276,8 @@ public class KwpLedgerTradeService extends AbsLedger {
     @Transactional(rollbackFor = Exception.class)
     public String sendLedger(TradeSendReq tradeSendReq) {
         log.info("保存对账单入参：{}", JSONObject.toJSONString(tradeSendReq));
-        Long id = tradeSendReq.getId();
-        if (Objects.isNull(id)) {
+        String id = tradeSendReq.getId();
+        if (StringUtils.isBlank(id)) {
             //新增
             tradeSendReq.setGenerateTime(LocalDateTime.now());
             tradeSendReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
@@ -281,7 +285,7 @@ public class KwpLedgerTradeService extends AbsLedger {
             tradeTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
         } else {
             //先删除
-            removeDraft(id);
+            removeDraft(Long.parseLong(id));
             //在新增
             tradeSendReq.setGenerateTime(LocalDateTime.now());
             tradeSendReq.setStatus(LedgerEnum.TO_LEDGER.getStatus());
@@ -360,14 +364,15 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @return
      */
     public String doBack(LedgerReq ledgerReq) {
-        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(ledgerReq.getId());
+        Long id = Long.parseLong(ledgerReq.getId());
+        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         backCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.BACK.getStatus());
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
-        tradeTrackService.saveTrack(ledgerReq.getId(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
+        tradeTrackService.saveTrack(id, ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
         return "驳回成功";
     }
 
@@ -379,7 +384,8 @@ public class KwpLedgerTradeService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public String confirmOrder(LedgerConfirmReq confirmReq) {
-        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(confirmReq.getId());
+        Long id = Long.parseLong(confirmReq.getId());
+        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         confirmCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.LEDGERED.getStatus());
@@ -389,7 +395,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
-        tradeTrackService.saveTrack(confirmReq.getId(), "", LedgerTrackEnum.CONFIRM);
+        tradeTrackService.saveTrack(id, "", LedgerTrackEnum.CONFIRM);
         return "对账确认成功";
     }
 
@@ -401,7 +407,9 @@ public class KwpLedgerTradeService extends AbsLedger {
      */
     @Transactional(rollbackFor = Exception.class)
     public String orderSuccess(LedgerSuccessReq ledgerReq) {
-        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(ledgerReq.getId());
+        Long id = Long.parseLong(ledgerReq.getId());
+
+        KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         orderCheck(kwpLedgerTrade);
         successCheck(kwpLedgerTrade.getStatus());
 
@@ -432,7 +440,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setDelFlag(0);
         settlementTradeService.save(kwpSettlementTrade);
 
-        tradeTrackService.saveTrack(ledgerReq.getId(), "", LedgerTrackEnum.SUCCESS);
+        tradeTrackService.saveTrack(id, "", LedgerTrackEnum.SUCCESS);
         return "对账完成";
     }
 
@@ -464,10 +472,38 @@ public class KwpLedgerTradeService extends AbsLedger {
         return ledgerSellDto;
     }
 
+    public LedgerTradeDetailVo queryUpdate(Long id) {
+        LedgerTradeDto ledgerTradeDto = tradeMapper.selectId(id);
+        orderCheck(ledgerTradeDto);
+        updateCheck(ledgerTradeDto.getStatus());
+        List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = tradeOrderService.queryList(ledgerTradeDto.getId());
+        LedgerTradeDetailVo ledgerTradeDetailVo = new LedgerTradeDetailVo();
+        ledgerTradeDetailVo.setId(ledgerTradeDto.getId());
+        ledgerTradeDetailVo.setTLedgerNo(ledgerTradeDto.getTLedgerNo());
+        ledgerTradeDetailVo.setName(ledgerTradeDto.getName());
+        ledgerTradeDetailVo.setFirmName(ledgerTradeDto.getFirmName());
+        ledgerTradeDetailVo.setTrading(ledgerTradeDto.getTrading());
+        ledgerTradeDetailVo.setTaxRate(ledgerTradeDto.getTaxRate());
+        ledgerTradeDetailVo.setTotalPrice(ledgerTradeDto.getTotalPrice());
+        ledgerTradeDetailVo.setActualPrice(ledgerTradeDto.getActualPrice());
+        ledgerTradeDetailVo.setStartTime(ledgerTradeDto.getStartTime());
+        ledgerTradeDetailVo.setEndTime(ledgerTradeDto.getEndTime());
+        ledgerTradeDetailVo.setRemark(ledgerTradeDto.getRemark());
+        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);
+        }
+        ledgerTradeDetailVo.setOrderList(detailRes);
+        return ledgerTradeDetailVo;
+    }
+
     public LedgerTradeDetailVo queryDetail(Long id) {
         LedgerTradeDto ledgerTradeDto = tradeMapper.selectId(id);
         orderCheck(ledgerTradeDto);
-        detailCheck(ledgerTradeDto.getStatus());
+
         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/KwpSettlementLogisticsService.java

@@ -1,15 +1,11 @@
 package com.sckw.payment.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.payment.dao.KwpSettlementLogisticsMapper;
-import com.sckw.payment.model.KwpLedgerTradeTrack;
 import com.sckw.payment.model.KwpSettlementLogistics;
-import com.sckw.payment.model.constant.LedgerTrackEnum;
 import com.sckw.payment.model.constant.SettlementEnum;
-import com.sckw.payment.model.dto.LedgerTradeDto;
 import com.sckw.payment.model.dto.SettlementLogisticsDto;
 import com.sckw.payment.model.vo.req.SettlementReq;
 import com.sckw.payment.model.vo.res.SettlementLogisticsStatusCountVo;
@@ -17,15 +13,11 @@ import com.sckw.payment.model.vo.res.SettlementLogisticsSumVo;
 import com.sckw.payment.utils.CommonValidator;
 import com.sckw.payment.utils.PageMoreRes;
 import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author Aick Spt
@@ -37,6 +29,9 @@ import java.util.Objects;
 public class KwpSettlementLogisticsService {
     private final KwpSettlementLogisticsMapper settlementLogisticsMapper;
 
+    public void save(KwpSettlementLogistics settlementLogistics) {
+        settlementLogisticsMapper.insert(settlementLogistics);
+    }
 //    public SettlementLogisticsStatusCountVo getCountList() {
 //        SettlementLogisticsStatusCountVo settlementLogisticsStatusCountVos = new SettlementLogisticsStatusCountVo();
 //        LambdaQueryWrapper<KwpSettlementLogistics> wrapper = new LambdaQueryWrapper<>();
@@ -190,6 +185,7 @@ public class KwpSettlementLogisticsService {
     public List<SettlementLogisticsDto> selectList(List<Long> ids) {
         return settlementLogisticsMapper.selectIds(ids);
     }
+
     public List<SettlementLogisticsDto> selectList(Integer unitType) {
         return settlementLogisticsMapper.selectList(unitType);
     }

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerLogisticsOrderMapper.xml

@@ -7,6 +7,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="l_ledger_id" jdbcType="BIGINT" property="lLedgerId" />
     <result column="l_order_id" jdbcType="BIGINT" property="lOrderId" />
+    <result column="l_order_no" jdbcType="VARCHAR" property="lOrderNo" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_by" jdbcType="BIGINT" property="createBy" />
@@ -17,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, l_ledger_id, l_order_id, remark, `status`, create_by, create_time, update_by, 
-    update_time, del_flag
+    id, l_ledger_id, l_order_id, l_order_no, remark, `status`, create_by, create_time, 
+    update_by, update_time, del_flag
   </sql>
 </mapper>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerTradeOrderMapper.xml

@@ -7,6 +7,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="t_ledger_id" jdbcType="BIGINT" property="tLedgerId" />
     <result column="t_order_id" jdbcType="BIGINT" property="tOrderId" />
+    <result column="t_order_no" jdbcType="VARCHAR" property="tOrderNo" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_by" jdbcType="BIGINT" property="createBy" />
@@ -17,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, t_ledger_id, t_order_id, remark, `status`, create_by, create_time, update_by, 
-    update_time, del_flag
+    id, t_ledger_id, t_order_id, t_order_no, remark, `status`, create_by, create_time, 
+    update_by, update_time, del_flag
   </sql>
 </mapper>