提交注册对象修改

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

@@ -2851,7 +2851,7 @@ public class KwoTradeOrderService {
     static Long resolveEnterpriseIdByName(KwsEnterpriseResDto enterprise, String enterpriseName) {
         if (enterprise == null || enterprise.getId() == null) {
             log.warn("根据企业名称未查询到有效企业，enterpriseName={}", enterpriseName);
-            throw new BusinessException("钱包固定企业不存在：" + enterpriseName);
+            return null;
         }
         return enterprise.getId();
     }
@@ -3091,7 +3091,8 @@ public class KwoTradeOrderService {
                 ParkingWalletFeeFreezeParam serviceFeeUnfreezeParam = new ParkingWalletFeeFreezeParam();
                 serviceFeeUnfreezeParam.setOrderNo(kwoTradeOrder.getTOrderNo());
                 serviceFeeUnfreezeParam.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
-                serviceFeeUnfreezeParam.setSupEntId(unitMap.get(String.valueOf(2)).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));
@@ -3407,9 +3408,9 @@ public class KwoTradeOrderService {
             return resp;
         }
         Long proEntId = unitMap.get(String.valueOf(1)).getEntId();
-        Long supEntId = unitMap.get(String.valueOf(2)).getEntId();
+        Long supplyEntId = resolveSupplyEntIdByEnterpriseName(SERVICE_FEE_SUPPLY_ENTERPRISE_NAME);
         resp.setServiceFeeBalance(resolveParkingWalletFeeFeignResult(
-                parkingWalletFeeFeignService.queryServiceFeeBalance(proEntId, supEntId), "服务费余额查询"));
+                parkingWalletFeeFeignService.queryServiceFeeBalance(proEntId, supplyEntId), "服务费余额查询"));
         return resp;
     }
 
@@ -3586,7 +3587,8 @@ public class KwoTradeOrderService {
         ParkingWalletFeeFreezeParam settleParam = new ParkingWalletFeeFreezeParam();
         settleParam.setOrderNo(order.getTOrderNo());
         settleParam.setProEntId(proEntId);
-        settleParam.setSupEntId(supEntId);
+        Long supplyEntId = resolveSupplyEntIdByEnterpriseName(SERVICE_FEE_SUPPLY_ENTERPRISE_NAME);
+        settleParam.setSupEntId(supplyEntId);
         settleParam.setActualQuantity(transportNetWeight);
         settleParam.setChargeStrategyId(order.getChargeStrategyId());
         settleParam.setChargeStrategyAmount(order.getChargeStrategyAmount());