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

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

@@ -241,6 +241,13 @@ public class OrderCancelComponent implements InitializingBean {
      * @return 
      **/
     public void backFillOrderWeight(OrderGoods orderGoods, BigDecimal weight, Integer updateType) {
+        Integer truckDemand = orderGoods.getTruckDemand();
+        java.util.Optional<UpdateEnum> byCode1 = UpdateEnum.getByCode(updateType);
+        String updateTypeMsg = byCode1.isPresent()?byCode1.get().getMsg():"未知调整类型";
+        java.util.Optional<TruckDemandEnum.TruckType> byCode = TruckDemandEnum.TruckType.getByCode(truckDemand);
+        String truckDemandValue = byCode.isPresent()?byCode.get().getMsg():"未知用车需求";
+        log.info("订单号：{},货单号:{},用车需求:{},进行订单剩余吨数{} ,调整吨数:{}",
+                orderGoods.getOrderNo(),orderGoods.getOrderGoodsNo(),truckDemandValue,updateTypeMsg,weight);
         String orderNo = orderGoods.getOrderNo();
         Optional<FeignOrderInfoVO> optional = orderService.getOrderInfo(orderNo);
         if(!optional.isPresent()){
@@ -249,35 +256,31 @@ public class OrderCancelComponent implements InitializingBean {
         }
         FeignOrderInfoVO orderInfo = optional.get();
         boolean isSub = Objects.equals(UpdateEnum.SUB.getCode(), updateType);
-        Integer truckDemand = orderGoods.getTruckDemand();
+
         RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
         rollbackOrderWeightParam.setOrderNo(orderGoods.getOrderNo());
         rollbackOrderWeightParam.setResidueWeight(weight);
-        java.util.Optional<TruckDemandEnum.TruckType> byCode = TruckDemandEnum.TruckType.getByCode(truckDemand);
-        String truckDemandValue = byCode.isPresent()?byCode.get().getMsg():"未知用车需求";
-        java.util.Optional<UpdateEnum> byCode1 = UpdateEnum.getByCode(updateType);
-        String updateTypeMsg = byCode1.isPresent()?byCode1.get().getMsg():"未知调整类型";
+        rollbackOrderWeightParam.setUpdateType(updateType);
+
         //归还吨数
         if (!truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
             if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
-                if(isSub && weight.compareTo(orderInfo.getPlatformResidueCarryWeight()) > 0 ){
+                if(isSub && weight.compareTo(orderInfo.getResidueWeight()) > 0 ){
                     log.warn("货单用车需求: {},订单号：{},货单号：{},平台剩余吨数:{},需要扣减吨数:{},不足扣减",
                             truckDemandValue,orderNo,orderGoods.getOrderGoodsNo(),orderInfo.getPlatformResidueCarryWeight()
                             ,weight);
                     throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
                 }
-                rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
-                rollbackOrderWeightParam.setPlatformResidueCarryWeight(weight);
             } else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
-                if(isSub && weight.compareTo(orderInfo.getOwnResidueCarryWeight()) > 0 ){
+                if(isSub && weight.compareTo(orderInfo.getResidueWeight()) > 0 ){
                     log.warn("货单用车需求: {},订单号：{},货单号：{},自有剩余吨数:{},需要扣减吨数:{},不足扣减",
                             truckDemandValue,orderNo,orderGoods.getOrderGoodsNo(),orderInfo.getOwnResidueCarryWeight()
                             ,weight);
                     throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
                 }
-                rollbackOrderWeightParam.setOwnResidueCarryWeight(weight);
-                rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
             }
+            rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+            rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
         } else {
             if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
                 if(isSub && weight.compareTo(orderInfo.getOwnResidueCarryWeight()) > 0 ){

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

@@ -136,23 +136,26 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
 
                 } else {
-                    RollbackOrderWeightParam param = new RollbackOrderWeightParam();
-                    param.setOrderNo(orderGoods.getOrderNo());
-                    param.setResidueWeight(orderGoods.getResidueTransportWeight());
-                    if (orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())
-                            || orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
-                        param.setOwnResidueCarryWeight(BigDecimal.ZERO);
-                        param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
-                    } else {
-                        if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.PLATFORM.getCode())) {
+                    //大于35吨的归还吨数在这里处理
+                    if(orderGoods.getResidueTransportWeight().compareTo(new BigDecimal("35")) >= 0){
+                        RollbackOrderWeightParam param = new RollbackOrderWeightParam();
+                        param.setOrderNo(orderGoods.getOrderNo());
+                        param.setResidueWeight(orderGoods.getResidueTransportWeight());
+                        if (orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())
+                                || orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
                             param.setOwnResidueCarryWeight(BigDecimal.ZERO);
-                            param.setPlatformResidueCarryWeight(orderGoods.getResidueTransportWeight());
-                        } else if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
-                            param.setOwnResidueCarryWeight(orderGoods.getResidueTransportWeight());
                             param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                        } else {
+                            if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.PLATFORM.getCode())) {
+                                param.setOwnResidueCarryWeight(BigDecimal.ZERO);
+                                param.setPlatformResidueCarryWeight(orderGoods.getResidueTransportWeight());
+                            } else if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
+                                param.setOwnResidueCarryWeight(orderGoods.getResidueTransportWeight());
+                                param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                            }
                         }
