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
eedfbe6e
Commit
eedfbe6e
authored
Aug 19, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增参与积分商品活动积分不足字段
parent
9be9ad2c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
+5
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
+6
-7
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
View file @
eedfbe6e
...
...
@@ -194,6 +194,11 @@ public class ShoppingCartGoodsResponseVo extends ShoppingCartGoodsBaseResponseV
private
Integer
verCompat
=
0
;
/**
* 参与积分商品活动积分不足
*/
private
Boolean
isInsufficientScore
=
false
;
/**
* 选中的可用优惠券集合
*/
private
List
<
ChooseCouponVo
>
couponCodes
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
View file @
eedfbe6e
...
...
@@ -35,12 +35,6 @@ public interface ActivityClient {
@IgnoreFeignLogAnnotation
(
logMessage
=
"query"
,
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
)
ActivityQueryResponseDto
query
(
ActivityQueryRequestDto
activityQueryRequestDto
);
/**
* 优惠金额计算
*/
@PostMapping
(
"/calculation/discount"
)
@IgnoreFeignLogAnnotation
(
logMessage
=
"calculationDiscount"
,
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
)
ActivityCalculationDiscountResponseDto
calculationDiscount
(
ActivityCalculationDiscountRequestDto
activityCalculationDiscountRequestDto
);
/**
* 扣减库存
...
...
@@ -56,7 +50,12 @@ public interface ActivityClient {
@IgnoreFeignLogAnnotation
(
logMessage
=
"cancelStock"
,
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
)
ActivityBaseResponseDto
cancelStock
(
ActivityCancelStockRequestDto
activityCancelStockRequestDto
);
/**
* 老版优惠金额计算
*/
@PostMapping
(
"/calculation/discount"
)
@IgnoreFeignLogAnnotation
(
logMessage
=
"calculationDiscount"
,
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
)
ActivityCalculationDiscountResponseDto
calculationDiscount
(
ActivityCalculationDiscountRequestDto
activityCalculationDiscountRequestDto
);
/**
* 新版优惠均摊计算
...
...
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