Merge branch 'v31.2_accept_orders_20241024' into release_jdk17

clx-performance-web/src/main/java/com/clx/performance/controller/feign/OrderChildFeignController.java

@@ -96,4 +96,10 @@ public class OrderChildFeignController {
         return Result.ok();
     }
 
+
+    @Operation(summary = "查询老马上来车辆下的进行中的运单", description = "<br>By:刘海泉")
+    @GetMapping("/queryTruckProcessingOrderChild")
+    public Long queryTruckProcessingOrderChild(@RequestParam("truckNo") @NotBlank(message = "车牌号不能为空") String truckNo) {
+        return orderChildService.queryTruckProcessingOrderChild(truckNo);
+    }
 }

clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -223,4 +223,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     Long queryNoCancelChildByOrderGoodsNo(String orderGoodsNo, Integer code);
 
     List<OrderChild> listNoCancelOrderChild(String orderNo);
+
+    Long queryTruckProcessingOrderChild(String truckNo);
 }

clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -745,4 +745,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
 
     }
+
+    @Override
+    public Long queryTruckProcessingOrderChild(String truckNo) {
+        LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper<>();
+        query.eq(OrderChild :: getTruckNo,truckNo);
+        query.le(OrderChild::getStatus,OrderChildEnum.Status.UNLOAD.getCode());
+        return baseMapper.selectCount(query);
+    }
 }

clx-performance-web/src/main/java/com/clx/performance/feign/FeignOrderService.java

+package com.clx.performance.feign;
+
+import com.msl.common.result.Result;
+import jakarta.validation.constraints.NotBlank;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "order-service")
+public interface FeignOrderService {
+
+
+    @GetMapping(value = "/order-service/feign/getGoingOrderChildByTruckNo")
+    Result<Integer> getGoingOrderChildByTruckNo (@RequestParam("truckNo") @NotBlank(message = "车牌号不能为空") String truckNo);
+
+}

clx-performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -122,4 +122,6 @@ public interface OrderChildService {
 
 
     WeightChildSignatureDto getWeighingSignature(String childNo,Integer type);
+
+    Long queryTruckProcessingOrderChild(String truckNo);
 }

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

@@ -41,6 +41,7 @@ import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.extranal.order.InvoicingCompanyService;
 import com.clx.performance.extranal.order.QuotationService;
 import com.clx.performance.extranal.user.*;
+import com.clx.performance.feign.FeignOrderService;
 import com.clx.performance.feign.FeignPaymentService;
 import com.clx.performance.model.*;
 import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
@@ -289,6 +290,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private PerformanceSmartCompanyNoConfig companyNoConfig;
 
+    @Autowired
+    FeignOrderService feignOrderService;
+
     @PostConstruct
     public void init(){
         String[] activeProfiles = environment.getActiveProfiles();
@@ -386,6 +390,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         // 司机接单限制
         driverTakeOrderLimit(driverTruckInfo.getUserNo());
+        //车辆接单限制
+        truckLimit(truckNo);
 
         /**  判断当前用户是否为车主  true 车主 */
         boolean truckOwnerFlag = Objects.equals(driverTruckInfo.getWalletCode(), driverTruckInfo.getTruckOwnWalletCode());
@@ -589,6 +595,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){
         //货单无剩余量
@@ -2078,6 +2101,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                 return CheckResult.FAIL.code;
             }
         }
+
+
         return CheckResult.OK.code;
     }
 
@@ -2131,6 +2156,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         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(), "车主未绑卡");
+
         private final int code;
         private final String msg;
     }
@@ -3884,4 +3910,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         return new WeightChildSignatureDto();
     }
+
+    @Override
+    public Long queryTruckProcessingOrderChild(String truckNo) {
+        return orderChildDao.queryTruckProcessingOrderChild(truckNo);
+    }
 }

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

@@ -116,6 +116,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     APP_POP_UP_DRIVER_NOT_AUTH(-496, "司机钱包不存在"),
     /**车主未实名 **/
     APP_POP_UP_OWNER_NOT_AUTH(-495, "车主钱包不存在"),
+    /**车主未实名 **/
+    APP_TRUCK_HAVE_GOING_CHILD(-494, "请您先完成马上来的运单"),
 
 
     WALLET_CODE_IS_NULL(1704, "用户钱包不存在"),

performance-api/src/main/java/com/clx/performance/feign/OrderChildFeign.java

@@ -33,4 +33,9 @@ public interface OrderChildFeign {
     Result<Object> cancelOrderChild(@RequestBody @Validated CancelOrderGoodsParam param);
 
 
+
+    @GetMapping(value = {"clx-performance/feign/orderChild/queryTruckProcessingOrderChild"})
+    Long queryTruckProcessingOrderChild(@RequestParam("truckNo") @NotBlank(message = "车牌号不能为空") String truckNo);
+
+
 }

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

@@ -133,7 +133,6 @@ public class CarrierOrderChildDetailVO {
     @Schema(description = "目的地详细地址")
     private String receiveDetailAddress;
 
-
     @Schema(description = "贸易商名称")
     private String cooperativeCompaniesName;