Merge branch 'test' into release

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

@@ -40,6 +40,7 @@ public enum OrderApprovalTypeEnum {
 
     DISCOUNT_APPLY_BATCH(31, "批量优惠申请", Arrays.asList(1, 2, 6, 11, 14, 23, 28, 32)), // 拆单申请/合单申请/订单修改/退仓/撤销拆单审批/优惠申请（当前商品有在途申请）/批量管理折扣申请（当前商品有在途申请）/管理优惠（当前商品有在途申请）
     ADMIN_DISCOUNT_BATCH(32, "批量管理折扣申请", Arrays.asList(1, 2, 6, 11, 14, 23, 28, 31)), // 拆单申请/合单申请/订单修改/退仓/撤销拆单审批/优惠申请（当前商品有在途申请）/批量优惠申请（当前商品有在途申请）/管理优惠（当前商品有在途申请）
+    expense_apply_BATCH(41, "批量费用申请", Arrays.asList(6, 11, 28)), // 拆单申请/合单申请/撤销拆单审批
     //分拣
     sorting(50, "分拣审批", Arrays.asList(6, 11, 13, 14, 22, 23, 28)), // 自编号全部申请互斥，跟原本一致，不修改, 自编号下订单除拆单申请/合单申请/调仓申请/订单修改/入仓申请/退仓申请外，其他申请不受限制，允许封柜反审批
 

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

@@ -153,6 +153,11 @@ public enum OrderApprovalTypeResultEnum  implements IntArrayValuable {
     admin_discount_batch_reject(32,3, "admin.discount.batch.reject"),
     admin_discount_batch_cancel(32,4, "admin.discount.batch.cancel"),
 
+    //批量费用申请
+    expense_apply_batch_processing(41,1, "fee.application.processing"),
+    expense_apply_batch_pass(41,2, "fee.application.pass"),
+    expense_apply_batch_reject(41,3, "fee.application.reject"),
+    expense_apply_batch_cancel(41,4, "fee.application.cancel"),
 
     //分拣
     sorting_processing(50,1, "shipment.sorting.processing"),

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java

@@ -197,7 +197,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
                 .eq(BoxPreloadGoodsDO::getIsRemove, 0)
         );
         OrderDO orderDO = orderService.getById(orderId);
-        OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(1,2,3,4,5,12,31,32) , false);
+        OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(6,11,13,14,22,23) , false);
         applicationContext.publishEvent(approvalTypeCheckEvent);
         if (approvalTypeCheckEvent.getResult()) {
             throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
@@ -209,7 +209,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
                 List<GuanLianOrderStatusVO> approvalGuanLianOrderList = guanLianOrderStatusVOList.stream().filter(vo -> vo.getType() == 2).collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(approvalGuanLianOrderList)){
                     String orderNoStr = approvalGuanLianOrderList.stream().filter(o -> {
-                        OrderApprovalTypeCheckEvent guanLianApprovalTypeCheckEvent = new OrderApprovalTypeCheckEvent(o.getOrderId(), null, null, Arrays.asList(1,2,3,4,5,12,31,32) , false);
+                        OrderApprovalTypeCheckEvent guanLianApprovalTypeCheckEvent = new OrderApprovalTypeCheckEvent(o.getOrderId(), null, null, Arrays.asList(6,11,13,14,22,23) , false);
                         applicationContext.publishEvent(guanLianApprovalTypeCheckEvent);
                         return guanLianApprovalTypeCheckEvent.getResult();
                     }).map(GuanLianOrderStatusVO::getOrderNo).collect(Collectors.joining(StrUtil.COMMA));
@@ -782,7 +782,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
                                        OrderDO orderDO,
                                        List<Long> orderItemIdList) {
         //订单校验是否在审核中
-        OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(1,2,3,4,5,12,31,32) , false);
+        OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(6,11,13,14,22,23) , false);
         applicationContext.publishEvent(approvalTypeCheckEvent);
         if (approvalTypeCheckEvent.getResult()) {
             throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
@@ -794,7 +794,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
 //                List<GuanLianOrderStatusVO> approvalGuanLianOrderList = guanLianOrderStatusVOList.stream().filter(vo -> vo.getType() == 2).collect(Collectors.toList());
 //                if (CollectionUtil.isNotEmpty(approvalGuanLianOrderList)){
 //                    String orderNoStr = approvalGuanLianOrderList.stream().filter(o -> {
-//                        OrderApprovalTypeCheckEvent guanLianApprovalTypeCheckEvent = new OrderApprovalTypeCheckEvent(o.getOrderId(), null, null, Arrays.asList(1,2,3,4,5,12,31,32) , false);
+//                        OrderApprovalTypeCheckEvent guanLianApprovalTypeCheckEvent = new OrderApprovalTypeCheckEvent(o.getOrderId(), null, null, Arrays.asList(6,11,13,14,22,23) , false);
 //                        applicationContext.publishEvent(guanLianApprovalTypeCheckEvent);
 //                        return guanLianApprovalTypeCheckEvent.getResult();
 //                    }).map(GuanLianOrderStatusVO::getOrderNo).collect(Collectors.joining(StrUtil.COMMA));
@@ -2300,7 +2300,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
         OrderConsigneeDO filterConsigneeDO = getFilterOrderConsigneeDO(boxDO, loadList);
 
         OrderDO orderDO = orderService.getById(orderId);
-        OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(1,2,3,4,5,12,31,32) , false);
+        OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(6,11,13,14,22,23) , false);
         applicationContext.publishEvent(approvalTypeCheckEvent);
         if (approvalTypeCheckEvent.getResult()) {
             throw exception(ORDER_IS_APPROVAL_IN_PROCESS);