Browse Source

fixed 会员等级判断

fushengqian 1 year ago
parent
commit
6f4b3a4e5d

+ 9 - 4
fuint-application/src/main/java/com/fuint/common/service/impl/UserGradeServiceImpl.java

@@ -16,6 +16,7 @@ import com.fuint.repository.model.MtBanner;
 import com.fuint.repository.model.MtStaff;
 import com.fuint.repository.model.MtStaff;
 import com.fuint.repository.model.MtUser;
 import com.fuint.repository.model.MtUser;
 import com.fuint.repository.model.MtUserGrade;
 import com.fuint.repository.model.MtUserGrade;
+import com.fuint.utils.StringUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
@@ -212,10 +213,14 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
         param.put("merchant_id", merchantId);
         param.put("merchant_id", merchantId);
         List<MtUserGrade> userGrades = mtUserGradeMapper.selectByMap(param);
         List<MtUserGrade> userGrades = mtUserGradeMapper.selectByMap(param);
         List<MtUserGrade> dataList = new ArrayList<>();
         List<MtUserGrade> dataList = new ArrayList<>();
-        if (userGrades.size() > 0 && userInfo != null) {
-            for (MtUserGrade grade : userGrades) {
-                if (!userInfo.getGradeId().equals(grade.getId().toString()) && (grade.getGrade() > Integer.parseInt(userInfo.getGradeId()))) {
-                    dataList.add(grade);
+        if (userGrades.size() > 0 && userInfo != null && StringUtil.isNotEmpty(userInfo.getGradeId())) {
+            MtUserGrade myGradeInfo = mtUserGradeMapper.selectById(userInfo.getGradeId());
+            if (myGradeInfo != null) {
+                Integer myGrade = myGradeInfo.getGrade();
+                for (MtUserGrade grade : userGrades) {
+                    if (!myGrade.equals(grade.getGrade().toString()) && (grade.getGrade() > myGrade)) {
+                        dataList.add(grade);
+                    }
                 }
                 }
             }
             }
         }
         }

+ 1 - 1
fuint-application/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 # \u57FA\u672C\u914D\u7F6E
 # \u57FA\u672C\u914D\u7F6E
 server.port=8080
 server.port=8080
 env.profile=dev
 env.profile=dev
-env.properties.path=C:/Code/fuint-public/fuintBackend/configure/
+env.properties.path=C:/Code/fuint/fuint-backend/configure/
 
 
 # \u6570\u636E\u5E93\u914D\u7F6E
 # \u6570\u636E\u5E93\u914D\u7F6E
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource