1

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

@@ -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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 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;
@@ -21,10 +20,10 @@ import com.sckw.order.model.KwoTradeOrder;
 import com.sckw.order.model.KwoTradeOrderArchive;
 import com.sckw.order.model.KwoTradeOrderGoods;
 import com.sckw.order.model.KwoTradeOrderUnit;
+import com.sckw.order.serivce.KwoTradeOrderArchiveService;
 import com.sckw.payment.api.dubbo.PaymentDubboService;
 import com.sckw.payment.api.feign.PaymentFeignService;
 import com.sckw.payment.api.model.feign.WalletPrepaidDto;
-import com.sckw.order.serivce.KwoTradeOrderArchiveService;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.product.api.model.KwpGoods;
 import com.sckw.system.api.RemoteSystemService;
@@ -279,11 +278,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));