物流结算字段调整统一

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementLogisticsDto.java

@@ -144,7 +144,7 @@ public class SettlementLogisticsDto {
     /**
      * 交易方式
      */
-    private String ledgerTrading;
+    private String trading;
 
     /**
      * 对账单编号
@@ -166,12 +166,12 @@ public class SettlementLogisticsDto {
     /**
      * 实际应收还款
      */
-    private BigDecimal ledgerSettlePrice;
+    private BigDecimal settlePrice;
 
     /**
      * 剩余待还款
      */
-    private BigDecimal residuePrice;
+    private BigDecimal waitPrice;
 
     /**
      * 附件

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementLogisticsVo.java

@@ -128,7 +128,7 @@ public class SettlementLogisticsVo {
      * 交易方式
      */
     @ExcelProperty(value = "交易方式")
-    private Integer ledgerTrading;
+    private String trading;
 
     /**
      * 对账单编号

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

@@ -246,14 +246,14 @@ public class KwpSettlementLogisticsService {
      */
     private void setDetailDesc(SettlementLogisticsDto settlementLogisticsDto) {
         settlementLogisticsDto.setStatusLabel(SettlementEnum.getStatusDesc(settlementLogisticsDto.getStatus()));
-        if (settlementLogisticsDto.getLedgerSettlePrice() != null) {
+        if (settlementLogisticsDto.getSettlePrice() != null) {
             if (settlementLogisticsDto.getActualPrice() != null) {
-                settlementLogisticsDto.setResiduePrice(settlementLogisticsDto.getLedgerSettlePrice().subtract(settlementLogisticsDto.getActualPrice()));
+                settlementLogisticsDto.setWaitPrice(settlementLogisticsDto.getSettlePrice().subtract(settlementLogisticsDto.getActualPrice()));
             } else {
-                settlementLogisticsDto.setResiduePrice(settlementLogisticsDto.getLedgerSettlePrice());
+                settlementLogisticsDto.setWaitPrice(settlementLogisticsDto.getSettlePrice());
             }
         } else {
-            settlementLogisticsDto.setResiduePrice(new BigDecimal(0));
+            settlementLogisticsDto.setWaitPrice(new BigDecimal(0));
         }
         settlementLogisticsDto.setCreateByLabel("创建人名称");//"创建人名称"
         settlementLogisticsDto.setUpdateByLabel("更新人名称");//"更新人名称"

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

@@ -207,7 +207,7 @@ public class KwpSettlementWalletService {
             kwpSettlementWallet.setEntId(settlementLogisticsDto.getEntId());
             kwpSettlementWallet.setSettlementId(settlementLogisticsDto.getId());
             kwpSettlementWallet.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
-            kwpSettlementWallet.setChannel(WalletChannelEnum.getValue(settlementLogisticsDto.getLedgerTrading()));//先用数字默认定义为1
+            kwpSettlementWallet.setChannel(WalletChannelEnum.getValue(settlementLogisticsDto.getTrading()));//先用数字默认定义为1
             kwpSettlementWallet.setPayTime(LocalDateTime.now());
             kwpSettlementWallet.setPayPrice(price);
             kwpSettlementWallet.setTopayPrice(remainingReceivables);

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

@@ -73,7 +73,7 @@
     <sql id="settlementLogisticsSelect">
         select l.name         as ledgerName,
                l.l_ledger_no  as lLedgerNo,
-               l.trading      as ledgerTrading,
+               l.trading      as trading,
                l.settle_price as ledgerSettlePrice,
                l.url          as attachmentUrl,
 
@@ -170,8 +170,8 @@
             resultType="com.sckw.payment.model.dto.SettlementLogisticsDto">
         select l.name         as ledgerName,
                l.l_ledger_no  as lLedgerNo,
-               l.trading      as ledgerTrading,
-               l.settle_price as ledgerSettlePrice,
+               l.trading      as trading,
+               l.settle_price as settlePrice,
                l.url          as attachmentUrl,
 
                lu.unit_type   as unitType,