Merge branch 'v5.7_break_contract_reverse_20231020' into test

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

 package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
@@ -89,4 +88,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     List<OrderGoodsAPPVO> getCancelOrderGoods(List<String> list);
 
     BigDecimal getAlreadyTransportWeight(String orderNo);
+
+    BigDecimal sumAlreadyTransportWeightByOrderNo(String orderNo);
+
 }

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

@@ -3,7 +3,6 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -228,6 +227,11 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         return baseMapper.getCancelOrderGoods(param);
     }
 
+    @Override
+    public BigDecimal sumAlreadyTransportWeightByOrderNo(String orderNo) {
+        return baseMapper.sumAlreadyTransportWeightByOrderNo(orderNo);
+    }
+
 
     @Override
     public void updateSendSystemAddress(Integer ownerAddressId, Integer systemAddressId) {

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -3,17 +3,13 @@ package com.clx.performance.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
-import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.annotations.*;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -84,4 +80,8 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<String> param);
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getAlreadyTransportWeight")
     BigDecimal getAlreadyTransportWeight(@Param("orderNo") String orderNo);
+
+    @Select("select sum(already_transport_weight) from order_goods where order_no=#{orderNo}")
+    BigDecimal sumAlreadyTransportWeightByOrderNo(@Param("orderNo")String orderNo);
+
 }

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

@@ -330,6 +330,15 @@ public class OrderChildServiceImpl implements OrderChildService {
                 orderChild.setWeight(new BigDecimal(50));
             }
         }
+
+        // 订单数量限制
+        // 订单已拉运吨数
+        BigDecimal alreadyTransportWeight = orderGoodsDao.sumAlreadyTransportWeightByOrderNo(orderGoods.getOrderNo());
+        if (alreadyTransportWeight.add(orderChild.getWeight()).compareTo(orderInfo.getTransportWeight().subtract(orderInfo.getDownFloatWeight())) > 0){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
+        }
+
+
         //orderChild.setWeight(orderChild.getTruckLoad());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setPayTime(now);