Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
c7fbb7d1
Commit
c7fbb7d1
authored
Nov 06, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重构费用申请审批和费用批量申请审批的业务逻辑结构
parent
e94db012
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
115 additions
and
94 deletions
+115
-94
OrderApprovalTypeEnum.java
...coder/yudao/module/order/enums/OrderApprovalTypeEnum.java
+1
-0
OrderApprovalTypeResultEnum.java
...yudao/module/order/enums/OrderApprovalTypeResultEnum.java
+5
-0
OrderFeeApplicationServiceImpl.java
...er/service/order/impl/OrderFeeApplicationServiceImpl.java
+109
-94
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderApprovalTypeEnum.java
View file @
c7fbb7d1
...
@@ -40,6 +40,7 @@ public enum OrderApprovalTypeEnum {
...
@@ -40,6 +40,7 @@ public enum OrderApprovalTypeEnum {
DISCOUNT_APPLY_BATCH
(
31
,
"批量优惠申请"
,
Arrays
.
asList
(
1
,
2
,
6
,
11
,
14
,
23
,
28
,
32
)),
// 拆单申请/合单申请/订单修改/退仓/撤销拆单审批/优惠申请(当前商品有在途申请)/批量管理折扣申请(当前商品有在途申请)/管理优惠(当前商品有在途申请)
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
)),
// 拆单申请/合单申请/订单修改/退仓/撤销拆单审批/优惠申请(当前商品有在途申请)/批量优惠申请(当前商品有在途申请)/管理优惠(当前商品有在途申请)
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
)),
// 自编号全部申请互斥,跟原本一致,不修改, 自编号下订单除拆单申请/合单申请/调仓申请/订单修改/入仓申请/退仓申请外,其他申请不受限制,允许封柜反审批
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
View file @
c7fbb7d1
...
@@ -153,6 +153,11 @@ public enum OrderApprovalTypeResultEnum implements IntArrayValuable {
...
@@ -153,6 +153,11 @@ public enum OrderApprovalTypeResultEnum implements IntArrayValuable {
admin_discount_batch_reject
(
32
,
3
,
"admin.discount.batch.reject"
),
admin_discount_batch_reject
(
32
,
3
,
"admin.discount.batch.reject"
),
admin_discount_batch_cancel
(
32
,
4
,
"admin.discount.batch.cancel"
),
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"
),
sorting_processing
(
50
,
1
,
"shipment.sorting.processing"
),
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java
View file @
c7fbb7d1
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment