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
66cad2f3
Commit
66cad2f3
authored
Oct 29, 2021
by
胡敬轩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v3算价标志
parent
546b97aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationDiscountResult.java
+3
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
View file @
66cad2f3
...
@@ -309,7 +309,7 @@ public class ActivityAdapter {
...
@@ -309,7 +309,7 @@ public class ActivityAdapter {
// Long sendDiscountAmount = 0L;//赠送和换购商品优惠不算在内
// Long sendDiscountAmount = 0L;//赠送和换购商品优惠不算在内
// Long sendRealAmount = 0L;//赠送和换购商品实付不算在内
// Long sendRealAmount = 0L;//赠送和换购商品实付不算在内
if
(
discountResult
!=
null
){
if
(
discountResult
!=
null
){
boolean
newCalculation
=
CollectionUtils
.
isNotEmpty
(
discountResult
.
getCouponSharedExclusive
()
);
boolean
newCalculation
=
discountResult
.
getV3Promotion
(
);
if
(
newCalculation
){
if
(
newCalculation
){
couponAvailableCartInfo
.
setNewCalculation
(
newCalculation
);
couponAvailableCartInfo
.
setNewCalculation
(
newCalculation
);
buildOrderDiscount
(
couponAvailableCartInfo
,
discountResult
.
getDiscounts
(),
discountResult
.
getCouponSharedExclusive
());
buildOrderDiscount
(
couponAvailableCartInfo
,
discountResult
.
getDiscounts
(),
discountResult
.
getCouponSharedExclusive
());
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationDiscountResult.java
View file @
66cad2f3
...
@@ -105,4 +105,7 @@ public class CalculationDiscountResult {
...
@@ -105,4 +105,7 @@ public class CalculationDiscountResult {
*/
*/
private
Set
<
ActivityTypeSharedExclusive
>
couponSharedExclusive
;
private
Set
<
ActivityTypeSharedExclusive
>
couponSharedExclusive
;
//是否是v3版本算价
private
Boolean
v3Promotion
=
false
;
}
}
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