qrs 1 ماه پیش
والد
کامیت
d595716eb2

+ 5 - 5
alien-second/src/main/java/shop/alien/second/service/impl/SecondUserCreditServiceImpl.java

@@ -171,13 +171,13 @@ public class SecondUserCreditServiceImpl extends ServiceImpl<SecondUserCreditMap
             SecondUserCredit secondUserCredit = secondUserCreditMapper.selectOne(queryWrapper);
 
             JSONObject jsonObject = new JSONObject();
-            if (secondUserCredit == null || secondUserCredit.getFreezeTime() == null || secondUserCredit.getUserPoints() < 500) {
-                jsonObject.put("flag", false);
-                jsonObject.put("msg", "信用分不足无法使用该功能");
-            } else if (secondUserCredit.getFreezeTime().after(new Date())) {
+            if (secondUserCredit == null || secondUserCredit.getFreezeTime().after(new Date())) {
                 jsonObject.put("flag", false);
                 jsonObject.put("msg", "无法使用该功能");
-            } else {
+            } else if (secondUserCredit.getFreezeTime() == null || secondUserCredit.getUserPoints() < 500) {
+                jsonObject.put("flag", false);
+                jsonObject.put("msg", "信用分不足无法使用该功能");
+            } else  {
                 jsonObject.put("flag", true);
             }
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserService.java

@@ -392,7 +392,7 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
                     String detailInfo = lsit.stream()
                             .map(row -> row.getUserId().toString())
                             .collect(Collectors.joining(","));
-                    alienSecondFeign.recordRiskControlData(null, 2, "账号异常", macIp, detailInfo);
+                    alienSecondFeign.recordRiskControlData(user.getId(), 2, "账号异常", macIp, detailInfo);
                 }
             }
             // 第一次登录,添加用户基础积分