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
b12ee30e
Commit
b12ee30e
authored
Aug 09, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
问题修复
parent
e6152da4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
0 deletions
+1
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
b12ee30e
...
@@ -261,6 +261,7 @@ public class OrderAdapter {
...
@@ -261,6 +261,7 @@ public class OrderAdapter {
.
sequence
(
orderAccountIndex
++)
.
sequence
(
orderAccountIndex
++)
.
build
();
.
build
();
if
(
mcCafePartnerId
.
equals
(
createOrderDto
.
getCompanyId
()))
{
if
(
mcCafePartnerId
.
equals
(
createOrderDto
.
getCompanyId
()))
{
//购买月享卡2.0并且不当单使用时,过滤掉无意义的0元优惠
if
(
activityDiscountsDto
.
getDiscountAmount
()
==
0
&&
ActivityTypeEnum
.
TYPE_38
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
if
(
activityDiscountsDto
.
getDiscountAmount
()
==
0
&&
ActivityTypeEnum
.
TYPE_38
.
getCode
().
equals
(
activityDiscountsDto
.
getActivityType
())
&&
activityDiscountsDto
.
getExtendType
()
==
12
//12=月享卡2.0
&&
activityDiscountsDto
.
getExtendType
()
==
12
//12=月享卡2.0
&&
(
shoppingCartGoodsDto
.
getMonthCardDiscount
()
==
null
||
shoppingCartGoodsDto
.
getMonthCardDiscount
().
getDiscountAmount
()
==
0
))
{
&&
(
shoppingCartGoodsDto
.
getMonthCardDiscount
()
==
null
||
shoppingCartGoodsDto
.
getMonthCardDiscount
().
getDiscountAmount
()
==
0
))
{
...
...
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