+                        orderFeign.rollbackOrderWeight(param);
                     }
-                    orderFeign.rollbackOrderWeight(param);
                     //更新已完结
                     orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoodsNo, OrderGoodsStatusEnum.Status.COMPLETED.getCode());
 

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java

@@ -56,9 +56,9 @@ public class OrderGoodsDtsListener {
 
     //货单剩余吨数不足35吨，自动恢复吨数到订单上
     public void backFillOrderWeight(OrderGoods after){
-        //剩余吨数小于35吨，自动归还订单上
+        //剩余吨数小于35吨并且大于0，自动归还订单上
         if(new BigDecimal("35").compareTo(after.getResidueTransportWeight()) > 0 &&
-                BigDecimal.ZERO.compareTo(after.getResidueTransportWeight()) != 0){
+                after.getResidueTransportWeight().compareTo(BigDecimal.ZERO) > 0){
             log.info("开始自动恢复吨数到订单,订单号:{},货单号:{},货单剩余吨数:{}",
                     after.getOrderNo(),after.getOrderGoodsNo(),after.getResidueTransportWeight());
             orderCancelComponent.backFillOrderWeight(after,after.getResidueTransportWeight(), UpdateEnum.ADD.getCode());

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

 package com.clx.performance.service;
 
-import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.*;
 import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
@@ -11,6 +11,7 @@ import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.pc.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -81,4 +82,6 @@ public interface OrderChildService {
 
     DriverCancelOrderChildInfo driverCancelOrderChildInfo(String orderChildNo);
 
+    void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus);
+
 }

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

 package com.clx.performance.service;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
-import com.clx.performance.param.pc.*;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.param.pc.*;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -32,6 +28,11 @@ public interface OrderGoodsService {
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 
     void updateOrderGoodsReduceWeightAndStatusAmountLoad(OrderGoods orderGoods, BigDecimal orderChildWeight, Integer orderGoodsStatus);
+
+    void borrowWeight(OrderGoods orderGoods,String orderChildNo,BigDecimal subOrderGoodsResidue, BigDecimal addAlready,BigDecimal borrowOrderWeight,
+            Integer orderGoodsStatus);
+
+
     void updateOrderGoodsReduceWeightAndStatus(OrderGoods orderGoods, OrderChild orderChild, Integer orderGoodsStatus);
 
     IPage<OrderGoodsAPPVO> indexOrderGoodsList(OrderGoodsListPageParam orderGoodsListParam);

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

 package com.clx.performance.service.impl;
 
-
 import com.clx.performance.dao.*;
 import com.clx.performance.enums.*;
 import com.clx.performance.model.*;
 import com.clx.performance.param.pc.PoundAuditParam;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderChildPoundAuditService;
+import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
 import com.msl.common.exception.ServiceSystemException;
@@ -47,6 +47,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     private final OrderGoodsService orderGoodsService;
 
     private final OrderChildLogService orderChildLogService;
+    private final OrderChildService orderChildService;
 
 
     @Override
@@ -95,7 +96,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
 
         BigDecimal dif = param.getLoadNet().subtract(orderChild.getLoadNet());
 
-        Integer type = OrderChildLogEnum.Type.POUND_AUDIT.getCode();
+        int type = OrderChildLogEnum.Type.POUND_AUDIT.getCode();
         if(Objects.equals(param.getStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())){
             type = OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode();
         }else{
@@ -113,7 +114,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         orderChild.setFreight(orderChildFreightCalc(orderChild));
 
         // 更新装车净重
-        updateOrderGoodsAmountLoad(orderGoods, dif);
+        updateOrderGoodsAmountLoad(orderGoods,orderChild.getChildNo(), dif);
 
         //更新运单数据
         orderChild.setPoundStatus(param.getStatus());
@@ -138,34 +139,15 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     /**
      * 装车补偿
      */
-    private void updateOrderGoodsAmountLoad(OrderGoods orderGoods, BigDecimal dif){
-        int i = dif.compareTo(BigDecimal.ZERO);
-        if (i == 0){
-            return;
-        } else if (i > 0) {
-            if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
-                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
-                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.SUCCESS.getCode())
-            ) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_STATUS_NOT_GET);
-            }
-
-            if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
-            }
-        }
-
+    private void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif){
         int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo())-1;
