修复订单结算的问题

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/entity/KwcContractLogisticsUnit.java

@@ -26,7 +26,7 @@ public class KwcContractLogisticsUnit implements Serializable {
     private Long contractId;
 
     /**
-     * 单位类型（1托运单位、2承运单位）
+     * 单位类型（3托运单位、4承运单位）
      */
     private Integer unitType;
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2837,8 +2837,8 @@ public class KwoTradeOrderService {
                 //钱包退回金额
                 WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
                 unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
-                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
-                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
+                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
+                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(5);
                 unFreezePrepaidDto.setRemark("贸易订单：" + unFreezePrepaidDto.getOrderNo() + ",");
@@ -2851,8 +2851,8 @@ public class KwoTradeOrderService {
                 //2计算订单金额
                 WalletPrepaidDto consumePrepaidDto = new WalletPrepaidDto();
                 unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
-                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
-                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
+                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
+                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(6);
                 consumePrepaidDto.setTradeAmount(kwoTradeOrder.getPrice());

sckw-modules/sckw-order/src/main/java/com/sckw/order/task/TradeOrderTask.java

@@ -237,8 +237,8 @@ public class TradeOrderTask {
                 //钱包退回金额
                 WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
                 unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
-                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
-                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
+                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
+                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(5);
                 unFreezePrepaidDto.setRemark("贸易订单："+unFreezePrepaidDto.getOrderNo()+",");
@@ -251,8 +251,8 @@ public class TradeOrderTask {
                 //2计算订单金额
                 WalletPrepaidDto consumePrepaidDto = new WalletPrepaidDto();
                 unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
-                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
-                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
+                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
+                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(6);
                 consumePrepaidDto.setTradeAmount(kwoTradeOrder.getPrice());
@@ -277,8 +277,8 @@ public class TradeOrderTask {
         //钱包退回金额
         WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
         unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
-        unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
-        unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
+        unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
+        unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
         unFreezePrepaidDto.setOrderType(4);
         unFreezePrepaidDto.setTradeType(5);
         unFreezePrepaidDto.setRemark("贸易订单："+unFreezePrepaidDto.getOrderNo()+",");