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

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

@@ -38,6 +38,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     Optional<OrderChild> getByChildNo(String childNo);
 
     long countOfCancel(Long userNo, LocalDateTime startTime, LocalDateTime endTime);
+    long countOfTransitByOrderGoodsNo(String orderGoodsNo);
 
     IPage<OrderChildVO> pageOrderChildOfDriver(PageOrderChildOfDriverParam param);
     IPage<OrderChildVO> pageSearchOrderChildOfDriver(PageOrderChildOfDriverSearchParam param);

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

@@ -140,6 +140,14 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public long countOfTransitByOrderGoodsNo(String orderGoodsNo) {
+        return count(lQrWrapper()
+                .eq(OrderChild::getOrderGoodsNo, orderGoodsNo)
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE.getCode())
+        );
+    }
+
     @Override
     public IPage<OrderChildVO> pageOrderChildOfDriver(PageOrderChildOfDriverParam param) {
         Page<OrderChildVO> page = Page.of(param.getPage(), param.getPageSize());

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

@@ -691,6 +691,12 @@ public class OrderChildServiceImpl implements OrderChildService {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_POUND_REJECT);
         }
 
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        long count = orderChildDao.countOfTransitByOrderGoodsNo(orderChild.getOrderGoodsNo());
+
+        // 更新货单完成状态
+        updateOrderGoodsComplete(orderGoods, count);
+
         orderChild.setStatus(OrderChildEnum.Status.UNSETTLE.getCode());
         orderChildDao.updateDriverConfirm(orderChild);
 
@@ -997,6 +1003,18 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderGoodsTruckBindDao.updateStatus(orderGoodsTruckBind);
     }
 
+    /**
+     * 更新货单完成状态
+     */
+    private void updateOrderGoodsComplete(OrderGoods orderGoods, long count){
+        if (count > 1) {return;}
+
+        if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) <= 0){
+            orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+        }
+
+    }
+
     /**
      * 拉运吨数检测
      */

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

@@ -56,7 +56,7 @@ public class OrderGoodsSqlProvider {
                     WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
                 } else if (OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode().equals(param.getOrderGoodsStatus())) {
                     WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
-                } else if (OrderGoodsStatusEnum.Status.ARRIVE_SEND.getCode().equals(param.getOrderGoodsStatus())) {
+                } else if (OrderGoodsStatusEnum.Status.SUCCESS.getCode().equals(param.getOrderGoodsStatus())) {
                     WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
                 } else if (OrderGoodsStatusEnum.Status.CANCEL.getCode().equals(param.getOrderGoodsStatus())) {
                     WHERE("a.order_goods_status = #{param.orderGoodsStatus}");