提交收费系统对外对接接口包装

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

@@ -2589,6 +2589,7 @@ public class KwoTradeOrderService {
         log.info("贸易订单下单应用收费策略，orderNo:{}, feeFreezeParam:{}", order.getTOrderNo(), JSON.toJSONString(feeFreezeParam));
         ParkingWalletFeeFreezeResult feeFreezeResult = resolveParkingWalletFeeFeignResult(
                 parkingWalletFeeFeignService.applyChargeStrategyFreeze(feeFreezeParam), "服务费冻结");
+        log.info("服务费冻结结果，orderNo:{}, feeFreezeResult:{}", order.getTOrderNo(), JSON.toJSONString(feeFreezeResult));
         fillChargeStrategyInfo(order, feeFreezeResult);
         log.info("贸易订单收费策略处理完成，orderNo:{}, feeFreezeResult:{}", order.getTOrderNo(), JSON.toJSONString(feeFreezeResult));
 
@@ -3096,18 +3097,22 @@ public class KwoTradeOrderService {
 
         if (Objects.equals(tradeOrderAuditParam.getStatus(), 2)) {
             BigDecimal serviceFeeBalance = null;
-            // 审核拒绝：若应用了收费策略，解冻并返还采购方服务费余额
-            if (Objects.equals(kwoTradeOrder.getApplyChargeStrategy(), Global.YES)) {
+            // 审核拒绝：若应用了按吨收费策略，解冻并返还采购方服务费余额
+            if (isChargeByTonStrategyApplied(kwoTradeOrder)) {
                 ParkingWalletFeeFreezeParam serviceFeeUnfreezeParam = new ParkingWalletFeeFreezeParam();
                 serviceFeeUnfreezeParam.setOrderNo(kwoTradeOrder.getTOrderNo());
                 serviceFeeUnfreezeParam.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
                 Long supplyEntId = resolveSupplyEntIdByEnterpriseName(SERVICE_FEE_SUPPLY_ENTERPRISE_NAME);
                 serviceFeeUnfreezeParam.setSupEntId(supplyEntId);
                 serviceFeeUnfreezeParam.setOperatorId(LoginUserHolder.getUserId());
-                log.info("贸易订单审核拒绝解冻服务费，orderNo:{}, param:{}",
-                        kwoTradeOrder.getTOrderNo(), JSON.toJSONString(serviceFeeUnfreezeParam));
+                log.info("贸易订单审核拒绝解冻服务费，orderNo:{}, chargeStrategyType:{}, param:{}",
+                        kwoTradeOrder.getTOrderNo(), kwoTradeOrder.getChargeStrategyType(),
+                        JSON.toJSONString(serviceFeeUnfreezeParam));
                 ParkingWalletFeeFreezeResult unfreezeResult = resolveParkingWalletFeeFeignResult(
                         parkingWalletFeeFeignService.unfreezeChargeStrategy(serviceFeeUnfreezeParam), "服务费解冻");
+                log.info("贸易订单审核拒绝，解冻服务费成功，orderNo:{}, chargeStrategyType:{}, result:{}",
+                        kwoTradeOrder.getTOrderNo(), kwoTradeOrder.getChargeStrategyType(),
+                        JSON.toJSONString(unfreezeResult));
                 serviceFeeBalance = unfreezeResult.getServiceFeeBalance();
             }