Merge remote-tracking branch 'origin/jd_dev' into jd_dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -1831,7 +1831,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
         }
         // 2025年1月15日 增加订单修改货值功能，预装后可单独修改货值
-        if (vo.getShipmentState() > 0 && vo.getShipmentState() != 304 ) {
+        if (vo.getShipmentState() > 0 && !(vo.getShipmentState() == 304 || vo.getShipmentState() == 305) ) {
             throw exception(ORDER_SHIPMENT_NOT_UPDATE);
         }
         // 获取功能开关
@@ -1919,15 +1919,16 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         // 海运订单预装未装柜/空运订单分拣未出货, 锁定订单信息无法修改 exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409])
         // 2025年1月15日 增加货值修改功能，开放预装时修改订单货值307（已预装）、407（空运分拣）、409（空运理货）
         if ((vo.getStatus() != 16 && vo.getShipmentState() == 0)
-                || vo.getShipmentState() == 305
-                //|| vo.getShipmentState() == 307
-                || vo.getShipmentState() == 309
-                || vo.getShipmentState() == 310
-                || vo.getShipmentState() == 311
-                || vo.getShipmentState() == 313
-                //|| vo.getShipmentState() == 407
-                //|| vo.getShipmentState() == 409
-                || vo.getShipmentState() == 411) {
+//                || vo.getShipmentState() == 305
+//                || vo.getShipmentState() == 307
+//                || vo.getShipmentState() == 309
+//                || vo.getShipmentState() == 310
+//                || vo.getShipmentState() == 311
+//                || vo.getShipmentState() == 313
+//                || vo.getShipmentState() == 407
+//                || vo.getShipmentState() == 409
+//                || vo.getShipmentState() == 411
+        ) {
             if (vo.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
                 throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);
             } else {

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderPickup/OrderPickupServiceImpl.java

@@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
-import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
@@ -23,11 +21,13 @@ import cn.iocoder.yudao.module.order.dal.dataobject.orderTime.OrderTimeDO;
 import cn.iocoder.yudao.module.order.dal.mysql.orderPickup.OrderPickupMapper;
 import cn.iocoder.yudao.module.order.dto.OrderBackInfoDto;
 import cn.iocoder.yudao.module.order.enums.*;
-import cn.iocoder.yudao.module.order.service.order.*;
+import cn.iocoder.yudao.module.order.service.order.OrderBusinessService;
+import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
+import cn.iocoder.yudao.module.order.service.order.OrderService;
+import cn.iocoder.yudao.module.order.service.order.OrderTimeService;
 import cn.iocoder.yudao.module.order.service.orderCargoControlPick.OrderCargoControlPickService;
 import cn.iocoder.yudao.module.order.vo.orderConsignee.OrderConsigneeBackVO;
 import cn.iocoder.yudao.module.order.vo.orderPickup.*;
-import cn.iocoder.yudao.module.order.vo.orderTime.OrderTimeQueryVO;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -346,7 +346,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
                 OrderPickupDO delOrderPickupDO = orderPickupMapper.selectDeletedPickup(orderPickupDO.getOrderId());
                 // 这里需要考虑到老数据的空指针异常
 //                orderService.updateStatus(one.getOrderId(), null, Objects.nonNull(delOrderPickupDO) ? delOrderPickupDO.getOrderStatus() : 16, null, null, null, null, null);
-                dealDeliveryRate(one.getOrderNo(),one.getSumNum(),PickStateEnum.picked.getPickState());
+                dealDeliveryRate(one.getOrderNo(),one.getSumNum(),PickStateEnum.unpick.getPickState());
             }
 
             if (Objects.equals(one.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) {