Merge remote-tracking branch 'origin/developerA' into developerC

# Conflicts:
#	src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

src/main/java/com/caimei365/user/UserApplication.java

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 
 /**
@@ -13,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author : Charles
  * @date : 2021/2/22
  */
-
+@EnableAsync
 @EnableDiscoveryClient
 @SpringBootApplication
 @EnableFeignClients(basePackages = {"com.caimei365.user.feign"})

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

@@ -0,0 +1,66 @@
+package com.caimei365.user.service.impl;
+
+import com.caimei365.user.mapper.*;
+import com.caimei365.user.model.po.UserBeansHistoryPo;
+import com.caimei365.user.model.vo.UserVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 异步方法 @Async
+ * 类中需要使用@Autowired或@Resource等注解自动注入，不能自己手动new对象
+ * 在启动类中增加@EnableAsync注解
+ * 在Async 方法上标注@Transactional是没用的。 在Async 方法调用的方法上标注@Transactional 有效。
+ * 调用被@Async标记的方法的调用者不能和被调用的方法在同一类中不然不会起作用！！！！！！！
+ * 使用@Async时要求是不能有返回值
+ * @author : Charles
+ * @date : 2021/11/12
+ */
+@Slf4j
+@Component
+public class AsyncService {
+    @Resource
+    private LoginMapper loginMapper;
+    @Resource
+    private RegisterMapper registerMapper;
+    @Resource
+    private ClubMapper clubMapper;
+    @Resource
+    private BaseMapper baseMapper;
+
+    @Async
+    public void loginUpdateBeans(Integer userId, Integer identity) {
+        boolean isClub = null != identity && (2 == identity || 4 == identity);
+        if (isClub){
+            // 查询今天是否有登录送豆
+            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 {
+            loginMapper.updateLogin(userId);
+            log.info("【登录】-----登陆时间录入，userId:" + userId);
+        } catch (Exception e) {
+            log.error("【登录】--登录时间记录异常" + e);
+        }
+    }
+}

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

@@ -5,7 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.caimei365.user.components.CommonService;
 import com.caimei365.user.components.RedisService;
 import com.caimei365.user.components.WeChatService;
-import com.caimei365.user.mapper.*;
+import com.caimei365.user.mapper.LoginMapper;
+import com.caimei365.user.mapper.OperationMapper;
+import com.caimei365.user.mapper.RegisterMapper;
+import com.caimei365.user.mapper.SuperVipMapper;
 import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.dto.AuthBindDto;
 import com.caimei365.user.model.dto.LoginPasswordDto;
@@ -13,9 +16,7 @@ import com.caimei365.user.model.dto.ScanBindDto;
 import com.caimei365.user.model.dto.SuperVipDto;
 import com.caimei365.user.model.po.OperationPo;
 import com.caimei365.user.model.po.SuperVipPo;
-import com.caimei365.user.model.po.UserBeansHistoryPo;
 import com.caimei365.user.model.vo.UserLoginVo;
-import com.caimei365.user.model.vo.UserVo;
 import com.caimei365.user.service.LoginService;
 import com.caimei365.user.utils.JwtUtil;
 import com.caimei365.user.utils.Md5Util;
@@ -53,9 +54,7 @@ public class LoginServiceImpl implements LoginService {
     @Resource
     private OperationMapper operationMapper;
     @Resource
-    private ClubMapper clubMapper;
-    @Resource
-    private BaseMapper baseMapper;
+    private AsyncService asyncService;
 
     /**
      * 小程序邀请码过期天数
@@ -293,44 +292,22 @@ public class LoginServiceImpl implements LoginService {
                 return ResponseJson.error(-3, "您的企业账号审核未通过", loginUser);
             }
         }
-        if (null != loginUser.getUserIdentity() && (2 == loginUser.getUserIdentity() || 4 == loginUser.getUserIdentity())) {
-            Integer id = clubMapper.findLoginBeans(loginUser.getUserId());
-            if (id == null) {
-                //登录赠送10采美豆
-                UserVo user = baseMapper.getUserByUserId(loginUser.getUserId());
-                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(loginUser.getUserId(), userBeans);
-            }
-            // 会员机构类型：1医美，2生
-            if (loginUser.getUserIdentity() == 2) {
-                Integer clubType = loginMapper.getClubTypeById(loginUser.getUserId());
-                loginUser.setFirstClubType(clubType);
-            }
-            // 机构超级会员
-            SuperVipDto end = findEnd(loginUser.getUserId());
-            loginUser.setVipFlag(end.getVipFlag());
-            if (1 == loginUser.getVipFlag() && 4 == loginUser.getUserIdentity()) {
-                // 个人超级会员权限置为会员机构
-                loginUser.setUserIdentity(2);
-                loginUser.setUserPermission(2);
-            }
-        }
-        // 改user表登录时间
-        try {
-            log.info("登陆时间录入");
-            loginMapper.updateLogin(loginUser.getUserId());
-        } catch (Exception e) {
-            log.error("登录时间记录异常" + e);
-        }
+        // 会员机构类型：1医美，2生
+        if (null != loginUser.getUserIdentity() && loginUser.getUserIdentity() == 2) {
+            Integer clubType = loginMapper.getClubTypeById(loginUser.getUserId());
+            loginUser.setFirstClubType(clubType);
+        }
+        // 超级会员
+        SuperVipDto end = findEnd(loginUser.getUserId());
+        loginUser.setVipFlag(end.getVipFlag());
+        if (1 == end.getVipFlag() && 4 == loginUser.getUserIdentity()) {
+            // 个人超级会员权限置为会员机构
+            loginUser.setUserIdentity(2);
+            loginUser.setUserPermission(2);
+        }
+        // 登录异步赠送10采美豆
+        asyncService.loginUpdateBeans(loginUser.getUserId(), loginUser.getUserIdentity());
+        log.info("【登录】-----登录成功，userId:" + loginUser.getUserId());
         return ResponseJson.success("登录成功", loginUser);
     }