1

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

@@ -2901,6 +2901,7 @@ public class KwoTradeOrderService {
         if (CollUtil.isNotEmpty(logisticOrderList)) {
             if (logisticOrderList.stream().allMatch(d -> Objects.equals(d.getStatus(), LogisticsOrderV1Enum.NEARING_COMPLETION.getCode()))) {
                 kwoTradeOrder.setStatus(TradeOrderStatusEnum.SUCCESS.getCode());
+                calculatePrepaidBalance(kwoTradeOrderDB);
             } else {
                 kwoTradeOrder.setStatus(TradeOrderStatusEnum.DEAL.getCode());
             }
@@ -2920,7 +2921,6 @@ public class KwoTradeOrderService {
             }
         }
         kwoTradeOrderMapper.updateById(kwoTradeOrder);
-        calculatePrepaidBalance(kwoTradeOrderDB);
         return true;
     }
 
@@ -2957,11 +2957,11 @@ public class KwoTradeOrderService {
                 }
                 //2计算订单金额
                 WalletPrepaidDto consumePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
-                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
-                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
-                unFreezePrepaidDto.setOrderType(4);
-                unFreezePrepaidDto.setTradeType(6);
+                consumePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
+                consumePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
+                consumePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
+                consumePrepaidDto.setOrderType(4);
+                consumePrepaidDto.setTradeType(6);
                 consumePrepaidDto.setTradeAmount(kwoTradeOrder.getPrice());
                 consumePrepaidDto.setRemark("贸易订单号：" + consumePrepaidDto.getOrderNo() + "，订单完结消费");
                 log.info("贸易订单号：{}，订单完结调用钱包服务消费预付余额，参数：{}", consumePrepaidDto.getOrderNo(),JSON.toJSONString(consumePrepaidDto));

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

@@ -6,7 +6,6 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.model.enums.LogisticsOrderV1Enum;
 import com.sckw.core.utils.DateUtils;
 import com.sckw.core.web.constant.HttpStatus;
@@ -250,11 +249,11 @@ public class TradeOrderTask {
                 }
                 //2计算订单金额
                 WalletPrepaidDto consumePrepaidDto = new WalletPrepaidDto();
-                unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
-                unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
-                unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
-                unFreezePrepaidDto.setOrderType(4);
-                unFreezePrepaidDto.setTradeType(6);
+                consumePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
+                consumePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
+                consumePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
+                consumePrepaidDto.setOrderType(4);
+                consumePrepaidDto.setTradeType(6);
                 consumePrepaidDto.setTradeAmount(kwoTradeOrder.getPrice());
                 consumePrepaidDto.setRemark("贸易订单号："+consumePrepaidDto.getOrderNo()+"，订单完结消费");
                 log.info("贸易订单号：{}，订单完结调用钱包服务消费预付余额，参数：{}", consumePrepaidDto.getOrderNo(),JSON.toJSONString(consumePrepaidDto));