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
8a919022
Commit
8a919022
authored
Dec 11, 2020
by
张志恒
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/qa' into qa
parents
9a187dad
0fb30e44
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
+2
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
View file @
8a919022
...
...
@@ -10,6 +10,7 @@ import cn.freemud.entities.dto.shoppingCart.SendPoint;
import
cn.freemud.entities.vo.CartGoods
;
import
cn.freemud.entities.vo.ShoppingCartInfoRequestVo
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.BizServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.service.CommonService
;
import
cn.freemud.service.CouponService
;
...
...
@@ -200,7 +201,7 @@ public class CalculationSharingDiscountService {
// 这个是专门给coco使用的券验证错误的异常,message要抛出去
if
(
sharingDiscountResponseDto
!=
null
&&
StringUtils
.
equals
(
sharingDiscountResponseDto
.
getStatusCode
(),
ResponseCodeConstant
.
COCO_RESPONSE_COUPON_ERR_STR
)){
throw
new
ServiceException
(
ResponseResult
.
COCO_COUPON_VALIDATOR_FAIL
,
sharingDiscountResponseDto
.
getMsg
());
throw
new
Biz
ServiceException
(
ResponseResult
.
COCO_COUPON_VALIDATOR_FAIL
,
sharingDiscountResponseDto
.
getMsg
());
}
// 支付宝华莱士紧急修改代码,当促销返回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