物流对账单和贸易对账单 新增对账单关联订单接口

修复分页返回异常问题

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

@@ -65,6 +65,17 @@ public class KwpLedgerLogisticsController {
         return HttpResult.ok(kwpLedgerLogisticsService.shipperList(logisticsReq));
     }
 
+    /**
+     * 托运方对账单关联订单
+     *
+     * @param ledgerListReq 对账单id
+     * @return
+     */
+    @GetMapping("shipperOrderList")
+    public HttpResult shipperOrderList(@Valid LedgerListReq ledgerListReq) {
+        return HttpResult.ok(kwpLedgerLogisticsService.orderList(ledgerListReq));
+    }
+
     /**
      * 承运方物流对账单列表查询（物流公司、收钱方）
      *
@@ -76,6 +87,17 @@ public class KwpLedgerLogisticsController {
         return HttpResult.ok(kwpLedgerLogisticsService.carrierList(logisticsReq));
     }
 
+    /**
+     * 承运方对账单关联订单
+     *
+     * @param ledgerListReq 对账单id
+     * @return
+     */
+    @GetMapping("carrierOrderList")
+    public HttpResult carrierOrderList(@Valid LedgerListReq ledgerListReq) {
+        return HttpResult.ok(kwpLedgerLogisticsService.orderList(ledgerListReq));
+    }
+
     /**
      * 承运方-查询物流对账单详情
      *

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

@@ -66,6 +66,17 @@ public class KwpLedgerTradeController {
         return HttpResult.ok(kwpLedgerTradeService.sellList(tradeReq));
     }
 
+    /**
+     * 销售方对账单关联订单
+     *
+     * @param ledgerListReq 对账单id
+     * @return
+     */
+    @GetMapping("sellOrderList")
+    public HttpResult sellOrderList(@Valid LedgerListReq ledgerListReq) {
+        return HttpResult.ok(kwpLedgerTradeService.orderList(ledgerListReq));
+    }
+
     /**
      * 贸易对账单列表查询 采购方
      *
@@ -77,10 +88,21 @@ public class KwpLedgerTradeController {
         return HttpResult.ok(kwpLedgerTradeService.purchaseList(tradeReq));
     }
 
+    /**
+     * 对账单关联订单
+     *
+     * @param ledgerListReq 对账单id
+     * @return
+     */
+    @GetMapping("purchaseOrderList")
+    public HttpResult purchaseOrderList(@Valid LedgerListReq ledgerListReq) {
+        return HttpResult.ok(kwpLedgerTradeService.orderList(ledgerListReq));
+    }
+
     /**
      * 销售-查询贸易对账单详情
      *
-     * @param id
+     * @param id 对账单id
      * @return
      */
     @GetMapping("querySellDetail")

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

@@ -0,0 +1,17 @@
+package com.sckw.payment.model.vo.req;
+
+import com.sckw.core.model.vo.BasePara;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author xucaiqin
+ * @date 2023-08-03 18:07:59
+ */
+@Getter
+@Setter
+public class LedgerListReq extends BasePara {
+    @NotBlank(message = "对账单id不能为空")
+    private String id;
+}

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

@@ -103,27 +103,27 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         logisticsReq.setUnitType(LogisticsUnitType.CARRIER);
         PageHelper.startPage(logisticsReq.getPage(), logisticsReq.getPageSize());
         List<LedgerShipperDto> kwpLedgerLogisticsList = logisticsMapper.shipperSelect(logisticsReq);
+        PageInfo<ILedger> ledgerShipperDtoPageInfo = new PageInfo<>(kwpLedgerLogisticsList);
         //字典转换
         if (!CollectionUtils.isEmpty(kwpLedgerLogisticsList)) {
-            List<ILedger> ledgerShipperDto = new ArrayList<>(kwpLedgerLogisticsList);
-            changeDict(ledgerShipperDto);
-            return new PageRes<>(new PageInfo<>(ledgerShipperDto));
+            changeDict(ledgerShipperDtoPageInfo.getList());
+            return new PageRes<>(ledgerShipperDtoPageInfo);
         }
