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
9eb74ba9
Commit
9eb74ba9
authored
Dec 22, 2020
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加储值卡支付金额
parent
b85656a4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
2 deletions
+25
-2
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
+5
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberInfoResponseVo.java
+16
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+4
-2
No files found.
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
View file @
9eb74ba9
...
@@ -182,5 +182,10 @@ public class OrderExtInfoDto {
...
@@ -182,5 +182,10 @@ public class OrderExtInfoDto {
private
Integer
sendPointMaxNum
;
private
Integer
sendPointMaxNum
;
private
Integer
sendPointValidityDateDays
;
private
Integer
sendPointValidityDateDays
;
/**
* 线下订单储值卡支付金额
*/
private
Integer
svcAmount
;
}
}
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberInfoResponseVo.java
View file @
9eb74ba9
...
@@ -33,6 +33,17 @@ public class GetMemberInfoResponseVo {
...
@@ -33,6 +33,17 @@ public class GetMemberInfoResponseVo {
*/
*/
private
Integer
usedScore
;
private
Integer
usedScore
;
/**
* 积分抵扣金额,单位分
*/
private
Integer
reduceAmount
;
/**
* 抵扣积分
*/
private
Integer
reduceScore
;
}
}
@Data
@Data
...
@@ -59,6 +70,11 @@ public class GetMemberInfoResponseVo {
...
@@ -59,6 +70,11 @@ public class GetMemberInfoResponseVo {
private
String
couponLimit
;
private
String
couponLimit
;
/**
/**
* 优惠金额,单位分
*/
private
Integer
discountAmount
;
/**
* 状态:-1:未激活 0:可用(剔除过期) 1:已使用 2:部分使用 3:取消 6:已过期(根据生失效日期) 99:未知(目前暂不支持)
* 状态:-1:未激活 0:可用(剔除过期) 1:已使用 2:部分使用 3:取消 6:已过期(根据生失效日期) 99:未知(目前暂不支持)
*/
*/
private
Integer
status
;
private
Integer
status
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
9eb74ba9
...
@@ -988,9 +988,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -988,9 +988,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
GetUserScoreUserDetailResponse
.
UserScoreDetailVo
result
=
userScoreUseDetail
.
getResult
();
GetUserScoreUserDetailResponse
.
UserScoreDetailVo
result
=
userScoreUseDetail
.
getResult
();
GetMemberInfoResponseVo
.
Score
score
=
new
GetMemberInfoResponseVo
.
Score
();
GetMemberInfoResponseVo
.
Score
score
=
new
GetMemberInfoResponseVo
.
Score
();
score
.
setUsedScore
(
result
.
getUseScore
());
score
.
setCurrentScore
(
result
.
getCurrentScore
());
score
.
setCurrentScore
(
result
.
getCurrentScore
());
score
.
setTotalScore
(
result
.
getUseScore
()
+
result
.
getCurrentScore
());
score
.
setReduceAmount
(
result
.
getReduceAmount
());
score
.
setReduceScore
(
result
.
getUseScore
());
responseData
.
setScore
(
score
);
responseData
.
setScore
(
score
);
}
}
...
@@ -1050,6 +1051,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -1050,6 +1051,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
}
coupon
.
setCuoponType
(
each
.
getCouponType
());
coupon
.
setCuoponType
(
each
.
getCouponType
());
coupon
.
setCouponName
(
each
.
getCouponName
());
coupon
.
setCouponName
(
each
.
getCouponName
());
coupon
.
setDiscountAmount
(
Integer
.
valueOf
(
each
.
getDiscountAmount
()));
coupon
.
setCouponLimit
(
null
);
coupon
.
setCouponLimit
(
null
);
coupon
.
setCouponCode
(
each
.
getCouponCode
());
coupon
.
setCouponCode
(
each
.
getCouponCode
());
return
coupon
;
return
coupon
;
...
...
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