Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
e5026d22
Commit
e5026d22
authored
Apr 03, 2023
by
查志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单宝快餐点餐支持取消订单
parent
d5627814
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
+2
-1
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
+1
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/OrderSourceV1.java
+1
-0
No files found.
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
View file @
e5026d22
...
@@ -337,7 +337,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -337,7 +337,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
return
ResponseUtil
.
success
();
return
ResponseUtil
.
success
();
}
}
List
<
Integer
>
newOrderStatusList
=
Arrays
.
asList
(
OrderStatusV1
.
RECEIPT
.
getV2Code
(),
OrderStatusV1
.
COMPLETE
.
getV2Code
(),
OrderStatusV1
.
COMPLETE_MAKE
.
getV2Code
());
List
<
Integer
>
newOrderStatusList
=
Arrays
.
asList
(
OrderStatusV1
.
RECEIPT
.
getV2Code
(),
OrderStatusV1
.
COMPLETE
.
getV2Code
(),
OrderStatusV1
.
COMPLETE_MAKE
.
getV2Code
());
List
<
String
>
sourceList
=
Arrays
.
asList
(
OrderSourceV1
.
SAAS
.
getCode
(),
OrderSourceV1
.
ALIPAY
.
getCode
(),
OrderSourceV1
.
A
PP
.
getCode
());
List
<
String
>
sourceList
=
Arrays
.
asList
(
OrderSourceV1
.
SAAS
.
getCode
(),
OrderSourceV1
.
ALIPAY
.
getCode
(),
OrderSourceV1
.
A
LAPOS
.
getCode
());
if
(
sourceList
.
contains
(
orderBean
.
getSource
())
&&
newOrderStatusList
.
contains
(
orderBean
.
getStatusV2
()))
{
if
(
sourceList
.
contains
(
orderBean
.
getSource
())
&&
newOrderStatusList
.
contains
(
orderBean
.
getStatusV2
()))
{
return
cancelDeliveryAndOrder
(
request
,
orderBean
);
return
cancelDeliveryAndOrder
(
request
,
orderBean
);
}
else
if
(
OrderSourceV1
.
MEAL
.
getCode
().
equals
(
orderBean
.
getSource
()))
{
}
else
if
(
OrderSourceV1
.
MEAL
.
getCode
().
equals
(
orderBean
.
getSource
()))
{
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/OrderSourceV1.java
View file @
e5026d22
...
@@ -35,6 +35,7 @@ public enum OrderSourceV1 {
...
@@ -35,6 +35,7 @@ public enum OrderSourceV1 {
// BEAUTIFUL("beautiful","美业", 28),
// BEAUTIFUL("beautiful","美业", 28),
ASSISTANT
(
"assistant"
,
"非码小助手"
,
29
),
ASSISTANT
(
"assistant"
,
"非码小助手"
,
29
),
SHERPAS
(
"sherpas"
,
"食派士"
,
30
),
SHERPAS
(
"sherpas"
,
"食派士"
,
30
),
ALAPOS
(
"alapos"
,
"订单宝"
,
38
),
parkingmanual
(
"parkingmanual"
,
"农工商停车手工录单"
,
98
),
parkingmanual
(
"parkingmanual"
,
"农工商停车手工录单"
,
98
),
PARKING
(
"parking"
,
"农工商停车"
,
99
),
PARKING
(
"parking"
,
"农工商停车"
,
99
),
;
;
...
...
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