From e61275c2e77d27e299e74d84568bedd43b6d82ca Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 25 七月 2023 11:52:06 +0800
Subject: [PATCH] 探索玩湃-积分商城的列表优化；managent模块去除冗余类
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 898ee0c..5830d90 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
@@ -150,10 +150,11 @@
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
if (merchandise.getRedemptionMethod() == 1){
detailsVo.setExchangeType(1);
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ detailsVo.setIntegral(merchandise.getIntegral());
}else {
detailsVo.setExchangeType(2);
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
}
detailsVo.setCost(merchandise.getPrice());
if (merchandise.getUseScope() == 1){
@@ -171,12 +172,13 @@
detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
}
List<CoursePackagePaymentConfig> courseConfigList = cpcfigClient.getCourseConfigList(coursePackage.getId());
- int redul = 0;
for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
- redul = redul + coursePackagePaymentConfig.getClassHours();
+ if (Objects.equals(coursePackagePaymentConfig.getId(), merchandise.getCoursePackageConfigId())){
+ detailsVo.setCourseHours(coursePackagePaymentConfig.getClassHours());
+ break;
+ }
}
- detailsVo.setCourseHours(redul);
detailsVo.setStartTime(format.format(merchandise.getStartTime()));
detailsVo.setEndTime(format.format(merchandise.getEndTime()));
@@ -209,9 +211,10 @@
detailsVo.setResidueNum(merchandise.getQuantityIssued()-count);
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
if (merchandise.getRedemptionMethod() == 1){
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ detailsVo.setIntegral(merchandise.getIntegral());
}else {
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
}
detailsVo.setCost(merchandise.getPrice());
if (merchandise.getUseScope() == 1){
@@ -256,9 +259,10 @@
detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums);
detailsVo.setPerLimit(coupon.getPickUpQuantity());
if (merchandise.getRedemptionMethod() == 1){
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ detailsVo.setIntegral(merchandise.getIntegral());
}else {
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
}
if (coupon.getUseScope() == 1){
detailsVo.setBelongs("全国通用");
--
Gitblit v1.7.1