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
81a584d3
Commit
81a584d3
authored
Sep 19, 2024
by
刘继明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增诺心蛋糕client
parent
8d4e052d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletions
+5
-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/OrderClientType.java
+1
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/OrderSourceV1.java
+3
-0
No files found.
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
View file @
81a584d3
...
@@ -370,7 +370,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -370,7 +370,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
.
ALAPOS
.
getCode
());
List
<
String
>
sourceList
=
Arrays
.
asList
(
OrderSourceV1
.
SAAS
.
getCode
(),
OrderSourceV1
.
ALIPAY
.
getCode
(),
OrderSourceV1
.
ALAPOS
.
getCode
()
,
OrderSourceV1
.
LE_CAKE
.
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/OrderClientType.java
View file @
81a584d3
...
@@ -55,6 +55,7 @@ public enum OrderClientType {
...
@@ -55,6 +55,7 @@ public enum OrderClientType {
PARKING
(
99
,
"农工商停车"
),
PARKING
(
99
,
"农工商停车"
),
// CASHIER(36, "收银买单"),//废弃
// CASHIER(36, "收银买单"),//废弃
// WE_CHAT_LIVE_SELL(37, "微信视频卖券"),//废弃
// WE_CHAT_LIVE_SELL(37, "微信视频卖券"),//废弃
LE_CAKE
(
40
,
"诺心蛋糕"
),
;
;
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/OrderSourceV1.java
View file @
81a584d3
...
@@ -38,6 +38,9 @@ public enum OrderSourceV1 {
...
@@ -38,6 +38,9 @@ public enum OrderSourceV1 {
ALAPOS
(
"alapos"
,
"订单宝"
,
38
),
ALAPOS
(
"alapos"
,
"订单宝"
,
38
),
parkingmanual
(
"parkingmanual"
,
"农工商停车手工录单"
,
98
),
parkingmanual
(
"parkingmanual"
,
"农工商停车手工录单"
,
98
),
PARKING
(
"parking"
,
"农工商停车"
,
99
),
PARKING
(
"parking"
,
"农工商停车"
,
99
),
LE_CAKE
(
"le_cake"
,
"诺心蛋糕"
,
40
),
;
;
private
String
code
;
private
String
code
;
private
String
desc
;
private
String
desc
;
...
...
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