Merge branch 'v17.5_order_child_sync_broker_20240617' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java

@@ -132,11 +132,19 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
 
         //计算司机保证金
         PaymentDTO paymentDTO = getPaymentDTO(orderChild);
-        if (Objects.nonNull(paymentDTO.getPlatformServiceFeeNew()) &&
-                paymentDTO.getPlatformServiceFeeNew().compareTo(BigDecimal.ZERO) != 0) {
-            orderChild.setPlatformServiceFee(paymentDTO.getPlatformServiceFeeNew());
+        if (Objects.nonNull(paymentDTO.getPlatformServiceFeeNew())) {
+            if(paymentDTO.getPlatformServiceFeeNew().compareTo(BigDecimal.ZERO) != 0){
+                orderChild.setPlatformServiceFee(paymentDTO.getPlatformServiceFeeNew());
+            }
+            //因为可能服务费为 0
+            if(orderChild.getFreight().compareTo(BigDecimal.ZERO)<=0){
+                orderChild.setPlatformServiceFee(paymentDTO.getPlatformServiceFeeNew());
+            }
+
         }
 
+
+
         // 更新装车净重
         updateOrderGoodsAmountLoad(orderGoods,orderChild.getChildNo(), dif);
 

performance-web/src/main/java/com/clx/performance/service/impl/PaymentServiceImpl.java

@@ -254,10 +254,14 @@ public class PaymentServiceImpl implements PaymentService {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR);
         }
         if (notify.getCode() != 0) {
-            if(Objects.equals(notify.getCode(),"")){
+            if(Objects.equals(notify.getCode(),1005)){
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR,
                         "预估接单保证金"+new BigDecimal(param.getFigureNew()).movePointLeft(2)+"元，车主钱包余额不足，请先充值");
-            }else{
+            }else if(Objects.equals(notify.getCode(),6104)){
+                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR,
+                        "预估接单保证金"+new BigDecimal(param.getFigureNew()).movePointLeft(2)+"元，车主钱包余额不足，请先充值");
+            }
+            else{
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
             }
         }