Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

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

 package com.clx.performance.component;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.UpdateOrderInfoParam;
 import com.clx.order.vo.feign.FeignOrderVO;
@@ -94,7 +95,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                         //已完成的货单已经等于订单的拉运吨数，提前更新订单状态 已完成
                         UpdateOrderInfoParam updateOrderInfoParam = new UpdateOrderInfoParam();
                         updateOrderInfoParam.setOrderId(orderInfoFeign.getId());
-                        updateOrderInfoParam.setOrderStatus(OrderGoodsStatusEnum.Status.SUCCESS.getCode());
+                        updateOrderInfoParam.setOrderStatus(OrderEnum.Status.SUCCESS.getCode());
                         orderFeign.updateOrderInfo(updateOrderInfoParam);
                     }
                 } else {
@@ -105,7 +106,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     BigDecimal residueTransportWeight = orderGoods.getResidueTransportWeight();
                     UpdateOrderInfoParam updateOrderInfoParam = new UpdateOrderInfoParam();
                     updateOrderInfoParam.setOrderId(orderInfoFeign.getId());
-                    updateOrderInfoParam.setResidueWeight(residueTransportWeight);
+                    updateOrderInfoParam.setResidueWeight(residueTransportWeight.add(new BigDecimal(orderInfoFeign.getResidueWeight())));
                     log.info("订单ID：{},返还订单剩余吨数{}", orderInfoFeign.getId(), residueTransportWeight);
 
                     //返还订单剩余吨数

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

@@ -31,7 +31,7 @@ public class OrderChildSqlProvider {
                     "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime "
             );
             FROM("order_child ");
-            WHERE("(user_no = #{param.userNo} or driver_user_no = #{param.userNo} or truck_own_user_no = #{param.userNo}) ");
+            WHERE("(driver_user_no = #{param.userNo} or truck_own_user_no = #{param.userNo}) ");
 
             if (Objects.isNull(param.getStatus())) {
 

performance-web/src/main/java/com/clx/performance/strategy/impl/ThreeGoodsOrderStrategy.java

@@ -31,10 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 自由车辆