登录优化

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -294,9 +294,6 @@ public class LoginServiceImpl implements LoginService {
                 return ResponseJson.error(-3, "您的企业账号审核未通过", loginUser);
             }
         }
-        if (null != loginUser.getUserIdentity() && (2 == loginUser.getUserIdentity() || 4 == loginUser.getUserIdentity())) {
-            loginUpdateBeans(loginUser.getUserId());
-        }
         SuperVipDto end = findEnd(loginUser.getUserId());
         loginUser.setVipFlag(end.getVipFlag());
         if (1 == end.getVipFlag() && 4 == loginUser.getUserIdentity()) {
@@ -304,33 +301,40 @@ public class LoginServiceImpl implements LoginService {
             loginUser.setUserIdentity(2);
             loginUser.setUserPermission(2);
         }
-        //改user表登录时间
-        try {
-            log.info("登陆时间录入");
-            loginMapper.updateLogin(loginUser.getUserId());
-        } catch (Exception e) {
-            log.error("登录时间记录异常" + e);
-        }
+        // 登录赠送10采美豆
+        loginUpdateBeans(loginUser.getUserId(), loginUser.getUserIdentity());
+
         return ResponseJson.success("登录成功", loginUser);
     }
 
     @Async
-    void loginUpdateBeans(Integer userId) {
-        Integer id = clubMapper.findLoginBeans(userId);
-        if (id == null) {
-            //登录赠送10采美豆
-            UserVo user = baseMapper.getUserByUserId(userId);
-            UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
-            beansHistory.setUserId(user.getUserId());
-            beansHistory.setBeansType(12);
-            beansHistory.setType(1);
-            beansHistory.setNum(10);
-            beansHistory.setPushStatus(0);
-            beansHistory.setAddTime(new Date());
-            registerMapper.insertBeansHistory(beansHistory);
-            Integer userBeans = user.getUserBeans();
-            userBeans = userBeans == null ? 10 : userBeans + 10;
-            clubMapper.updateUserBeans(userId, userBeans);
+    void loginUpdateBeans(Integer userId, Integer identity) {
+        if (null != identity && (2 == identity || 4 == identity)){
+            // 查询今天是否有登录送豆
+            Integer id = clubMapper.findLoginBeans(userId);
+            if (id == null) {
+                //登录赠送10采美豆
+                UserVo user = baseMapper.getUserByUserId(userId);
+                UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
+                beansHistory.setUserId(user.getUserId());
+                beansHistory.setBeansType(12);
+                beansHistory.setType(1);
+                beansHistory.setNum(10);
+                beansHistory.setPushStatus(0);
+                beansHistory.setAddTime(new Date());
+                registerMapper.insertBeansHistory(beansHistory);
+                Integer userBeans = user.getUserBeans();
+                userBeans = userBeans == null ? 10 : userBeans + 10;
+                clubMapper.updateUserBeans(userId, userBeans);
+                log.info("【登录成功】-----每天初次登录赠送10采美豆，userId:" + userId);
+            }
+        }
+        //改user表登录时间
+        try {
+            log.info("【登录成功】-----登陆时间录入，userId:" + userId);
+            loginMapper.updateLogin(userId);
+        } catch (Exception e) {
+            log.error("登录时间记录异常" + e);
         }
     }