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
1c2ef1be
Commit
1c2ef1be
authored
Oct 13, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
运费券键位编号保存
parent
1cfaa051
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+6
-3
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
1c2ef1be
...
...
@@ -181,11 +181,14 @@ public class OrderAdapter {
.
accountType
(
getQueryOrderAccountType
(
getOrderAccountType
(
activityDiscountsDto
.
getActivityType
())))
.
sequence
(
orderAccountIndex
++)
.
build
();
if
(
mcCafePartnerId
.
equals
(
createOrderDto
.
getCompanyId
())
&&
(
ActivityTypeEnum
.
TYPE_11
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_12
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())))
{
if
(
mcCafePartnerId
.
equals
(
createOrderDto
.
getCompanyId
()))
{
JSONObject
jsonObject
=
new
JSONObject
();
if
(
ActivityTypeEnum
.
TYPE_11
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_12
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
()))
{
jsonObject
.
put
(
"tenderId"
,
activityDiscountsDto
.
getTenderId
());
}
else
if
(
ActivityTypeEnum
.
TYPE_34
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
()))
{
jsonObject
.
put
(
"customerCode"
,
activityDiscountsDto
.
getTenderId
());
}
createOrderAccountDto
.
setAddInfo
(
jsonObject
.
toJSONString
());
}
orderAccountDtos
.
add
(
createOrderAccountDto
);
...
...
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