-
         Integer status;
         if (count == 0){
             status = OrderGoodsStatusEnum.Status.PAYING.getCode();
-        }
-        else {
+        }else{
             status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
         }
-
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatusAmountLoad(orderGoods, dif, status);
+        orderChildService.updateOrderGoodsAmountLoad(orderGoods,childNo,dif,status);
     }
 
     /**

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

@@ -706,9 +706,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         BigDecimal dif = param.getLoadNet().subtract(orderChild.getWeight());
 
-        if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
-        }
+        //更新货单吨数
+        updateOrderGoodsAmountLoad(orderGoods, childNo,dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
 
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
@@ -718,9 +717,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
 
-        // 更新装车净重
-        updateOrderGoodsAmountLoad(orderGoods, dif);
-
         orderChildDao.updateLoad(orderChild);
 
         orderChildImageDao.batchSaveEntity(imageList);
@@ -750,8 +746,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
 
-        // 更新装车净重
-        updateOrderGoodsAmountLoad(orderGoods, dif);
+        //更新货单吨数
+        updateOrderGoodsAmountLoad(orderGoods,childNo, dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
 
         orderChildDao.updateLoad(orderChild);
 
@@ -981,7 +977,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         audit.setUnloadPoundNo(orderChild.getUnloadPoundNo());
 
         // 更新装车净重
-        updateOrderGoodsAmountLoad(orderGoods, dif);
+        updateOrderGoodsAmountLoad(orderGoods, childNo,dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
 
         orderChildDao.updateLoadAndUnload(orderChild);
 
@@ -1416,28 +1412,22 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     /**
-     * 装车补偿
+     * 更新货单吨数
      */
-    private void updateOrderGoodsAmountLoad(OrderGoods orderGoods, BigDecimal dif) {
-        int i = dif.compareTo(BigDecimal.ZERO);
-        if (i == 0){
-            return;
-        } else if (i > 0) {
-            if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
-                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
-                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.SUCCESS.getCode())
-            ) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_STATUS_NOT_GET);
-            }
-
+    @Override
+    public void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus) {
+        if(dif.compareTo(BigDecimal.ZERO) != 0 ){
+            //判断是从订单借吨还是直接货单进行扣减(货单剩余吨数小于本运单的修改后的吨数差值)
             if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
+                //货单吨数不够扣减，从订单进行借吨数
+                orderGoodsService.borrowWeight(orderGoods,childNo,orderGoods.getResidueTransportWeight(),dif,
+                        dif.subtract(orderGoods.getResidueTransportWeight()),
+                        OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
+            }else{
+                // 货单吨数够扣减，直接更新货单剩余吨数和已拉运吨数和状态
+                orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, orderGoodsStatus);
             }
         }
-
-        Integer status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
-
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatusAmountLoad(orderGoods, dif, status);
     }
 
     /**

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

@@ -749,4 +749,20 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         freightEstimateVO.setFreightPriceList(freightPrice);
         return freightEstimateVO;
     }
+
+    @Override
+    public void borrowWeight(OrderGoods orderGoods,String orderChildNo, BigDecimal subOrderGoodsResidue, BigDecimal addAlready,BigDecimal borrowOrderWeight,
+            Integer orderGoodsStatus) {
+        log.info("运单号:{} 进行订单借量,货单剩余吨数需扣减:{} 吨,货单已拉运吨数需增加:{} 吨,订单借用吨数:{} 吨",orderChildNo,
+                subOrderGoodsResidue,addAlready,borrowOrderWeight);
+        //更新订单吨数
+        orderCancelComponent.backFillOrderWeight(orderGoods,borrowOrderWeight, UpdateEnum.SUB.getCode());
+        //更新货单吨数
+        orderGoodsDao.updateOrderGoodsWeightResidueAndAlreadyAndStatus(orderGoods.getId(),addAlready,subOrderGoodsResidue,orderGoodsStatus);
+
+
+    }
+
+
+
 }

performance-web/src/test/java/com/clx/performance/JobTest.java

 package com.clx.performance;
 
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.OrderFeign;
-import com.clx.order.vo.feign.OrderOwnTruckVo;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderGoodsStatusLazyComponent;
-import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.param.mq.OrderCancelMqParam;
 import com.clx.performance.service.LargeScreenService;
 import com.clx.performance.service.OrderCancelService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class JobTest {
@@ -56,7 +44,7 @@ public class JobTest {
 
     @Test
     public void test1() {
-        JSONObject jsonObject = largeScreenService.receiveAddress(27);
+        String jsonObject = largeScreenService.receiveAddress(27);
         System.out.println(jsonObject);
 //        OrderCancelMqParam mqParam = new OrderCancelMqParam();
 //        mqParam.setType("2");