Merge branch 'v6.4_transportation_20231110' into test

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

@@ -288,7 +288,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         // 库存验证
-        if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal("33")) < 0) {
+        if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal("35")) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
         }
 //        if (orderGoods.getResidueTransportWeight().compareTo(truckLoad) < 0) {throw new ServiceSystemException
@@ -340,10 +340,10 @@ public class OrderChildServiceImpl implements OrderChildService {
         Integer overWeight = orderInfo.getOverWeight();
 
         if(Objects.equals(overWeight,OrderGoodsOverWeightEnum.NO.getCode())){
-            if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(33)) < 0) {
+            if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(35)) < 0) {
                 orderChild.setWeight(orderGoods.getResidueTransportWeight());
             } else {
-                orderChild.setWeight(new BigDecimal(33));
+                orderChild.setWeight(new BigDecimal(35));
             }
         } else{
             if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(50)) < 0) {

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

 package com.clx.performance.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
@@ -51,10 +52,14 @@ public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindServic
         if (!result.succeed() || CollectionUtil.isEmpty(result.getData())) {
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
+        log.info("truckFeign.driverTruckList:{}", JSONUtil.parse(result.getData()));
         List<String> truckList = result.getData().stream().map(DriverTruckAppVo::getTruckNo).collect(Collectors.toList());
-
+        log.info("过滤后的truckList:{}", JSONUtil.parse(truckList));
         LocalDateTime now = LocalDateTime.now();
 
+        if (CollectionUtils.isEmpty(truckList)) {
+            return null;
+        }
         List<OrderGoodsTruckBind> list = orderGoodsTruckBindDao.getCancelOrderGoods(truckList,
                 DateUtils.formatDateTime(now.plusDays(-3), "yyyy-MM-dd HH:mm:ss").get(),
                 DateUtils.formatDateTime(now, "yyyy-MM-dd HH:mm:ss").get());

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -100,7 +100,7 @@ public class OrderGoodsSqlProvider {
             WHERE("a.pending_order_way = " + PendingOrderWayStatusEnum.Status.GK.getCode());
             WHERE("a.last_arrive_send_time >= now()");
             WHERE("(a.order_goods_status = "+OrderGoodsStatusEnum.Status.PAYING.getCode()+" or a.order_goods_status = "+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
-            WHERE("a.residue_transport_weight >=33");
+            WHERE("a.residue_transport_weight >=35");
             ORDER_BY("a.pending_order_time desc");
         }}.toString();
         return sql;