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
8a33c19f
Commit
8a33c19f
authored
Nov 24, 2020
by
chongfu.liang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20201123-添加美团点评渠道' into develop
parents
91331611
a232db35
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java
+1
-0
order-management/src/main/java/cn/freemud/management/enums/OrderSource.java
+2
-1
order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java
+2
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java
+1
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java
View file @
8a33c19f
...
...
@@ -41,6 +41,7 @@ public enum OrderSourceType {
DPZHCT
(
"dpzhct"
,
"美团点评智慧餐厅"
,
24
),
FMWD
(
"fmwd"
,
"非码微店"
,
25
),
Y_POS
(
"ypos"
,
"非码云POS"
,
26
),
MTDP
(
"mtdp"
,
"美团点评"
,
27
),
parkingmanual
(
"parkingmanual"
,
"农工商停车手工录单"
,
98
),
PARKING
(
"parking"
,
"农工商停车"
,
99
),
SDG
(
"sdg"
,
"闪电购"
,
1000
);
...
...
order-management/src/main/java/cn/freemud/management/enums/OrderSource.java
View file @
8a33c19f
...
...
@@ -10,7 +10,8 @@ public enum OrderSource {
MALL
(
"mall"
,
"非码Mall"
),
SAAS
(
"saas"
,
"saas点餐"
),
ALIPAY
(
"alipay"
,
"支付宝"
),
EBAI
(
"ebwm"
,
"饿百外卖"
);
EBAI
(
"ebwm"
,
"饿百外卖"
),
MTDP
(
"mtdp"
,
"美团点评"
);
private
String
source
;
private
String
sourceName
;
...
...
order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java
View file @
8a33c19f
...
...
@@ -30,7 +30,8 @@ public class OrderBeanFactory {
return
applicationContext
.
getBean
(
McCafeMangerServiceImpl
.
class
);
}
if
(
OrderSource
.
BDWM
.
getSource
().
equals
(
source
)
||
OrderSource
.
JDWM
.
getSource
().
equals
(
source
)
||
OrderSource
.
MTWM
.
getSource
().
equals
(
source
)
||
OrderSource
.
ELEME
.
getSource
().
equals
(
source
)
||
OrderSource
.
FMWD
.
getSource
().
equals
(
source
)
||
OrderSource
.
EBAI
.
getSource
().
equals
(
source
)){
||
OrderSource
.
MTWM
.
getSource
().
equals
(
source
)
||
OrderSource
.
ELEME
.
getSource
().
equals
(
source
)
||
OrderSource
.
FMWD
.
getSource
().
equals
(
source
)
||
OrderSource
.
EBAI
.
getSource
().
equals
(
source
)
||
OrderSource
.
MTDP
.
getSource
().
equals
(
source
)){
return
applicationContext
.
getBean
(
WaimaiOrderMangerServiceImpl
.
class
);
}
return
applicationContext
.
getBean
(
SaasOrderMangerServiceImpl
.
class
);
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java
View file @
8a33c19f
...
...
@@ -35,6 +35,7 @@ public enum OrderClientType {
KOUBEI
(
22
,
"口碑"
),
SAASMALL
(
23
,
"微商城"
),
FMWD
(
25
,
"非码微店"
),
MTDP
(
27
,
"美团点评"
),
PARKING
(
99
,
"农工商停车"
),
FU_YOU
(
100
,
"富有"
),
;
...
...
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