调用钱包服务增加日志

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -10,11 +10,11 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.api.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.dao.KwcContractLogisticsMapper;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
-import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
-import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.model.report.LogisticsListExport;
 import com.sckw.contract.model.vo.req.*;
@@ -1665,6 +1665,7 @@ public class KwcContractLogisticsService {
             payableAddDto.setCarriageEntId(collect.get(CooperateTypeEnum.CARRIAGE.getCode()).getEntId());
             payableAddDto.setTradeAmount(BigDecimal.ZERO);
             payableAddDto.setRemark("运费清单初始化");
+            log.info("托运放:{}与承运方:{}签订物流合同，运费清单初始化",payableAddDto.getConsignEntId(),payableAddDto.getCarriageEntId());
             BaseResult<Object> payable = paymentFeignService.initPayable(payableAddDto);
             if (payable.getCode() == HttpStatus.SUCCESS_CODE){
                 log.info("创建运费清单成功");

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -9,7 +9,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.api.model.dto.res.*;
 import com.sckw.contract.api.model.vo.LogisticsEntDtoVO;
 import com.sckw.contract.api.model.vo.LogisticsGoodsDto;
@@ -17,7 +17,6 @@ import com.sckw.contract.api.model.vo.TradeContractUnitDto;
 import com.sckw.contract.dao.KwcContractTradeMapper;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
-import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.model.report.TradeListExport;
 import com.sckw.contract.model.vo.req.*;
@@ -1492,6 +1491,7 @@ public class KwcContractTradeService {
             prepaidDto.setSupEntId(collect.get(CooperateTypeEnum.SUPPLIER.getCode()).getEntId());
             prepaidDto.setTradeAmount(BigDecimal.ZERO);
             prepaidDto.setRemark("预付清单初始化");
+            log.info("采购商:{}与供应商:{}签订贸易合同，预付清单初始化",prepaidDto.getProEntId(),prepaidDto.getSupEntId());
             BaseResult<Object> prepaidResult = paymentFeignService.initPrepaidBalance(prepaidDto);
             if (prepaidResult.getCode() == HttpStatus.SUCCESS_CODE) {
                 log.info("创建预付清单成功");

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

@@ -2249,6 +2249,7 @@ public class KwoTradeOrderService {
             walletFreeze.setOrderType(4);
             walletFreeze.setTradeType(4);
             walletFreeze.setRemark("贸易订单号：" + walletFreeze.getOrderNo() + ",下单冻结");
+            log.info("贸易订单号：{}，订单下单调用钱包服务冻结预付余额，参数：{}", walletFreeze.getOrderNo(),JSON.toJSONString(walletFreeze));
             freezeBaseResult = paymentFeignService.updatePrepaidBalance(walletFreeze);
         }
 
@@ -2294,17 +2295,17 @@ public class KwoTradeOrderService {
         freezeDto.setRemark("贸易订单号：" + freezeDto.getOrderNo() + ",撤销订单");
         BaseResult<Object> balanceResult;
         try {
+            log.info("贸易订单号：{}，订单撤销调用钱包服务解冻预付余额，参数：{}", freezeDto.getOrderNo(),JSON.toJSONString(freezeDto));
             balanceResult = paymentFeignService.updatePrepaidBalance(freezeDto);
         } catch (Exception e) {
-            log.error("线下钱包扣减预付余额、增加冻结金额异常", e);
-            throw new BusinessException("线下钱包扣减预付余额、增加冻结金额异常");
+            String errMsg = freezeDto.getRemark()+"异常";
+            log.error(errMsg, e);
+            throw new BusinessException(errMsg);
         }
-        if (balanceResult == null || balanceResult.getCode() != HttpStatus.SUCCESS_CODE) {
-            throw new BusinessException("线下钱包扣减预付余额、增加冻结金额失败");
-        }
-        Boolean aBoolean = (Boolean) balanceResult.getData();
-        if (!Boolean.TRUE.equals(aBoolean)) {
-            throw new BusinessException("线下钱包扣减预付余额、增加冻结金额失败");
+        if (balanceResult == null || balanceResult.getCode() != HttpStatus.SUCCESS_CODE || !Boolean.TRUE.equals(balanceResult.getData())) {
+            String errMsg = freezeDto.getRemark()+"失败";
+            log.error("{}:{}", errMsg, balanceResult != null ? balanceResult.getMessage(): "");
+            throw new BusinessException(errMsg);
         }
 
         // 3. 贸易合同该商品有采购数量，则更新采购数量（加回本单总量）
@@ -2442,6 +2443,7 @@ public class KwoTradeOrderService {
 
             } else if (Objects.equals(kwoTradeOrder.getSettlement(), 2)) {
                 //预付制结算解冻
+                log.info("贸易订单号：{}，订单审核拒绝调用钱包服务解冻预付余额，参数：{}", walletFreeze.getOrderNo(),JSON.toJSONString(walletFreeze));
                 booleanBaseResult = paymentFeignService.updatePrepaidBalance(walletFreeze);
             }
             if (booleanBaseResult.getCode() != 60200) {
@@ -2840,6 +2842,7 @@ public class KwoTradeOrderService {
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(5);
                 unFreezePrepaidDto.setRemark("贸易订单：" + unFreezePrepaidDto.getOrderNo() + ",");
+                log.info("贸易订单号：{}，订单完结调用钱包服务解冻预付余额，参数：{}", unFreezePrepaidDto.getOrderNo(),JSON.toJSONString(unFreezePrepaidDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePrepaidBalance(unFreezePrepaidDto);
                 if (unFreezeResult.getCode() != HttpStatus.SUCCESS_CODE) {
                     log.error("贸易订单号：{}，订单完结解冻失败,异常信息为：{}", unFreezePrepaidDto.getOrderNo(), unFreezeResult.getMessage());
@@ -2854,6 +2857,7 @@ public class KwoTradeOrderService {
                 unFreezePrepaidDto.setTradeType(6);
                 consumePrepaidDto.setTradeAmount(kwoTradeOrder.getPrice());
                 consumePrepaidDto.setRemark("贸易订单号：" + consumePrepaidDto.getOrderNo() + "，订单完结消费");
+                log.info("贸易订单号：{}，订单完结调用钱包服务消费预付余额，参数：{}", consumePrepaidDto.getOrderNo(),JSON.toJSONString(consumePrepaidDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePrepaidBalance(consumePrepaidDto);
                 if (consumeResult.getCode() != HttpStatus.SUCCESS_CODE) {
                     log.error("贸易订单号：{}，订单完结消费失败,异常信息为：{}", consumePrepaidDto.getOrderNo(), consumeResult.getMessage());

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

@@ -2,6 +2,7 @@ package com.sckw.order.task;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
+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;
@@ -201,7 +202,8 @@ public class TradeOrderTask {
                                 return;
                             }
                             Map<String, KwoTradeOrderUnit> unitMap = orderUnits.stream().collect(Collectors.toMap(KwoTradeOrderUnit::getUnitType, Function.identity(), (a, b) -> a));
-                            unFreezePrepaid(kwoTradeOrder,unitMap);
+//                            unFreezePrepaid(kwoTradeOrder,unitMap);
+                            calculatePrepaidBalance(kwoTradeOrder,unitMap);
                         }
                     }
                     if (Objects.equals(one.getKey(), TradeOrderStatusEnum.ING.getCode())) {
@@ -240,6 +242,7 @@ public class TradeOrderTask {
                 unFreezePrepaidDto.setOrderType(4);
                 unFreezePrepaidDto.setTradeType(5);
                 unFreezePrepaidDto.setRemark("贸易订单："+unFreezePrepaidDto.getOrderNo()+",");
+                log.info("贸易订单号：{}，订单完结调用钱包服务解冻预付余额，参数：{}", unFreezePrepaidDto.getOrderNo(),JSON.toJSONString(unFreezePrepaidDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePrepaidBalance(unFreezePrepaidDto);
                 if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("贸易订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePrepaidDto.getOrderNo(),unFreezeResult.getMessage());
@@ -254,6 +257,7 @@ public class TradeOrderTask {
                 unFreezePrepaidDto.setTradeType(6);
                 consumePrepaidDto.setTradeAmount(kwoTradeOrder.getPrice());
                 consumePrepaidDto.setRemark("贸易订单号："+consumePrepaidDto.getOrderNo()+"，订单完结消费");
+                log.info("贸易订单号：{}，订单完结调用钱包服务消费预付余额，参数：{}", consumePrepaidDto.getOrderNo(),JSON.toJSONString(consumePrepaidDto));
                 BaseResult<Object> consumeResult = paymentFeignService.updatePrepaidBalance(consumePrepaidDto);
                 if(consumeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("贸易订单号：{}，订单完结消费失败,异常信息为：{}",consumePrepaidDto.getOrderNo(),consumeResult.getMessage());
@@ -278,6 +282,7 @@ public class TradeOrderTask {
         unFreezePrepaidDto.setOrderType(4);
         unFreezePrepaidDto.setTradeType(5);
         unFreezePrepaidDto.setRemark("贸易订单："+unFreezePrepaidDto.getOrderNo()+",");
+        log.info("贸易订单号：{}，订单完结调用钱包服务解冻预付余额，参数：{}", unFreezePrepaidDto.getOrderNo(),JSON.toJSONString(unFreezePrepaidDto));
         BaseResult<Object> unFreezeResult = paymentFeignService.updatePrepaidBalance(unFreezePrepaidDto);
         if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
             log.error("贸易订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePrepaidDto.getOrderNo(),unFreezeResult.getMessage());

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

@@ -215,6 +215,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
             unFreezePayableDto.setOrderType(5);
             unFreezePayableDto.setTradeType(5);
             unFreezePayableDto.setRemark("物流订单号："+unFreezePayableDto.getOrderNo()+"，订单完结解冻");
+            log.info("物流订单号：{}，订单完结解冻进行中运费，参数：{}", unFreezePayableDto.getOrderNo(),JSON.toJSONString(unFreezePayableDto));
             BaseResult<Object> unFreezeResult = paymentFeignService.updatePayable(unFreezePayableDto);
             if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                 log.error("物流订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),unFreezeResult.getMessage());
@@ -229,6 +230,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
             consumePayableDto.setTradeType(6);
             consumePayableDto.setTradeAmount(logisticsOrder.getTotalLoadAmount().multiply(logisticsOrder.getPrice()));
             consumePayableDto.setRemark("物流订单号："+consumePayableDto.getOrderNo()+"，订单完结消费");
+            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());

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

@@ -3329,6 +3329,7 @@ public class KwtAcceptCarriageOrderService {
                 payableUpdateDto.setTradeType(4);
                 payableUpdateDto.setTradeAmount(x.getPrice().multiply(x.getAmount()));
                 payableUpdateDto.setRemark("物流订单号："+x.getLOrderId()+"，下单冻结");
+                log.info("物流订单号：{}，订单下单冻结，参数：{}", payableUpdateDto.getOrderNo(), com.alibaba.fastjson2.JSON.toJSONString(payableUpdateDto));
                 BaseResult<Object> freezeResult = paymentFeignService.updatePayable(payableUpdateDto);
                 if(freezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，下单冻结失败,异常信息为：{}",payableUpdateDto.getOrderNo(),freezeResult.getMessage());

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

@@ -3792,6 +3792,7 @@ public class KwtLogisticsConsignmentService {
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
+                log.info("物流订单号：{}，订单完结解冻进行中运费，参数：{}", unFreezePayableDto.getOrderNo(),JSON.toJSONString(unFreezePayableDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePayable(unFreezePayableDto);
                 if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),unFreezeResult.getMessage());
@@ -3814,6 +3815,7 @@ public class KwtLogisticsConsignmentService {
                     consumePayableDto.setTradeAmount(actualPrice);
                 }
                 consumePayableDto.setRemark("物流订单号：" + consumePayableDto.getOrderNo() + "，订单完结消费");
+                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());

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

@@ -4893,6 +4893,7 @@ public class KwtWaybillOrderV1Service {
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
+                log.info("物流订单号：{}，订单完结解冻进行中运费，参数：{}", unFreezePayableDto.getOrderNo(),JSON.toJSONString(unFreezePayableDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePayable(unFreezePayableDto);
                 if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),unFreezeResult.getMessage());
@@ -4907,6 +4908,7 @@ public class KwtWaybillOrderV1Service {
                 consumePayableDto.setTradeType(6);
                 consumePayableDto.setTradeAmount(kwtLogistics.getTotalUnloadAmount().multiply(kwtLogistics.getPrice()));
                 consumePayableDto.setRemark("物流订单号：" + consumePayableDto.getOrderNo() + "，订单完结消费");
+                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());

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

@@ -199,6 +199,7 @@ public class LogisticsOrderCompletionTask {
                 unFreezePayableDto.setOrderType(5);
                 unFreezePayableDto.setTradeType(5);
                 unFreezePayableDto.setRemark("物流订单号：" + unFreezePayableDto.getOrderNo() + "，订单完结解冻");
+                log.info("物流订单号：{}，订单完结解冻进行中运费，参数：{}", unFreezePayableDto.getOrderNo(),JSON.toJSONString(unFreezePayableDto));
                 BaseResult<Object> unFreezeResult = paymentFeignService.updatePayable(unFreezePayableDto);
                 if(unFreezeResult.getCode()!= HttpStatus.SUCCESS_CODE){
                     log.error("物流订单号：{}，订单完结解冻失败,异常信息为：{}",unFreezePayableDto.getOrderNo(),unFreezeResult.getMessage());
@@ -221,6 +222,7 @@ public class LogisticsOrderCompletionTask {
                     consumePayableDto.setTradeAmount(actualPrice);
                 }
                 consumePayableDto.setRemark("物流订单号：" + consumePayableDto.getOrderNo() + "，订单完结消费");
+                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());