-        return new PageRes<>(new PageInfo<>());
+        return new PageRes<>();
     }
 
     public PageRes<ILedger> carrierList(LogisticsReq logisticsReq) {
         fillPara(logisticsReq);
-        PageHelper.startPage(logisticsReq.getPage(), logisticsReq.getPageSize());
         logisticsReq.setUnitType(LogisticsUnitType.SHIPPER);
+        PageHelper.startPage(logisticsReq.getPage(), logisticsReq.getPageSize());
         List<LedgerCarrierDto> kwpLedgerLogisticsList = logisticsMapper.carrierSelect(logisticsReq);
+        PageInfo<ILedger> ledgerShipperDtoPageInfo = new PageInfo<>(kwpLedgerLogisticsList);
         //字典转换
         if (!CollectionUtils.isEmpty(kwpLedgerLogisticsList)) {
-            List<ILedger> ledgerShipperDto = new ArrayList<>(kwpLedgerLogisticsList);
-            changeDict(ledgerShipperDto);
-            return new PageRes<>(new PageInfo<>(ledgerShipperDto));
+            changeDict(ledgerShipperDtoPageInfo.getList());
+            return new PageRes<>(ledgerShipperDtoPageInfo);
         }
-        return new PageRes<>(new PageInfo<>(kwpLedgerLogisticsList));
+        return new PageRes<>();
     }
 
     /**
@@ -555,4 +555,16 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         ledgerLogisticsDetailVo.setOrderList(acceptCarriageOrderList);
         return ledgerLogisticsDetailVo;
     }
+
+    public PageRes<LogisticsOrderVO> orderList(LedgerListReq ledgerListReq) {
+        PageHelper.startPage(ledgerListReq.getPage(), ledgerListReq.getPageSize());
+        List<KwpLedgerLogisticsOrder> kwpLedgerLogisticsOrders = logisticsOrderService.queryList(ledgerListReq.getIdLong());
+        if (CollectionUtils.isEmpty(kwpLedgerLogisticsOrders)) {
+            return new PageRes<>();
+        }
+        PageInfo<KwpLedgerLogisticsOrder> pageInfo = new PageInfo<>(kwpLedgerLogisticsOrders);
+        List<LogisticsOrderVO> acceptCarriageOrderList = transportDubboService.getAcceptCarriageOrderList(kwpLedgerLogisticsOrders.stream().map(a -> String.valueOf(a.getLOrderId())).toList());
+        return PageRes.build(pageInfo, acceptCarriageOrderList);
+    }
+
 }

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

@@ -120,13 +120,14 @@ public class KwpLedgerTradeService extends AbsLedger {
         PageHelper.startPage(tradeReq.getPage(), tradeReq.getPageSize());
         tradeReq.setUnitType(TradeUnitType.PURCHASE);
         List<LedgerSellDto> ledgerTradeDto = tradeMapper.sellList(tradeReq);
+        PageInfo<ILedger> ledgerPageInfo = new PageInfo<>(ledgerTradeDto);
+
         //字典转换
         if (!CollectionUtils.isEmpty(ledgerTradeDto)) {
-            List<ILedger> ledgerList = new ArrayList<>(ledgerTradeDto);
-            changeDict(new ArrayList<>(ledgerList));
-            return new PageRes<>(new PageInfo<>(ledgerList));
+            changeDict(ledgerPageInfo.getList());
+            return new PageRes<>(ledgerPageInfo);
         }
-        return new PageRes<>(new PageInfo<>());
+        return new PageRes<>();
     }
 
     /**
@@ -140,11 +141,11 @@ public class KwpLedgerTradeService extends AbsLedger {
         PageHelper.startPage(tradeReq.getPage(), tradeReq.getPageSize());
         tradeReq.setUnitType(TradeUnitType.SELL);
         List<LedgerPurchaseDto> ledgerTradeDto = tradeMapper.purchaseList(tradeReq);
+        PageInfo<ILedger> ledgerPageInfo = new PageInfo<>(ledgerTradeDto);
         //字典转换
         if (!CollectionUtils.isEmpty(ledgerTradeDto)) {
-            List<ILedger> ledgerPurchaseDto = new ArrayList<>(ledgerTradeDto);
-            changeDict(ledgerPurchaseDto);
-            return new PageRes<>(new PageInfo<>(ledgerPurchaseDto));
+            changeDict(ledgerPageInfo.getList());
+            return new PageRes<>(ledgerPageInfo);
         }
         return new PageRes<>(new PageInfo<>());
     }
@@ -587,4 +588,19 @@ public class KwpLedgerTradeService extends AbsLedger {
         ledgerTradeDetailVo.setOrderList(detailRes);
         return ledgerTradeDetailVo;
     }
+
+    public PageRes<OrderDetailRes> orderList(LedgerListReq ledgerListReq) {
+        PageHelper.startPage(ledgerListReq.getPage(), ledgerListReq.getPageSize());
+        List<KwpLedgerTradeOrder> kwpLedgerLogisticsOrders = tradeOrderService.queryList(ledgerListReq.getIdLong());
+        if (CollectionUtils.isEmpty(kwpLedgerLogisticsOrders)) {
+            return new PageRes<>();
+        }
+        PageInfo<KwpLedgerTradeOrder> pageInfo = new PageInfo<>(kwpLedgerLogisticsOrders);
+        List<OrderDetailRes> list = new ArrayList<>();
+        for (KwpLedgerTradeOrder kwpLedgerLogisticsOrder : kwpLedgerLogisticsOrders) {
+            OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(kwpLedgerLogisticsOrder.getTOrderId());
+            list.add(orderDetailById);
+        }
+        return PageRes.build(pageInfo, list);
+    }
 }

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

@@ -42,7 +42,7 @@ public class KwpSettlementTradeService {
     /**
      * 查询结算单详情
      *
-     * @param id 结算单id
+     * @param id       结算单id
      * @param unitType 企业单位类型
      * @return
      */
