From d5b25673d8db7d40a8fd5bcfce6017c9bd921091 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 12 七月 2023 18:43:20 +0800
Subject: [PATCH] 使用福利：积分兑换记录todo
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index c95282b..6793ca6 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -133,7 +133,11 @@
detailsVo.setRedeemedNum(coursePackageNums);
detailsVo.setResidueNum(merchandise.getQuantityIssued() - coursePackageNums);
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
- detailsVo.setIntegral(merchandise.getIntegral());
+ if (merchandise.getRedemptionMethod() == 1){
+ detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ }else {
+ detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ }
detailsVo.setCost(merchandise.getPrice());
if (merchandise.getUseScope() == 1){
detailsVo.setBelongs("全国通用");
@@ -173,7 +177,11 @@
detailsVo.setRedeemedNum(count);
detailsVo.setResidueNum(merchandise.getQuantityIssued()-count);
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
- detailsVo.setIntegral(merchandise.getIntegral());
+ if (merchandise.getRedemptionMethod() == 1){
+ detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ }else {
+ detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ }
detailsVo.setCost(merchandise.getPrice());
if (merchandise.getUseScope() == 1){
detailsVo.setBelongs("全国通用");
@@ -205,7 +213,11 @@
detailsVo.setRedeemedNum(couponNums);
detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums);
detailsVo.setPerLimit(coupon.getPickUpQuantity());
- detailsVo.setIntegral(merchandise.getIntegral());
+ if (merchandise.getRedemptionMethod() == 1){
+ detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ }else {
+ detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ }
if (coupon.getUseScope() == 1){
detailsVo.setBelongs("全国通用");
}else if (coupon.getUseScope() == 2){
--
Gitblit v1.7.1