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
8b9e5538
Commit
8b9e5538
authored
Nov 04, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
准备开发券的使用门槛需求
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
e29a7df3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
13 deletions
+1
-13
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+1
-13
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
8b9e5538
...
...
@@ -735,8 +735,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
CouponPromotionVO
couponPromotionVO
=
couponAdapter
.
getCouponPromotionVO
(
shoppingCartInfoRequestVo
,
userLoginInfoDto
);
// fisherman 作用: 调用可选优惠券 计算 配送券是否可用
couponPromotionVO
.
setDeliveryAmount
(
deliveryAmount
);
// fisherman 是否是v3新算价,
boolean
v3Promotion
=
false
;
if
(
grayPush
(
partnerId
,
storeId
,
"2"
))
{
ArrayList
<
ActivityCalculationDiscountRequestDto
.
CalculationDiscountCoupon
>
coupons
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotEmpty
(
couponCode
))
{
...
...
@@ -788,9 +786,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
,
userId
,
storeId
);
buildShoppingCartGoodsResponse
(
shoppingCartGoodsResponseVo
,
calculationSharingDiscountResult
,
shoppingCartInfoRequestVo
.
getFlag
(),
partnerId
);
if
(
Objects
.
nonNull
(
calculationSharingDiscountResult
))
{
v3Promotion
=
calculationSharingDiscountResult
.
getV3Promotion
();
}
}
else
{
List
<
ActivityCalculationDiscountRequestDto
.
CalculationDiscountCoupon
>
coupons
=
new
ArrayList
<>();
// 当couponCode不为空时,需参与价格计算
...
...
@@ -826,9 +821,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
setAddAndUpdateResponse
(
shoppingCartGoodsResponseVo
,
calculationDiscountResult
,
cartGoodsList
,
shoppingCartGoodsResponseVo
.
getToastMsg
(),
partnerId
,
storeId
,
userId
,
ShoppingCartConstant
.
QUERY_INFO
,
shoppingCartInfoRequestVo
);
// 在原价、现价、折扣价上增加第一次使用会员卡的费用
this
.
addNeedCardAmount
(
shoppingCartInfoRequestVo
,
shoppingCartGoodsResponseVo
);
if
(
Objects
.
nonNull
(
calculationDiscountResult
))
{
v3Promotion
=
calculationDiscountResult
.
getV3Promotion
();
}
}
// 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
// shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L);
...
...
@@ -876,12 +868,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
updateForPopupWindow
(
shoppingCartGoodsResponseVo
,
premiumExchangeResponseVoBaseResponse
.
getResult
().
getShowType
(),
chooseSendGoodList
,
shoppingCartInfoRequestVo
.
getSendGoods
());
}
//
添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
//
设置优惠券的使用门槛金额, 需要排除券的金额
if
(
v3Promotion
)
{
// V3算价,需要删除券的金额,来给前段展示 优惠券的启用门槛
}
// 校验入参券是否可用
if
(!
checkAvailableCoupon
(
shoppingCartGoodsResponseVo
,
shoppingCartInfoRequestVo
.
getCouponCode
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
SHOPPING_CART_COUPON_NOT_USE
);
...
...
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