Merge remote-tracking branch 'origin/v31.2_accept_orders_20241024' into test_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

@@ -227,4 +227,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo);
 
+
+    Long queryTruckProcessingOrderChild(String truckNo);
 }

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

@@ -752,4 +752,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo) {
         return baseMapper.countTodayOrderGoodsSumByUserNo(userNo);
     }
+
+    @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

@@ -120,4 +120,6 @@ public interface OrderChildService {
     NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param);
 
     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;
@@ -287,6 +288,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private PerformanceSmartCompanyNoConfig companyNoConfig;
 
+    @Autowired
+    FeignOrderService feignOrderService;
+
     @PostConstruct
     public void init(){
         String[] activeProfiles = environment.getActiveProfiles();
@@ -2035,6 +2039,20 @@ 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{
+            throw new ServiceSystemException(com.clx.performance.enums.ResultEnum.FEIGN_ERROR,"查询车辆是否存在进行中的运单失败");
+        }
+
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(param.getOrderGoodsNo()).get();
         BigDecimal sendLatitude = orderGoods.getSendLatitude();
         BigDecimal sendLongitude = orderGoods.getSendLongitude();
@@ -2084,6 +2102,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                 return CheckResult.FAIL.code;
             }
         }
+
+
         return CheckResult.OK.code;
     }
 
@@ -2136,7 +2156,9 @@ 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(), "车主未绑卡");
+        OWNER_NO_BANKCARD(APP_POP_UP_OWNER_NO_BANKCARD_ERROR.getCode(), "车主未绑卡"),
+        HAS_GOING_CHILD(APP_TRUCK_HAVE_GOING_CHILD.getCode(), "车辆存在进行中的运单");
+
         private final int code;
         private final String msg;
     }
@@ -3893,4 +3915,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);
+
+
 }