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
f80290f2
Commit
f80290f2
authored
Jan 07, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加够数量 购物车限制
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
1ab2de56
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+4
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
+2
-3
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
f80290f2
...
@@ -84,7 +84,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
...
@@ -84,7 +84,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import
com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum
;
import
com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum
;
import
com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService
;
import
com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService
;
import
com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl
;
import
com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl
;
import
com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
ma.glasnost.orika.MapperFacade
;
import
ma.glasnost.orika.MapperFacade
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
...
@@ -475,6 +474,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -475,6 +474,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
return
ResponseUtil
.
error
(
ResponseResult
.
SHOPPING_CART_SHOP_ID_NOT_EMPTY
);
return
ResponseUtil
.
error
(
ResponseResult
.
SHOPPING_CART_SHOP_ID_NOT_EMPTY
);
// throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
// throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
}
}
// fisherman 购物车加车数量限制
if
(
updateShoppingCartGoodsQtyRequestVo
.
getQty
().
compareTo
(
500
)
>
0
||
updateShoppingCartGoodsQtyRequestVo
.
getQty
().
compareTo
(
0
)
<=
0
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
SHOPPING_CART_LIMIT_ADD
);
}
ShoppingCartGoodsResponseVo
shoppingCartGoodsResponseVo
=
new
ShoppingCartGoodsResponseVo
();
ShoppingCartGoodsResponseVo
shoppingCartGoodsResponseVo
=
new
ShoppingCartGoodsResponseVo
();
CustomerInfoVo
assortmentCustomerInfoVo
=
getCustomerInfoVo
(
updateShoppingCartGoodsQtyRequestVo
.
getSessionId
());
CustomerInfoVo
assortmentCustomerInfoVo
=
getCustomerInfoVo
(
updateShoppingCartGoodsQtyRequestVo
.
getSessionId
());
UserLoginInfoDto
userLoginInfoDto
=
convert2UserLoginInfoDto
(
assortmentCustomerInfoVo
);
UserLoginInfoDto
userLoginInfoDto
=
convert2UserLoginInfoDto
(
assortmentCustomerInfoVo
);
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
View file @
f80290f2
...
@@ -21,7 +21,6 @@ import cn.freemud.service.active.ActiveService;
...
@@ -21,7 +21,6 @@ import cn.freemud.service.active.ActiveService;
import
cn.freemud.service.impl.AssortmentSdkService
;
import
cn.freemud.service.impl.AssortmentSdkService
;
import
cn.freemud.service.thirdparty.ActivityClient
;
import
cn.freemud.service.thirdparty.ActivityClient
;
import
cn.freemud.utils.PropertyConvertUtil
;
import
cn.freemud.utils.PropertyConvertUtil
;
import
cn.freemud.entities.dto.activity.DiscountSharingDto
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant
;
import
com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant
;
import
com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum
;
import
com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum
;
...
@@ -266,8 +265,8 @@ public class CalculationSharingDiscountService {
...
@@ -266,8 +265,8 @@ public class CalculationSharingDiscountService {
throw
new
BizServiceException
(
ResponseResult
.
COCO_COUPON_VALIDATOR_FAIL
,
sharingDiscountResponseDto
.
getMsg
());
throw
new
BizServiceException
(
ResponseResult
.
COCO_COUPON_VALIDATOR_FAIL
,
sharingDiscountResponseDto
.
getMsg
());
}
}
// 80000 促销校验业务错误,直接抛给前端
// 80000 促销校验业务错误,直接抛给前端
if
(
sharingDiscountResponseDto
!=
null
&&
StringUtils
.
equals
(
sharingDiscountResponseDto
.
getStatusCode
(),
"80000"
))
{
if
(
StringUtils
.
equals
(
sharingDiscountResponseDto
.
getStatusCode
(),
"80000"
))
{
throw
new
ServiceException
(
ResponseResult
.
SYSTEM_BUSINESS_ERROR
,
sharingDiscountResponseDto
.
getMsg
());
throw
new
ServiceException
(
ResponseResult
.
SYSTEM_BUSINESS_ERROR
,
sharingDiscountResponseDto
.
getMsg
());
}
}
// 支付宝华莱士紧急修改代码,当促销返回103错误码时,需要报券不适用于该门店,且清空购物车
// 支付宝华莱士紧急修改代码,当促销返回103错误码时,需要报券不适用于该门店,且清空购物车
...
...
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