From a91463ee1c2bf2ef932bd1c5c061b225b2c83b77 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 17:11:19 +0800
Subject: [PATCH] 修改积分变动记录的实体类，增加变动类型字段
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 10 ++--------
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 2 +-
cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java | 10 +++++++---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/GoodsExchangeVo.java | 33 +++++++++++++++++++++++++++++++++
4 files changed, 43 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 d6606e0..d57b5fe 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
@@ -360,20 +360,14 @@
@ApiOperation(value = "积分商城-商品兑换", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "商品id", name = "goodId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodsType", required = true, dataType = "int"),
- @ApiImplicitParam(value = "兑换数量", name = "nums", required = false, dataType = "int"),
- @ApiImplicitParam(value = "兑换方式(1=积分，2=积分+现金)", name = "exchangeType", required = true, dataType = "int"),
- @ApiImplicitParam(value = "现金支付方式(1=微信 2=支付宝)", name = "payType", required = false, dataType = "int"),
- @ApiImplicitParam(value = "学员id列表", name = "stuIds", required = false),
})
- public ResultUtil productRedemptionOperation(Integer goodId, Integer goodsType,Integer nums,Integer exchangeType,Integer payType,List<Integer> stuIds){
+ public ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return tauService.productRedemptionOperation(userIdFormRedis,goodId,goodsType,nums,exchangeType,payType,stuIds);
+ return tauService.productRedemptionOperation(userIdFormRedis,exchangeType.getGoodId(),exchangeType.getGoodsType(),exchangeType.getNums(),exchangeType.getExchangeType(),exchangeType.getPayType(),exchangeType.getStuIds());
}catch (Exception e){
return ResultUtil.runErr();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java b/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java
index 305748a..6e91161 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java
@@ -32,8 +32,8 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 用户id
*/
@@ -64,7 +64,11 @@
*/
@TableField("insertTime")
private Date insertTime;
-
+ /**
+ * 变动类型（1增加 2扣除）
+ */
+ @TableField("category")
+ private Integer category;
@Override
protected Serializable pkVal() {
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/GoodsExchangeVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/GoodsExchangeVo.java
new file mode 100644
index 0000000..42f36f3
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/GoodsExchangeVo.java
@@ -0,0 +1,33 @@
+package com.dsh.account.model.vo.userBenefitDetail;
+
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GoodsExchangeVo {
+ @ApiModelProperty(value = "商品id",required = true)
+ Integer goodId;
+
+ @ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券",required = true)
+ Integer goodsType;
+
+ @ApiModelProperty(value = "兑换数量",required = false)
+ Integer nums;
+
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=现金)",required = true)
+ Integer exchangeType;
+
+ @ApiModelProperty(value = "现金支付方式(1=微信 2=支付宝)",required = false)
+ Integer payType;
+
+ @ApiModelProperty(value = "学员id列表",required = false)
+ List<Integer> stuIds;
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 79f5e44..7406b63 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -882,7 +882,7 @@
this.baseMapper.updateById(tAppUser);
// 现金支付
- if (exchangeType == 2) {
+ if (exchangeType == 2 || exchangeType == 3) {
switch (goodsType) {
case 2:
for (int i = 0; i < stuIds.size(); i++) {
--
Gitblit v1.7.1