Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into test

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

@@ -11,13 +11,11 @@ import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.sqlProvider.OrderChildSqlProvider;
 import com.clx.performance.vo.app.OrderChildVO;
-import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import org.apache.ibatis.annotations.*;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -51,7 +49,7 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     @UpdateProvider(type = OrderChildSqlProvider.class, method = "batchUpdateOrderChildStatus")
     Integer updateOrderGoodsSetResidueWeight(@Param(value = "status") Integer status, @Param(value = "remark") String remark, @Param(value = "ids") List<Integer> ids);
 
-    @UpdateProvider(type = OrderChildSqlProvider.class, method = "listAfterArrayReceiveChild")
+    @SelectProvider(type = OrderChildSqlProvider.class, method = "listAfterArrayReceiveChild")
     BigDecimal listAfterArrayReceiveChild(@Param(value = "orderNo")String orderNo);
     Integer updateOrderGoodsSetResidueWeight(@Param(value = "status") Integer status, @Param(value = "ids") List<Integer> ids);
 

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

@@ -133,7 +133,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
             if (CollectionUtil.isNotEmpty(childNoList)) {
                 orderChildDao.batchUpdateOrderChildStatus(
-                        OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消",
+                        OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), OrderChildEnum.Status.PLATFORM_CANCEL.getName(),
                         now, now,childNoList);
             }
 

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

@@ -529,12 +529,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                             childNoList.add(orderChild.getChildNo());
                             sum = sum.add(orderChild.getWeight());
                             orderChildLogService.saveOrderChildLog(orderChild.getChildNo(),
-                                    OrderChildEnum.Status.OWNER_CANCEL.getCode(), OrderChildEnum.Status.OWNER_CANCEL.getName(),
-                                    OrderChildLogEnum.CreateType.OWNER.getCode(), 0L, OrderChildLogEnum.CreateType.OWNER.getMsg()
+                                    OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), OrderChildEnum.Status.PLATFORM_CANCEL.getName(),
+                                    OrderChildLogEnum.CreateType.PLATFORM.getCode(), 0L, OrderChildLogEnum.CreateType.PLATFORM.getMsg()
                             );
                         }
                         orderChildDao.batchUpdateOrderChildStatus(
-                                OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消",
+                                OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), OrderChildEnum.Status.PLATFORM_CANCEL.getName(),
                                 now,now,childNoList);
                     }
                     orderChildList.removeAll(filterOrderChildList);