Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into…

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

@@ -19,6 +19,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.IntegralMqService;
 import com.clx.performance.service.OrderChildLogService;
+import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.service.child.OrderChildPostService;
@@ -66,6 +67,8 @@ public class OrderCancelComponent implements InitializingBean {
 
     private final OrderService orderService;
 
+    private final OrderGoodsService orderGoodsService;
+
     public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
@@ -353,6 +356,9 @@ public class OrderCancelComponent implements InitializingBean {
             if (!result.succeed()) {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "远程调用更新订单余量失败");
             }
+            ArrayList<OrderGoods> list = new ArrayList<>();
+            list.add(orderGoods);
+            orderGoodsService.batchUpdateResidueWeight(list);
         } else {
             //返回到货单
             orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight, weight, orderGoods.getId());

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

@@ -96,4 +96,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
 
+    void batchUpdateResidueWeight(List<Integer> list, BigDecimal residueWeight);
 }

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

@@ -3,15 +3,15 @@ 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.param.app.AppGoodsOrderSearchParam;
-import com.clx.performance.param.pc.OrderGoodsEditParams;
-import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.param.pc.GoodsOrderMapParam;
+import com.clx.performance.param.pc.OrderGoodsEditParams;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.Optional;
@@ -261,4 +261,12 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         Page<OrderGoodsAPPVO> page = Page.of(param.getPage(), param.getPageSize());
         return baseMapper.indexOrderGoodsListSearch(page,param);
     }
+
+    @Override
+    public void batchUpdateResidueWeight(List<Integer> list, BigDecimal residueWeight) {
+        update(lUdWrapper()
+                .in(OrderGoods::getId, list)
+                .set(OrderGoods::getResidueTransportWeight, residueWeight)
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -97,4 +97,6 @@ public interface OrderGoodsService {
     FreightEstimateVO listFreightEstimate(OrderChildReportParam param);
 
     IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
+
+    void batchUpdateResidueWeight(List<OrderGoods> list);
 }

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

@@ -20,10 +20,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
-import com.clx.performance.service.OrderCancelService;
-import com.clx.performance.service.OrderChildLogService;
-import com.clx.performance.service.OrderGoodsTruckBindService;
-import com.clx.performance.service.OwnerAccountService;
+import com.clx.performance.service.*;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
@@ -76,6 +73,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     private final OrderChildPostService orderChildPostService;
 
+    private final OrderGoodsService orderGoodsService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -317,7 +316,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
             }
         }
-
+        //取消订单更新货单剩余吨数
+        orderGoodsService.batchUpdateResidueWeight(orderGoodsList);
     }
 
 
@@ -683,6 +683,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         if (!orderFeign.saveOrderSettlementJobRecord(orderNo).succeed()) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用结算单锁定失败");
         }
+        //订单取消恢复货单的剩余吨数为0
+        orderGoodsService.batchUpdateResidueWeight(orderGoodsList);
 
     }
 

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

@@ -532,6 +532,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
                     OrderGoods update = new OrderGoods();
                     update.setId(orderGoods.getId());
+                    update.setResidueTransportWeight(BigDecimal.ZERO);
                     update.setOrderGoodsStatus(orderGoodsStatus);
                     orderGoodsDao.updateEntityByKey(update);
                 }
@@ -583,6 +584,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
                     OrderGoods update = new OrderGoods();
                     update.setId(orderGoods.getId());
+                    update.setResidueTransportWeight(BigDecimal.ZERO);
                     update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
                     orderGoodsDao.updateEntityByKey(update);
                 }
@@ -790,6 +792,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
     }
 
-
-
+    @Override
+    public void batchUpdateResidueWeight(List<OrderGoods> list) {
+        if(CollectionUtils.isEmpty(list)){
+            return;
+        }
+        List<Integer> collect = list.stream().map(OrderGoods::getId).collect(Collectors.toList());
+        orderGoodsDao.batchUpdateResidueWeight(collect,BigDecimal.ZERO);
+    }
 }