Merge branch 'v4.9_create_goods_child_20230918' into test

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsTruckBindEnum.java

@@ -18,7 +18,7 @@ public enum OrderGoodsTruckBindEnum {
         SUCCESS(1, "正常"),
 
         CANCEL(2, "取消"),
-        GET(3, "已结单"),
+        GET(3, "已接单"),
 
         ;
 

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

@@ -70,7 +70,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     @Override
     public Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList) {
         return Optional.ofNullable(baseMapper.selectList(new QueryWrapper<OrderGoodsTruckBind>().lambda()
-                        .ne(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.CANCEL.getCode())
+                        .ne(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode())
                 .in(OrderGoodsTruckBind::getTruckNo,truckList).select(OrderGoodsTruckBind::getOrderGoodsNo)));
     }
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -35,7 +35,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     IPage<OrderGoodsVO> pageOrderGoodsList(Page<OrderGoodsVO> page, PageOrderGoodsListParam param);
 
     @Update(" update order_goods set " +
-            " residue_transport_weight = if (residue_transport_weight>#{weight}, residue_transport_weight-#{weight}, 0)," +
+            " residue_transport_weight = residue_transport_weight-#{weight}," +
             " already_transport_weight = already_transport_weight+#{weight}," +
             "order_goods_status = #{orderGoodsStatus} " +
             " where id = #{id}")