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
0270a33f
Commit
0270a33f
authored
Dec 15, 2020
by
刘鹏飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coco点餐页购物车行价格商品现单价不做二次编辑
parent
34cdb393
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
+2
-1
shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java
+1
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
View file @
0270a33f
...
...
@@ -25,6 +25,7 @@ public enum ActivityTypeEnum {
*/
TYPE_2
(
2
,
"单品特价"
),
TYPE_21
(
21
,
"单品折扣"
),
TYPE_22
(
22
,
"单品立减"
),
TYPE_23
(
23
,
"超值加购"
),
/**
* 优惠券
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java
View file @
0270a33f
...
...
@@ -391,7 +391,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
List
<
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
>
goodsDiscountsList
=
goods
.
getDiscounts
();
if
(
goodsDiscountsList
!=
null
&&
!
goodsDiscountsList
.
isEmpty
()){
for
(
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
gd
:
goodsDiscountsList
){
if
(
ObjectUtils
.
equals
(
gd
.
getType
(),
ActivityTypeEnum
.
TYPE_2
.
getCode
())){
if
(
ObjectUtils
.
equals
(
gd
.
getType
(),
ActivityTypeEnum
.
TYPE_2
2
.
getCode
())){
cutFlag
=
true
;
break
;
}
...
...
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