From 3492885ff28bbe10b390ed6b1466901b969eb433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Tue, 5 Mar 2024 09:20:04 +0800
Subject: [PATCH] bug

---
 .../entity/ActiveOneCoupon.java                |  4 ++++
 .../impl/ActiveOneCouponServiceImpl.java       |  9 +++++----
 .../repository/mapper/MtUserGradeMapper.java   |  3 +++
 .../fuint/repository/model/MtUserGrade.java    |  4 ++--
 .../fuint/repository/model/MtUserGradeVO.java  | 18 ++++++++++++++++++
 .../resources/mapper/MtUserGradeMapper.xml     |  3 +++
 6 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGradeVO.java

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCoupon.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCoupon.java
index 1c2e22444..e5323c305 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCoupon.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCoupon.java
@@ -1,6 +1,9 @@
 package com.fuint.business.marketingActivity.activeOneCoupon.entity;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 
@@ -16,6 +19,7 @@ import java.io.Serializable;
 @Data
 public class ActiveOneCoupon extends Model<ActiveOneCoupon> {
     //主键id
+    @TableId(type = IdType.AUTO)
     private Integer id;
     private Integer storeId;
     private String activeName;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
index be3b54008..d83b50c42 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
@@ -28,6 +28,7 @@ import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.repository.mapper.MtUserGradeMapper;
 import com.fuint.repository.model.MtUserGrade;
+import com.fuint.repository.model.MtUserGradeVO;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -73,11 +74,11 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
         String gradeIdStr = "";
         String gradeIdName = "";
         Integer[] gradeIds = activeOneCouponDTO.getGradeIds();
-       /* for (Integer gradeId : gradeIds) {
+        for (Integer gradeId : gradeIds) {
             gradeIdStr+=gradeId + ",";
-            MtUserGrade mtUserGrade = mtUserGradeMapper.selectById(gradeId);
+            MtUserGradeVO mtUserGrade = mtUserGradeMapper.selectByGradeId(gradeId);
             gradeIdName +=  mtUserGrade.getName() + ",";
-        }*/
+        }
         activeOneCoupon.setGradeId(gradeIdStr);
         activeOneCoupon.setGradeName(gradeIdName);
         activeOneCoupon.setStoreId(nowAccountInfo.getStoreId());
@@ -129,7 +130,7 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
             String[] gradeId = gradeIds.split(",");
             for (String s : gradeId) {
                 LJUserVos ljUserVos = new LJUserVos();
-                MtUserGrade mtUserGrade = mtUserGradeMapper.selectById(s);
+                MtUserGradeVO mtUserGrade = mtUserGradeMapper.selectByGradeId(Integer.parseInt(s));
                 ljUserVos.setGradeName(mtUserGrade.getName());
                 LJUserVo ljUserVo = new LJUserVo();
                 ljUserVo.setGradeId(Integer.parseInt(s));
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserGradeMapper.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserGradeMapper.java
index 86849a492..087f34466 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserGradeMapper.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserGradeMapper.java
@@ -2,6 +2,7 @@ package com.fuint.repository.mapper;
 
 import com.fuint.repository.model.MtUserGrade;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fuint.repository.model.MtUserGradeVO;
 
 /**
  *  Mapper 接口
@@ -10,5 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * CopyRight https://www.fuint.cn
  */
 public interface MtUserGradeMapper extends BaseMapper<MtUserGrade> {
+
+    MtUserGradeVO selectByGradeId(Integer gradeId);
    // empty
 }
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java
index e5114ba46..ea4daeecf 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java
@@ -38,9 +38,9 @@ public class MtUserGrade implements Serializable {
     @ApiModelProperty("等级名称")
     private String name;
 
-//    @ApiModelProperty("升级会员等级条件描述")
+/*//    @ApiModelProperty("升级会员等级条件描述")
 //    private String catchCondition;
-
+*/
     @ApiModelProperty("升级会员等级条件，init:默认获取;pay:付费升级；frequency:消费次数；amount:累积消费金额升级")
     @TableField(exist = false)
     private String catchType;
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGradeVO.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGradeVO.java
new file mode 100644
index 000000000..9d9abf204
--- /dev/null
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGradeVO.java
@@ -0,0 +1,18 @@
+package com.fuint.repository.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MtUserGradeVO {
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("等级")
+    private Integer grade;
+
+    @ApiModelProperty("等级名称")
+    private String name;
+}
diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserGradeMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserGradeMapper.xml
index ace48db9e..272a4983f 100644
--- a/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserGradeMapper.xml
+++ b/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserGradeMapper.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuint.repository.mapper.MtUserGradeMapper">
 
+    <select id="selectByGradeId" resultType="com.fuint.repository.model.MtUserGradeVO">
+        select id,grade,name from mt_user_grade where grade_id = #{gradeId}
+    </select>
 </mapper>