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
3c1fa6fe
Commit
3c1fa6fe
authored
Mar 31, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
月享卡2.0
parent
9db0dca4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+4
-2
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
3c1fa6fe
...
@@ -233,7 +233,8 @@ public class OrderAdapter {
...
@@ -233,7 +233,8 @@ public class OrderAdapter {
if
(
ActivityTypeEnum
.
TYPE_11
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
if
(
ActivityTypeEnum
.
TYPE_11
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_12
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_12
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_37
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
()))
{
||
ActivityTypeEnum
.
TYPE_37
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_38
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
()))
{
jsonObject
.
put
(
"tenderId"
,
activityDiscountsDto
.
getTenderId
());
jsonObject
.
put
(
"tenderId"
,
activityDiscountsDto
.
getTenderId
());
}
else
if
(
ActivityTypeEnum
.
TYPE_34
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
()))
{
}
else
if
(
ActivityTypeEnum
.
TYPE_34
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
()))
{
jsonObject
.
put
(
"customerCode"
,
activityDiscountsDto
.
getTenderId
());
jsonObject
.
put
(
"customerCode"
,
activityDiscountsDto
.
getTenderId
());
...
@@ -442,7 +443,8 @@ public class OrderAdapter {
...
@@ -442,7 +443,8 @@ public class OrderAdapter {
.
build
();
.
build
();
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
if
(
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
if
(
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_37
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
()))
{
||
ActivityTypeEnum
.
TYPE_37
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
||
ActivityTypeEnum
.
TYPE_38
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
()))
{
jsonObject
.
put
(
"tenderId"
,
activityDiscountsDto
.
getTenderId
());
jsonObject
.
put
(
"tenderId"
,
activityDiscountsDto
.
getTenderId
());
}
}
if
(
null
!=
activityDiscountsDto
.
getExtendType
())
{
if
(
null
!=
activityDiscountsDto
.
getExtendType
())
{
...
...
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