Merge branch 'v6.4_transportation_20231110' into test

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

@@ -34,7 +34,7 @@ public enum PerformanceResultEnum implements ResultEnum {
 
 
     ORDER_GOODS_NO_FOUND(1200, "货单不存在"),
-    ORDER_WEIGHT_LACK(1201, "剩余数量不足"),
+    ORDER_WEIGHT_LACK(1201, "剩余吨数不足,请联系客服或发起取消"),
     ORDER_INVALID(1202, "无效的货单"),
     ORDER_INVALID1(1203, "当前运单的货源已完成或取消，请查看其他货源"),
 

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

@@ -297,7 +297,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 订单数量限制
         // 订单已拉运吨数
         BigDecimal alreadyTransportWeight = orderGoodsDao.sumAlreadyTransportWeightByOrderNo(orderGoods.getOrderNo());
-        if (alreadyTransportWeight.compareTo(orderInfo.getTransportWeight().subtract(orderInfo.getDownFloatWeight())) > 0){
+        if (alreadyTransportWeight.compareTo(orderInfo.getTransportWeight().subtract(orderInfo.getDownFloatWeight())) > 32){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
         }
 

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 >0");
+            WHERE("a.residue_transport_weight >=33");
             ORDER_BY("a.pending_order_time desc");
         }}.toString();
         return sql;