分享记录调整

Administrator

2018-12-14 ac8305149dfab881c6668d0ee043b98b1d4dc3b8

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java

@@ -9,6 +9,7 @@


import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;



import com.alipay.api.AlipayApiException;

import com.yeshi.fanli.entity.accept.AcceptData;

@@ -29,7 +30,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

@@ -49,13 +49,11 @@
import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.WxDownService;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;



@@ -118,12 +116,7 @@
   private AccountMessageService accountMessageService;



   @Resource

   private CollectionGoodsService collectionGoodsService;

   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

   private WxDownService wxDownService;



   @Resource

   private UserAccountService userAccountService;

@@ -161,7 +154,7 @@
    */

   @RequestMapping(value = "login")

   public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,

         String tbOpenid, String tbNickName, String tbPortrait, int loginType, Boolean first, HttpSession session,

         String tbOpenid, String tbNickName, String tbPortrait, int loginType, Boolean first, HttpSession session,HttpServletRequest request,

         PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

@@ -185,7 +178,7 @@
      tbUserInfo.setTbName(tbNickName);

      tbUserInfo.setTbPic(tbPortrait);

      try {

         LoginResult result = userAccountService.login(session, first, system.getAppid(), code, phone, tbUserInfo,

         LoginResult result = userAccountService.login(request, first, system.getAppid(), code, phone, tbUserInfo,

               wxinstall, loginType);

         if (result == null)

            LogHelper.error("login-result为空值");