From 274ac0857d88bf72aabe9372dd4d2e1edca52ec4 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 26 七月 2023 14:37:36 +0800
Subject: [PATCH] 兑换商品详情字段增加
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/CoursePackageClient.java | 9 +++-
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java | 2
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 13 ++++++
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java | 17 ++++++++
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 10 +++++
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java | 16 ++++++++
6 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java
index c788428..a0b66ac 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java
@@ -17,6 +17,6 @@
* @param id
* @return
*/
- @PostMapping("/coursePackage/queryCoursePackageById")
+ @PostMapping("/base/coursePackage/queryCoursePackageById")
CoursePackage queryCoursePackageById(Integer id);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
index 237c23d..d644a90 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -42,4 +43,19 @@
@ApiModelProperty(value = "兑换说明")
private String contents;
+ @ApiModelProperty(value = "课包课时数")
+ private Integer classHours;
+
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "现金")
+ private BigDecimal cash;
+
+ @ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
+ private Integer goodType;
+
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
+ private Integer exchangeType;
+
}
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 caa6f0b..caaf629 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
@@ -327,6 +327,14 @@
UserPointsMerchandise byId = upmseService.getById(speMercharsId);
if (ToolUtil.isNotEmpty(byId)){
PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
+ detailsVo.setExchangeType(pmdsServiceById.getRedemptionMethod());
+ detailsVo.setGoodType(pmdsServiceById.getType());
+ if (pmdsServiceById.getRedemptionMethod() == 1){
+ detailsVo.setIntegral(pmdsServiceById.getIntegral());
+ }else {
+ detailsVo.setCash(pmdsServiceById.getCash());
+ detailsVo.setIntegral(pmdsServiceById.getIntegral());
+ }
detailsVo.setDetailsId(byId.getId());
switch (pmdsServiceById.getType()){
case 1:
@@ -349,6 +357,8 @@
List<String> list1 = Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ","));
list1.add(coursePackage.getCoverDrawing());
detailsVo.setPics(list1);
+ CoursePackagePaymentConfig coursePackagePaymentConfig = cpClient.queryConfigCoursePackData(pmdsServiceById.getCoursePackageConfigId());
+ detailsVo.setClassHours(coursePackagePaymentConfig.getClassHours());
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
if (s1.equals(coursePackage.getCoverDrawing())) {
return -1; // s1排在前面
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/CoursePackageClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/CoursePackageClient.java
index 9b1333e..698ac42 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/CoursePackageClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/CoursePackageClient.java
@@ -1,8 +1,10 @@
package com.dsh.activity.feignclient.course;
import com.dsh.activity.feignclient.course.model.CoursePackage;
+import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author zhibing.pu
@@ -17,6 +19,9 @@
* @param id
* @return
*/
- @PostMapping("/coursePackage/queryCoursePackageById")
- CoursePackage queryCoursePackageById(Integer id);
+ @PostMapping("/base/coursePackage/queryCoursePackageById")
+ CoursePackage queryCoursePackageById(@RequestBody Integer id);
+
+ @PostMapping("/base/coursePackage/queryConfigCoursePackData")
+ CoursePackagePaymentConfig queryConfigCoursePackData(@RequestBody Integer coursePackConfigId);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java
index 8bf0fac..9949082 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -42,4 +43,20 @@
@ApiModelProperty(value = "兑换说明")
private String contents;
+
+ @ApiModelProperty(value = "课包课时数")
+ private Integer classHours;
+
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "现金")
+ private BigDecimal cash;
+
+ @ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
+ private Integer goodType;
+
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
+ private Integer exchangeType;
+
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
index f8fe08d..9f060b1 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
@@ -60,7 +60,7 @@
* @return
*/
@ResponseBody
- @PostMapping("/coursePackage/queryCoursePackageById")
+ @PostMapping("/base/coursePackage/queryCoursePackageById")
public TCoursePackage queryCoursePackageById(@RequestBody Integer id){
try {
TCoursePackage coursePackage = coursePackageService.getById(id);
@@ -152,4 +152,15 @@
return courseVoList;
}
+ /**
+ * 根据id获取课包
+ * @param coursePackConfigId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/base/coursePackage/queryConfigCoursePackData")
+ public CoursePackagePaymentConfig queryConfigCoursePackData(@RequestBody Integer coursePackConfigId){
+ return icppconfigService.getById(coursePackConfigId);
+ }
+
}
--
Gitblit v1.7.1