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-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 23 +++++++++++
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java | 31 +++++++++++++++
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java | 5 --
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 18 +++++++-
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java | 4 +-
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java | 4 +-
6 files changed, 73 insertions(+), 12 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index dddad52..c7cc931 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -320,6 +320,29 @@
}
+ /**
+ * 兑换记录
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/exchangeRecords")
+ @ApiOperation(value = "积分商城-兑换记录", tags = {"APP-使用福利"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "使用状态 （1已使用 2未使用）", name = "useType", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodType", required = true, dataType = "int"),
+ })
+ public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType){
+ try {
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
+ if(null == userIdFormRedis){
+ return ResultUtil.tokenErr();
+ }// TODO: 2023/7/12 查询兑换记录
+ return ResultUtil.success();
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
new file mode 100644
index 0000000..baec733
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
@@ -0,0 +1,31 @@
+package com.dsh.account.model.vo.userBenefitDetail;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ExchangeDetailsResponse {
+
+ @ApiModelProperty(value = "记录id")
+ private Integer detailsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodName;
+
+ @ApiModelProperty(value = "支付类型（积分 / 积分+现金）")
+ private String requiredType;
+
+ @ApiModelProperty(value = "有效期开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "有效期结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "使用状态 （1已使用 2未使用）")
+ private Integer useStatus;
+
+ @ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
+ private Integer goodType;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
index 9823330..52e811f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
@@ -31,8 +31,8 @@
@ApiModelProperty(value = "每人限额")
private Integer perLimit;
- @ApiModelProperty(value = "积分")
- private Integer integral;
+ @ApiModelProperty(value = "所需类型（积分/积分+现金）")
+ private String requiredType;
@ApiModelProperty(value = "价值")
private BigDecimal cost;
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){
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
index 22f0842..134991f 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
@@ -44,11 +44,6 @@
@TableField("userId")
private Integer userId;
/**
- * 状态（1=待核销，2=已核销）
- */
- @TableField("status")
- private Integer status;
- /**
* 核销人员id
*/
@TableField("verificationUserId")
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java
index cd5cfef..db38c2a 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java
@@ -31,8 +31,8 @@
@ApiModelProperty(value = "每人限额")
private Integer perLimit;
- @ApiModelProperty(value = "积分")
- private Integer integral;
+ @ApiModelProperty(value = "所需类型（积分/积分+现金）")
+ private String requiredType;
@ApiModelProperty(value = "价值")
private BigDecimal cost;
--
Gitblit v1.7.1