修改BUG

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -213,11 +213,11 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                         }
                     }
                     //只更新货单未拉运吨数,已拉运吨数
-                    orderGoodsDao.updateOrderGoodsSetResidueWeight(childSum, orderGoods.getId());
+                    orderGoodsDao.updateOrderGoodsSetAlreadyWeight(childSum, orderGoods.getId());
                     orderFeign.rollbackOrderWeight(param);
                 } else {
                     //只更新货单未拉运吨数,已拉运吨数
-                    orderGoodsDao.updateOrderGoodsSetResidueWeight(childSum, childSum, orderGoods.getId());
+                    orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(childSum, childSum, orderGoods.getId());
                 }
                 redisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsId.getValue());
             }

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

@@ -62,9 +62,9 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     boolean updateOrderGoodsStatusAndRollbackResidueWeightByOrderGoodsNo(Integer orderGoodsId, Integer status);
 
-    Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight,  Integer id);
+    Integer updateOrderGoodsSetAlreadyWeight(BigDecimal alreadyWeight,  Integer id);
 
-    Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight, BigDecimal alreadyWeight, Integer id);
+    Integer updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal residueWeight, BigDecimal alreadyWeight, Integer id);
 
 
     OrderGoodsVO findOrderGoodsById(Integer id);

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

@@ -165,13 +165,13 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight, Integer id) {
-        return baseMapper.updateOrderGoodsSetResidueWeight(residueWeight,id);
+    public Integer updateOrderGoodsSetAlreadyWeight(BigDecimal alreadyWeight, Integer id) {
+        return baseMapper.updateOrderGoodsSetAlreadyWeight(alreadyWeight,id);
     }
 
     @Override
-    public Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight, BigDecimal alreadyWeight, Integer id) {
-        return baseMapper.updateOrderGoodsSetResidueWeight(residueWeight,alreadyWeight,id);
+    public Integer updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal residueWeight, BigDecimal alreadyWeight, Integer id) {
+        return baseMapper.updateOrderGoodsSetResidueWeightAndAlreadyWeight(residueWeight,alreadyWeight,id);
     }
 
     @Override

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

@@ -56,11 +56,11 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "saveBatchEntity")
     void saveBatchEntity(List<OrderGoods> orderGoodsList);
 
-    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeight")
-    Integer updateOrderGoodsSetResidueWeight(@Param(value = "residueWeight") BigDecimal residueWeight, @Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "id") Integer id);
+    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeightAndAlreadyWeight")
+    Integer updateOrderGoodsSetResidueWeightAndAlreadyWeight(@Param(value = "residueWeight") BigDecimal residueWeight, @Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "id") Integer id);
 
-    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeight")
-    Integer updateOrderGoodsSetResidueWeight(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "id") Integer id);
+    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetAlreadyWeight")
+    Integer updateOrderGoodsSetAlreadyWeight(@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "id") Integer id);
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "findOrderGoodsById")
     OrderGoodsVO findOrderGoodsById(Integer id);

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

@@ -174,17 +174,17 @@ public class OrderGoodsSqlProvider {
         return sqlList.toString();
     }
 
-    public String updateOrderGoodsSetResidueWeight(@Param(value ="residueWeight") BigDecimal residueWeight,@Param(value ="id") Integer id){
+    public String updateOrderGoodsSetAlreadyWeight(@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value ="id") Integer id){
         String sql = new SQL() {{
             UPDATE("order_goods")
-                    .SET("residue_transport_weight = residue_transport_weight + #{residueWeight}")
+                    .SET("already_transport_weight = already_transport_weight + #{residueWeight}")
                     .WHERE("id = #{id}");
 
         }}.toString();
         return sql;
     }
 
-    public String updateOrderGoodsSetResidueWeight(@Param(value ="residueWeight") BigDecimal residueWeight, @Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value ="id") Integer id){
+    public String updateOrderGoodsSetResidueWeightAndAlreadyWeight(@Param(value ="residueWeight") BigDecimal residueWeight, @Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value ="id") Integer id){
         String sql = new SQL() {{
             UPDATE("order_goods")
                     .SET("residue_transport_weight = residue_transport_weight + #{residueWeight}")

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

@@ -44,27 +44,27 @@ public abstract class GoodsOrderStrategy {
             throw new ServiceSystemException(ResultEnum.DATA_ERROR,"订单已暂停，无法进行提量");
         }
         //多个定向单不允许车辆重复
-//        List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
-//        Set<String> set = new HashSet<>();
-//        for (OrderGoodsChildParams item : orderGoodsChildParams) {
-//            if(CollectionUtils.isNotEmpty(item.getTruckList())){
-//                int lastSize = set.size() + item.getTruckList().size();
-//                set.addAll(item.getTruckList());
-//                if (!Objects.equals(lastSize,set.size() +item.getTruckList().size())) {
-//                    throw new ServiceSystemException(ResultEnum.DATA_ERROR,"定向单选择车辆重复");
-//                }
-//            }
-//        }
-//
-//        if(CollectionUtils.isNotEmpty(set)){
-//            OrderGoodsTruckBindDao orderGoodsTruckBindDao = SpringContextUtils.getBeanByClass(OrderGoodsTruckBindDao.class);
-//            List<OrderGoodsTruckBind>  binds = orderGoodsTruckBindDao.judgeTruckIsBindDxOrder(set);
-//            if(CollectionUtils.isNotEmpty(binds)){
-//                List<String> repeatBind = binds.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
-//                String trucks = String.join(", ", repeatBind);
-//                throw new ServiceSystemException(ResultEnum.DATA_ERROR,"已被定向单绑定车辆："+ trucks);
-//            }
-//        }
+        List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
+        Set<String> set = new HashSet<>();
+        for (OrderGoodsChildParams item : orderGoodsChildParams) {
+            if(CollectionUtils.isNotEmpty(item.getTruckList())){
+                int lastSize = set.size() + item.getTruckList().size();
+                set.addAll(item.getTruckList());
+                if (!Objects.equals(lastSize,set.size() +item.getTruckList().size())) {
+                    throw new ServiceSystemException(ResultEnum.DATA_ERROR,"定向单选择车辆重复");
+                }
+            }
+        }
+
+        if(CollectionUtils.isNotEmpty(set)){
+            OrderGoodsTruckBindDao orderGoodsTruckBindDao = SpringContextUtils.getBeanByClass(OrderGoodsTruckBindDao.class);
+            List<OrderGoodsTruckBind>  binds = orderGoodsTruckBindDao.judgeTruckIsBindDxOrder(set);
+            if(CollectionUtils.isNotEmpty(binds)){
+                List<String> repeatBind = binds.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
+                String trucks = String.join(", ", repeatBind);
+                throw new ServiceSystemException(ResultEnum.DATA_ERROR,"已被定向单绑定车辆："+ trucks);
+            }
+        }
         //根据不同的订单类型创建不同的货单
         LocalDateTime sendLazyTime = goodsOrderProcess(orderGoodsParams, orderInfo, now);