Merge branch 'order-update' into dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderApprovalTypeEnum.java

@@ -48,6 +48,12 @@ public enum OrderApprovalTypeEnum {
     //到仓反审
     warehoused_back(53, "到仓反审"),
 
+    //收货人限制修改
+    CONSIGNEE_LIMIT_UPDATE(61, "收货人限制修改"),
+
+    //海外仓修改
+    OVERSEAS_WAREHOUSE_UPDATE(62, "海外仓修改"),
+
     ;
 
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(OrderApprovalTypeEnum::getValue).toArray();

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderApprovalTypeResultEnum.java

@@ -197,6 +197,19 @@ public enum OrderApprovalTypeResultEnum  implements IntArrayValuable {
     clearance_back_pass(56,2, "air.clearance.back.pass"),
     clearance_back_reject(56,3, "air.clearance.back.reject"),
     clearance_back_cancel(56,4, "air.clearance.back.cancel"),
+
+    //收货人限制修改
+    CONSIGNEE_LIMIT_UPDATE_PROCESSING(61,1, "consignee.limit.update.processing"),
+    CONSIGNEE_LIMIT_UPDATE_PASS(61,2, "consignee.limit.update.pass"),
+    CONSIGNEE_LIMIT_UPDATE_REJECT(61,3, "consignee.limit.update.reject"),
+    CONSIGNEE_LIMIT_UPDATE_CANCEL(61,4, "consignee.limit.update.cancel"),
+
+    //海外仓修改
+    OVERSEAS_WAREHOUSE_UPDATE_PROCESSING(62,1, "overseas.warehouse.update.processing"),
+    OVERSEAS_WAREHOUSE_UPDATE_PASS(62,2, "overseas.warehouse.update.pass"),
+    OVERSEAS_WAREHOUSE_UPDATE_REJECT(62,3, "overseas.warehouse.update.reject"),
+    OVERSEAS_WAREHOUSE_UPDATE_CANCEL(62,4, "overseas.warehouse.update.cancel"),
+
             ;
 
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -31,6 +31,8 @@ import cn.iocoder.yudao.module.order.dal.mysql.approval.OrderApprovalMapper;
 import cn.iocoder.yudao.module.order.dal.mysql.orderCargoControl.OrderCargoControlMapper;
 import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
 import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
+import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeEnum;
+import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeResultEnum;
 import cn.iocoder.yudao.module.order.enums.OrderStatusEnum;
 import cn.iocoder.yudao.module.order.service.order.OrderBusinessService;
 import cn.iocoder.yudao.module.order.service.order.OrderConsignorService;
@@ -493,7 +495,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
         if (result == 3 || result == 4) {
             // TODO  审批取消、审批拒绝,待补充业务日志及其他细节
             if (orderApprovalDO.getType() == 61) {
-                msg = result == 3 ? "收货人限制修改申请取消" : "收货人限制修改申请拒绝";
+                msg = result == 4 ? "收货人限制修改申请取消" : "收货人限制修改申请拒绝";
                 ApplyInfoVO applyInfoVO;
                 if (applyVO.getIsLimitUpdateConsignee() != applyVO.getNewIsLimitUpdateConsignee()) {
                     applyInfoVO = new ApplyInfoVO();
@@ -513,7 +515,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
                     list.add(applyInfoVO);
                 }
             } else if (orderApprovalDO.getType() == 62) {
-                msg = result == 3 ? "海外仓修改申请取消" : "海外仓修改申请拒绝";
+                msg = result == 4 ? "海外仓修改申请取消" : "海外仓修改申请拒绝";
                 ApplyInfoVO applyInfoVO = new ApplyInfoVO();
                 applyInfoVO.setName("订单修改为海外仓模式");
                 list.add(applyInfoVO);
@@ -559,6 +561,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             }
         }
         orderApprovalMapper.updateById(orderApprovalDO);
+        orderService.updateStatus(orderApprovalDO.getOrderId(), "", null, null, null, null, orderApprovalDO.getType(), OrderApprovalTypeResultEnum.typeAndResultOf(orderApprovalDO.getType(), result).getDesc(), false);
         orderBusinessService.addOrderOperateLog(orderApprovalDO.getOrderId(), "订单操作", msg, list);
     }
 
@@ -671,6 +674,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             list.add(applyInfoVO);
         }
         orderApprovalMapper.updateById(orderApprovalDO);
+        orderService.updateStatus(orderApprovalDO.getOrderId(), "", null, null, null, null, orderApprovalDO.getType(), OrderApprovalTypeResultEnum.typeAndResultOf(orderApprovalDO.getType(), 1).getDesc(), false);
         orderBusinessService.addOrderOperateLog(orderApprovalDO.getOrderId(), "订单操作", msg, list);
     }
 }