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 | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 48661e0..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
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.*;
import com.dsh.activity.feignclient.course.CoursePackageClient;
+import com.dsh.activity.feignclient.course.CoursePackageConfigClient;
import com.dsh.activity.feignclient.course.model.CoursePackage;
+import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig;
import com.dsh.activity.feignclient.model.IntegralCommodity;
import com.dsh.activity.feignclient.model.ProductDetailRequest;
import com.dsh.activity.feignclient.model.ProductDetailsVo;
@@ -45,6 +47,9 @@
@Autowired
private StoreClient stoClient;
+
+ @Autowired
+ private CoursePackageConfigClient cpcfigClient;
@Autowired
private PointsMerchandiseStoreService pmdstoService;
@@ -128,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("全国通用");
@@ -141,8 +150,13 @@
StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(pointsMerchandiseStore.getStoreId());
detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
}
- // TODO: 2023/7/12 课包的课时
-// detailsVo.setCourseHours();
+ List<CoursePackagePaymentConfig> courseConfigList = cpcfigClient.getCourseConfigList(coursePackage.getId());
+ int redul = 0;
+
+ for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
+ redul = redul + coursePackagePaymentConfig.getClassHours();
+ }
+ detailsVo.setCourseHours(redul);
detailsVo.setStartTime(format.format(merchandise.getStartTime()));
detailsVo.setEndTime(format.format(merchandise.getEndTime()));
@@ -163,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("全国通用");
@@ -195,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