Commit 9eb74ba9 by chongfu.liang

添加储值卡支付金额

parent b85656a4
...@@ -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;
} }
...@@ -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;
......
...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment