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

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -70,4 +70,9 @@ public class AppGoodsOrderController {
     }
 
 
+    @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
+    @GetMapping("/getCancelOrderGoods")
+    public Result<List<OrderGoodsAPPVO>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
+        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
+    }
 }

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

@@ -10,24 +10,27 @@ import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.OrderCancelReasonParam;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
-import com.clx.performance.component.OrderCancelComponent;
-import com.clx.performance.extranal.user.DriverService;
-import com.clx.performance.param.app.AppGoodsOrderSearchParam;
-import com.clx.performance.param.pc.*;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
+import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.component.OrderGoodsStatusLazyComponent;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.enums.*;
+import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import com.clx.performance.model.OrderGoodsTruckBind;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
-import com.clx.performance.service.*;
+import com.clx.performance.param.pc.*;
+import com.clx.performance.service.IntegralMqService;
+import com.clx.performance.service.OrderChildLogService;
+import com.clx.performance.service.OrderGoodsLogService;
+import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.performance.struct.OrderGoodsStruct;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
@@ -44,7 +47,6 @@ import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -54,7 +56,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -304,7 +309,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
         //考虑到借吨、恢复吨数的货单，逻辑判断实际的提取吨数
         BigDecimal realExtractWeight = oldOrderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) == 0?
-                oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getExtractWeight();
+                oldOrderGoods.getAlreadyTransportWeight():oldOrderGoods.getAlreadyTransportWeight().add(oldOrderGoods.getResidueTransportWeight());
         oldOrderGoods.setExtractWeight(realExtractWeight);
         BigDecimal answer = orderGoodsParams.getExtractWeight().subtract(realExtractWeight);
         int flag = answer.compareTo(BigDecimal.ZERO);
@@ -715,6 +720,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) == 0 ){
             //如果借吨或者恢复吨数，会导致提取吨数不准确，所以这里取准确提取吨数
             orderGoodsVO.setExtractWeight(orderGoodsVO.getAlreadyTransportWeight());
+        }else{
+            orderGoodsVO.setExtractWeight(orderGoodsVO.getAlreadyTransportWeight().add(orderGoodsVO.getResidueTransportWeight()));
         }
         String orderNo = orderGoodsVO.getOrderNo();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);