调整钱包明细中订单号来源

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

@@ -2220,7 +2220,7 @@ public class KwoTradeOrderService {
         List<TradeContractUnitDto> unitList = tradeContractResDto.getUnitList();
         List<KwoTradeOrderUnit> list = new ArrayList<>();
         WalletPrepaidDto walletFreeze = new WalletPrepaidDto();
-        walletFreeze.setOrderNo(String.valueOf(order.getId()));
+        walletFreeze.setOrderNo(order.getTOrderNo());
         walletFreeze.setTradeAmount(order.getPrice());
         unitList.forEach(e -> {
             KwoTradeOrderUnit unit = BeanUtil.copyProperties(e, KwoTradeOrderUnit.class);
@@ -2289,7 +2289,7 @@ public class KwoTradeOrderService {
                 freezeDto.setSupEntId(unit.getEntId());
             }
         });
-        freezeDto.setOrderNo(String.valueOf(order.getId()));
+        freezeDto.setOrderNo(order.getTOrderNo());
         freezeDto.setOrderType(4);
         freezeDto.setTradeType(5);
         freezeDto.setRemark("贸易订单号：" + freezeDto.getOrderNo() + ",撤销订单");
@@ -2429,7 +2429,7 @@ public class KwoTradeOrderService {
             //钱包退回金额
             WalletPrepaidDto walletFreeze = new WalletPrepaidDto();
 //            walletFreeze.setTTradeOrderId(kwoTradeOrder.getId());
-            walletFreeze.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+            walletFreeze.setOrderNo(kwoTradeOrder.getTOrderNo());
             walletFreeze.setProEntId(unitMap.get(String.valueOf(CooperateTypeEnum.PURCHASER.getCode())).getEntId());
             walletFreeze.setSupEntId(unitMap.get(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())).getEntId());
             walletFreeze.setOrderType(4);
@@ -2836,7 +2836,7 @@ public class KwoTradeOrderService {
                 }
                 //钱包退回金额
                 WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+                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.setOrderType(4);
@@ -2850,7 +2850,7 @@ public class KwoTradeOrderService {
                 }
                 //2计算订单金额
                 WalletPrepaidDto consumePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+                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.setOrderType(4);

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

@@ -236,7 +236,7 @@ public class TradeOrderTask {
                 }
                 //钱包退回金额
                 WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+                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.setOrderType(4);
@@ -250,7 +250,7 @@ public class TradeOrderTask {
                 }
                 //2计算订单金额
                 WalletPrepaidDto consumePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+                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.setOrderType(4);
@@ -276,7 +276,7 @@ public class TradeOrderTask {
         }
         //钱包退回金额
         WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
-        unFreezePrepaidDto.setOrderNo(String.valueOf(kwoTradeOrder.getId()));
+        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.setOrderType(4);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/UnloadingHandler.java

@@ -211,7 +211,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
             WalletPayableDto unFreezePayableDto = new WalletPayableDto();
             unFreezePayableDto.setConsignEntId(map.get(1));
             unFreezePayableDto.setCarriageEntId(map.get(2));
-            unFreezePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+            unFreezePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
             unFreezePayableDto.setOrderType(5);
             unFreezePayableDto.setTradeType(5);
             unFreezePayableDto.setRemark("物流订单号："+unFreezePayableDto.getOrderNo()+"，订单完结解冻");
@@ -225,7 +225,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
             WalletPayableDto consumePayableDto = new WalletPayableDto();
             consumePayableDto.setConsignEntId(map.get(1));
             consumePayableDto.setCarriageEntId(map.get(2));
-            consumePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+            consumePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
             consumePayableDto.setOrderType(5);
             consumePayableDto.setTradeType(6);
             consumePayableDto.setTradeAmount(logisticsOrder.getTotalLoadAmount().multiply(logisticsOrder.getPrice()));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticData.java

@@ -19,9 +19,9 @@ public  class LogisticData implements Serializable {
     private static final long serialVersionUID = -4781207406119020652L;
 
     /**
-     * 物流订单id
+     * 物流订单编号
      */
-    private Long lOrderId;
+    private String lOrderNo;
         /**
          * 合同id
          */

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

@@ -3324,11 +3324,11 @@ public class KwtAcceptCarriageOrderService {
                 WalletPayableDto payableUpdateDto = new WalletPayableDto();
                 payableUpdateDto.setConsignEntId(orderDTO.getConsignCompanyId());
                 payableUpdateDto.setCarriageEntId(x.getAcceptCompanyId());
-                payableUpdateDto.setOrderNo(String.valueOf(x.getLOrderId()));
+                payableUpdateDto.setOrderNo(x.getLOrderNo());
                 payableUpdateDto.setOrderType(5);
                 payableUpdateDto.setTradeType(4);
                 payableUpdateDto.setTradeAmount(x.getPrice().multiply(x.getAmount()));
-                payableUpdateDto.setRemark("物流订单号："+x.getLOrderId()+"，下单冻结");
+                payableUpdateDto.setRemark("物流订单号："+x.getLOrderNo()+"，下单冻结");
                 log.info("物流订单号：{}，订单下单冻结，参数：{}", payableUpdateDto.getOrderNo(), com.alibaba.fastjson2.JSON.toJSONString(payableUpdateDto));
                 BaseResult<Object> freezeResult = paymentFeignService.updatePayable(payableUpdateDto);
                 if(freezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
@@ -3661,7 +3661,7 @@ public class KwtAcceptCarriageOrderService {
     private static void setLogisticOrderInfo(AddLogisticOrderDTO orderDTO, LogisticData x, Long lOrderId, String lOrderNo, List<KwtLogisticsOrder> saveLogisticsOrderList,String distance, Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap ) {
         KwtLogisticsOrder kwtLogisticsOrder = new KwtLogisticsOrder();
         kwtLogisticsOrder.setId(lOrderId);
-        x.setLOrderId(lOrderId);
+        x.setLOrderNo(lOrderNo);
         kwtLogisticsOrder.setEntId(orderDTO.getEntId());
         kwtLogisticsOrder.setType(String.valueOf(x.getType()));
         kwtLogisticsOrder.setTOrderId(orderDTO.getTradeOrderId());

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

@@ -3788,7 +3788,7 @@ public class KwtLogisticsConsignmentService {
                 WalletPayableDto unFreezePayableDto = new WalletPayableDto();
                 unFreezePayableDto.setConsignEntId(map.get(1));
                 unFreezePayableDto.setCarriageEntId(map.get(2));
-                unFreezePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+                unFreezePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
@@ -3802,7 +3802,7 @@ public class KwtLogisticsConsignmentService {
                 WalletPayableDto consumePayableDto = new WalletPayableDto();
                 consumePayableDto.setConsignEntId(map.get(1));
                 consumePayableDto.setCarriageEntId(map.get(2));
-                consumePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+                consumePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
                 consumePayableDto.setOrderType(5);
                 consumePayableDto.setTradeType(6);
                 if (org.apache.commons.lang3.StringUtils.equals(logisticsOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())) {

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

@@ -4889,7 +4889,7 @@ public class KwtWaybillOrderV1Service {
                 WalletPayableDto unFreezePayableDto = new WalletPayableDto();
                 unFreezePayableDto.setConsignEntId(map.get(1));
                 unFreezePayableDto.setCarriageEntId(map.get(2));
-                unFreezePayableDto.setOrderNo(String.valueOf(kwtLogistics.getId()));
+                unFreezePayableDto.setOrderNo(kwtLogistics.getLOrderNo());
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
@@ -4903,7 +4903,7 @@ public class KwtWaybillOrderV1Service {
                 WalletPayableDto consumePayableDto = new WalletPayableDto();
                 consumePayableDto.setConsignEntId(map.get(1));
                 consumePayableDto.setCarriageEntId(map.get(2));
-                consumePayableDto.setOrderNo(String.valueOf(kwtLogistics.getId()));
+                consumePayableDto.setOrderNo(kwtLogistics.getLOrderNo());
                 consumePayableDto.setOrderType(5);
                 consumePayableDto.setTradeType(6);
                 consumePayableDto.setTradeAmount(kwtLogistics.getTotalUnloadAmount().multiply(kwtLogistics.getPrice()));
@@ -4911,8 +4911,8 @@ public class KwtWaybillOrderV1Service {
                 log.info("物流订单号：{}，订单完结消费，参数：{}", consumePayableDto.getOrderNo(),JSON.toJSONString(consumePayableDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePayable(consumePayableDto);
                 if(consumeResult.getCode()!= HttpStatus.SUCCESS_CODE){
-                    log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),consumeResult.getMessage());
-                    throw new BusinessException("物流订单号："+unFreezePayableDto.getOrderNo()+"，订单完结消费失败");
+                    log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",consumePayableDto.getOrderNo(),consumeResult.getMessage());
+                    throw new BusinessException("物流订单号："+consumePayableDto.getOrderNo()+"，订单完结消费失败");
                 }
             }
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/task/LogisticsOrderCompletionTask.java

@@ -195,7 +195,7 @@ public class LogisticsOrderCompletionTask {
                 WalletPayableDto unFreezePayableDto = new WalletPayableDto();
                 unFreezePayableDto.setConsignEntId(map.get(1));
                 unFreezePayableDto.setCarriageEntId(map.get(2));
-                unFreezePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+                unFreezePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
@@ -209,7 +209,7 @@ public class LogisticsOrderCompletionTask {
                 WalletPayableDto consumePayableDto = new WalletPayableDto();
                 consumePayableDto.setConsignEntId(map.get(1));
                 consumePayableDto.setCarriageEntId(map.get(2));
-                consumePayableDto.setOrderNo(String.valueOf(logisticsOrder.getId()));
+                consumePayableDto.setOrderNo(logisticsOrder.getLOrderNo());
                 consumePayableDto.setOrderType(5);
                 consumePayableDto.setTradeType(6);
                 if (org.apache.commons.lang3.StringUtils.equals(logisticsOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())) {
@@ -225,8 +225,8 @@ public class LogisticsOrderCompletionTask {
                 log.info("物流订单号：{}，订单完结消费，参数：{}", consumePayableDto.getOrderNo(),JSON.toJSONString(consumePayableDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePayable(consumePayableDto);
                 if(consumeResult.getCode()!= HttpStatus.SUCCESS_CODE){
-                    log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),consumeResult.getMessage());
-                    throw new BusinessException("物流订单号："+unFreezePayableDto.getOrderNo()+"，订单完结消费失败");
+                    log.error("物流订单号：{}，订单完结消费失败,异常信息为：{}",consumePayableDto.getOrderNo(),consumeResult.getMessage());
+                    throw new BusinessException("物流订单号："+consumePayableDto.getOrderNo()+"，订单完结消费失败");
                 }
             }
         }