Merge remote-tracking branch 'origin/v31.2_accept_orders_20241024' into test_jdk17

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

@@ -388,6 +388,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         // 司机接单限制
         driverTakeOrderLimit(driverTruckInfo.getUserNo());
+        //车辆接单限制
+        truckLimit(truckNo);
 
         /**  判断当前用户是否为车主  true 车主 */
         boolean truckOwnerFlag = Objects.equals(driverTruckInfo.getWalletCode(), driverTruckInfo.getTruckOwnWalletCode());
@@ -599,6 +601,23 @@ public class OrderChildServiceImpl implements OrderChildService {
         return result;
     }
 
+    public void truckLimit(String truckNo){
+        //查询该车辆是否在老马上来系统存在进行中的运单
+        log.info("开始查询车辆在老马上来系统是否存在进行中的运单，车牌号:{}",truckNo);
+        Result<Integer> truckGoingChildResult = feignOrderService.getGoingOrderChildByTruckNo(truckNo);
+        log.info("开始查询车辆在老马上来系统是否存在进行中的运单，车牌号:{},响应结果：{}",truckNo,truckGoingChildResult);
+        if(truckGoingChildResult.succeed()){
+            //车辆存在进行中的运单
+            if(truckGoingChildResult.getData() > 0){
+                throw new ServiceSystemException(PerformanceResultEnum.APP_TRUCK_HAVE_GOING_CHILD);
+            }
+        }else{
+            log.error("查询车辆在马上来系统是否存在进行中的运单失败");
+            throw new ServiceSystemException(PerformanceResultEnum.APP_TRUCK_HAVE_GOING_CHILD,"查询车辆在马上来是否存在运单失败");
+        }
+    }
+
+
     //判断当前运单的吨数，货单剩余量是否足够，不足够直接拦截，足够需要判断订单是否还有拉运量
     public boolean judgeNotEnoughWeightOrdered(BigDecimal orderGoodsResidueWeight,String orderNo){
         //货单无剩余量
@@ -2039,21 +2058,6 @@ public class OrderChildServiceImpl implements OrderChildService {
             return checkBankCard.getCode();
         }
 
-
-        //查询该车辆是否在老马上来系统存在进行中的运单
-        log.info("开始查询车辆在老马上来系统是否存在进行中的运单，车牌号:{}",param.getTruckNo());
-        Result<Integer> truckGoingChildResult = feignOrderService.getGoingOrderChildByTruckNo(param.getTruckNo());
-        log.info("开始查询车辆在老马上来系统是否存在进行中的运单，车牌号:{},响应结果：{}",param.getTruckNo(),truckGoingChildResult);
-        if(truckGoingChildResult.succeed()){
-            //车辆存在进行中的运单
-            if(truckGoingChildResult.getData() > 0){
-                return CheckResult.HAS_GOING_CHILD.code;
-            }
-        }else{
-            log.error("查询车辆在马上来系统是否存在进行中的运单失败");
-            return CheckResult.HAS_GOING_CHILD.code;
-        }
-
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(param.getOrderGoodsNo()).get();
         BigDecimal sendLatitude = orderGoods.getSendLatitude();
         BigDecimal sendLongitude = orderGoods.getSendLongitude();
@@ -2157,8 +2161,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         DRIVER_WALLET_NOT_EXIST(APP_POP_UP_DRIVER_WALLET_NULL_NOT_EXIST_ERROR.getCode(), "司机未绑卡"),
         OWNER_WALLET_NOT_EXIST(APP_POP_UP_OWNER_WALLET_NULL_NOT_EXIST_ERROR.getCode(), "车主未绑卡"),
         DRIVER_NO_BANKCARD(APP_POP_UP_DRIVER_NO_BANKCARD_ERROR.getCode(), "司机未绑卡"),
-        OWNER_NO_BANKCARD(APP_POP_UP_OWNER_NO_BANKCARD_ERROR.getCode(), "车主未绑卡"),
-        HAS_GOING_CHILD(APP_TRUCK_HAVE_GOING_CHILD.getCode(), "车辆存在进行中的运单");
+        OWNER_NO_BANKCARD(APP_POP_UP_OWNER_NO_BANKCARD_ERROR.getCode(), "车主未绑卡");
 
         private final int code;
         private final String msg;

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -117,7 +117,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     /**车主未实名 **/
     APP_POP_UP_OWNER_NOT_AUTH(-495, "车主钱包不存在"),
     /**车主未实名 **/
-    APP_TRUCK_HAVE_GOING_CHILD(-494, "车辆存在进行中的运单"),
+    APP_TRUCK_HAVE_GOING_CHILD(-494, "请先完成马上来的运单"),
 
 
     WALLET_CODE_IS_NULL(1704, "用户钱包不存在"),