Merge branch 'wei_master' into '105'

update

See merge request !29

src/main/java/com/server/web/common/service/Impl/UserServiceImpl.java

@@ -100,6 +100,8 @@ public class UserServiceImpl implements UserService {
         tKzyUserMapper.updateByPrimaryKeySelective(loginUser);
         tKzyUserIntegralFlowingMapper.insertSelective(tKzyUserIntegralFlowing);
 
+
+
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("integral", integral);
         dataMap.put("signInCount", loginUser.getSignInCount());

src/main/java/com/server/web/controller/UserController.java

@@ -35,9 +35,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/userData", method = {RequestMethod.POST, RequestMethod.GET}, produces = "application/json")
     public Map userData(HttpServletRequest request) {
         TKzyUser loginUser = getLoginUser(request);
-        if (loginUser != null && loginUser.getId() != null) {
-            loginUser = tKzyUserMapper.selectByPrimaryKey(loginUser.getId());
-        }
+
         return returnSuccess(loginUser);
     }
 
@@ -234,6 +232,11 @@ public class UserController extends BaseController {
         if (loginUser == null || loginUser.getId() == null) {
             return ResultMapUtil.returnMap("0", "请先登录!", null);
         }
+        if (loginUser != null && loginUser.getId() != null) {
+            loginUser = tKzyUserMapper.selectByPrimaryKey(loginUser.getId());
+        }
+        //更新缓存用户信息(主要积分金额)
+        request.getSession().setAttribute(WX_USER_SESSION_KEY, loginUser);
         return userService.signIn(loginUser);
     }