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
9f33dca2
Commit
9f33dca2
authored
May 07, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'KA-小程序展示抖音订单' into pre
parents
1d977c96
0e5959b7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
9f33dca2
...
...
@@ -666,7 +666,7 @@ public class OrderAdapter {
orderClients
=
Arrays
.
asList
(
OrderClientType
.
TIKTOKPAY
.
getIndex
());
bizTypes
.
add
(
BizTypeEnum
.
SALE_COUPON
.
getBizType
());
}
else
{
orderClients
=
Arrays
.
asList
(
OrderClientType
.
SAAS
.
getIndex
(),
OrderClientType
.
ALIPAY
.
getIndex
(),
OrderClientType
.
APP
.
getIndex
());
orderClients
=
Arrays
.
asList
(
OrderClientType
.
SAAS
.
getIndex
(),
OrderClientType
.
ALIPAY
.
getIndex
(),
OrderClientType
.
APP
.
getIndex
()
,
OrderClientType
.
ASSISTANT
.
getIndex
()
);
bizTypes
=
Arrays
.
asList
(
BizTypeEnum
.
ORDINARY
.
getBizType
(),
BizTypeEnum
.
SALE_COUPON
.
getBizType
(),
BizTypeEnum
.
ADVANCE_ORDER
.
getBizType
());
queryOrdersDto
.
setMarketingTypes
(
Arrays
.
asList
(
MarketTypeEnum
.
ORDER
.
getIndex
(),
MarketTypeEnum
.
COLLAGE
.
getIndex
(),
MarketTypeEnum
.
WE_CHAT_LIVE_SELL
.
getIndex
(),
MarketTypeEnum
.
CASHIER
.
getIndex
(),
MarketTypeEnum
.
TIKTOK_MARKET_ORDER
.
getIndex
()));
...
...
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