@@ -89,6 +89,7 @@ public class KwpSettlementTradeService {
 
     /**
      * 分页查询结算单数据
+     *
      * @param settlementReq 结算单查询参数
      * @return
      */
@@ -96,41 +97,45 @@ public class KwpSettlementTradeService {
         settlementReq.setEntId(LoginUserHolder.getEntId());
         PageHelper.startPage(settlementReq.getPage(), settlementReq.getPageSize());
         List<SettlementTradeDto> kwpLedgerLogisticsList = settlementTradeMapper.pageSelect(settlementReq);
+        PageInfo<ISettlement> settlementPageInfo = new PageInfo<>(kwpLedgerLogisticsList);
         if (!CollectionUtils.isEmpty(kwpLedgerLogisticsList)) {
             //根据企业类型转换对应的数据
             if (Objects.equals(settlementReq.getUnitType(), TradeUnitType.PURCHASE)) {
-                List<SettlementPurchaseDto> list = kwpLedgerLogisticsList.stream().map(a -> {
-                    SettlementPurchaseDto settlementSellDto = new SettlementPurchaseDto();
-                    BeanUtils.copyProperties(a, settlementSellDto);
-                    settlementSellDto.setActualPrice(settlementSellDto.changePrice(a.getActualPrice()));
-                    settlementSellDto.setTotalPrice(settlementSellDto.changePrice(a.getTotalPrice()));
-                    settlementSellDto.setWaitPrice(settlementSellDto.changePrice(a.getWaitPrice()));
-                    return settlementSellDto;
-                }).toList();
-                List<ISettlement> ledgerShipperDto = new ArrayList<>(list);
-                changeDict(ledgerShipperDto);
-                return new PageRes<>(new PageInfo<>(ledgerShipperDto));
+                List<ISettlement> res = new ArrayList<>();
+                SettlementPurchaseDto settlementSellDto;
+                for (SettlementTradeDto settlementTradeDto : kwpLedgerLogisticsList) {
+                    settlementSellDto = new SettlementPurchaseDto();
+                    BeanUtils.copyProperties(settlementTradeDto, settlementSellDto);
+                    settlementSellDto.setActualPrice(settlementSellDto.changePrice(settlementTradeDto.getActualPrice()));
+                    settlementSellDto.setTotalPrice(settlementSellDto.changePrice(settlementTradeDto.getTotalPrice()));
+                    settlementSellDto.setWaitPrice(settlementSellDto.changePrice(settlementTradeDto.getWaitPrice()));
+                    res.add(settlementSellDto);
+                }
+                changeDict(res);
+                return new PageRes<>(settlementPageInfo, res);
             }
             //根据企业类型转换对应的数据
             if (Objects.equals(settlementReq.getUnitType(), TradeUnitType.SELL)) {
-                List<SettlementSellDto> list = kwpLedgerLogisticsList.stream().map(a -> {
-                    SettlementSellDto settlementSellDto = new SettlementSellDto();
-                    BeanUtils.copyProperties(a, settlementSellDto);
-                    settlementSellDto.setActualPrice(settlementSellDto.changePrice(a.getActualPrice()));
-                    settlementSellDto.setTotalPrice(settlementSellDto.changePrice(a.getTotalPrice()));
-                    settlementSellDto.setWaitPrice(settlementSellDto.changePrice(a.getWaitPrice()));
-                    return settlementSellDto;
-                }).toList();
-                List<ISettlement> ledgerShipperDto = new ArrayList<>(list);
-                changeDict(ledgerShipperDto);
-                return new PageRes<>(new PageInfo<>(ledgerShipperDto));
+                List<ISettlement> res = new ArrayList<>();
+                SettlementSellDto settlementSellDto;
+                for (SettlementTradeDto settlementTradeDto : kwpLedgerLogisticsList) {
+                    settlementSellDto = new SettlementSellDto();
+                    BeanUtils.copyProperties(settlementTradeDto, settlementSellDto);
+                    settlementSellDto.setActualPrice(settlementSellDto.changePrice(settlementTradeDto.getActualPrice()));
+                    settlementSellDto.setTotalPrice(settlementSellDto.changePrice(settlementTradeDto.getTotalPrice()));
+                    settlementSellDto.setWaitPrice(settlementSellDto.changePrice(settlementTradeDto.getWaitPrice()));
+                    res.add(settlementSellDto);
+                }
+                changeDict(res);
+                return new PageRes<>(settlementPageInfo, res);
             }
         }
-        return new PageRes<>(new PageInfo<>());
+        return new PageRes<>();
     }
 
     /**
      * 统计列表的表头数据
+     *
      * @param settlementReq 结算单查询参数
      * @return
      */
@@ -200,7 +205,6 @@ public class KwpSettlementTradeService {
     }
 
 
-
     public PageRes<SettlementTradeDto> pageListPayment(SettlementReq settlementReq) {
 //        //todo 查询缓存，获取客户企业id
 //        String keywords = settlementReq.getKeywords();
@@ -225,6 +229,7 @@ public class KwpSettlementTradeService {
 
     /**
      * 更新对账单
+     *
      * @param kwpSettlementTrade 对账单数据
      */
     public void updateById(KwpSettlementTrade kwpSettlementTrade) {

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

@@ -81,12 +81,12 @@ public class KwpSettlementWalletService {
      * @date 2023-07-26 16:43
      */
     public PageRes<SettlementWalletVo> pageListLogisticsPayment(SettlementWalletReq settlementWalletReq) {
-        PageHelper.startPage(settlementWalletReq.getPage(), settlementWalletReq.getPageSize());
         settlementWalletReq.setPayType(SettlementPayTypeEnum.CASH_ON_DELIVERY.getStatus());//只筛选 货到付款
+        PageHelper.startPage(settlementWalletReq.getPage(), settlementWalletReq.getPageSize());
         List<SettlementWalletDto> settlementWalletLogisticsList = settlementWalletMapper.pageListLogisticsPayment(settlementWalletReq);
-
+        PageInfo<SettlementWalletDto> pageInfo = new PageInfo<>(settlementWalletLogisticsList);
         if (CollectionUtils.isEmpty(settlementWalletLogisticsList)) {
-            return new PageRes<>(new PageInfo<>());
+            return new PageRes<>();
         }
 
         for (SettlementWalletDto entity : settlementWalletLogisticsList) {
@@ -120,7 +120,7 @@ public class KwpSettlementWalletService {
             return settlementWalletVo;
         }).collect(Collectors.toList());
 
-        return new PageRes<>(new PageInfo<>(collect));
+        return PageRes.build(pageInfo, collect);
     }
 
 
@@ -375,6 +375,7 @@ public class KwpSettlementWalletService {
             return new PageRes<>();
         }
         Map<Long, UserCacheResDto> map = new HashMap<>();
+        PageInfo<SettlementWalletDto> pageInfo = new PageInfo<>(settlementWalletDto);
         //指定返回值
         List<SettlementWalletVo> collect = settlementWalletDto.stream().map(a -> {
             SettlementWalletVo settlementWalletVo = new SettlementWalletVo();
@@ -399,8 +400,7 @@ public class KwpSettlementWalletService {
             }
             return settlementWalletVo;
         }).collect(Collectors.toList());
-
-        return new PageRes<>(new PageInfo<>(collect));
+        return PageRes.build(pageInfo, collect);
     }
 
     public PageRes<SettlementWalletVo> pageListTradeCollection(SettlementWalletReq settlementWalletReq) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/dubbo/PayCenterServiceImpl.java

@@ -31,6 +31,7 @@ public class PayCenterServiceImpl implements PayCenterDubboService {
         if (StringUtils.isBlank(uid)) {
             throw new BusinessException("企业未开通电子钱包");
         }
+        payCenterService.withdrawDetail("kll_0001", "", "");
         payCenterService.walletUnFreeze("kll_0001");
 //        payCenterService.payAgentPay("kll_0001");
         return payCenterService.memberDetail(uid, ChannelEnum.HF);
@@ -42,9 +43,8 @@ public class PayCenterServiceImpl implements PayCenterDubboService {
         if (StringUtils.isBlank(uid)) {
             throw new BusinessException("付款方企业未开通电子钱包");
         }
-        //todo
         String filter = kwpWalletRelationService.getRelation(receiveEntId);
-        if (StringUtils.isBlank(uid)) {
+        if (StringUtils.isBlank(filter)) {
             throw new BusinessException("收款方企业未开通电子钱包");
         }
         return payCenterService.wallet(uid, channel, filter);