| @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxMerchant; | |||||
| import com.iformall.domain.po.WxMerchantBUser; | import com.iformall.domain.po.WxMerchantBUser; | ||||
| import com.iformall.enums.EnumMerchantBUserStatus; | import com.iformall.enums.EnumMerchantBUserStatus; | ||||
| import com.iformall.enums.EnumMerchantStatus; | import com.iformall.enums.EnumMerchantStatus; | ||||
| import com.iformall.interceptor.AuthorizationInterceptor; | |||||
| import com.iformall.service.WxMallService; | import com.iformall.service.WxMallService; | ||||
| import com.iformall.service.WxMerchantBUserService; | import com.iformall.service.WxMerchantBUserService; | ||||
| import com.iformall.service.WxMerchantService; | import com.iformall.service.WxMerchantService; | ||||
| @@ -148,6 +149,9 @@ public class WxMerchantBUserController extends BaseController { | |||||
| if (user1.getBUserPwd().equalsIgnoreCase(password)) { | if (user1.getBUserPwd().equalsIgnoreCase(password)) { | ||||
| user1.createToken(currentDate); | user1.createToken(currentDate); | ||||
| token = user1.getToken(); | token = user1.getToken(); | ||||
| resultMap.put("token", token); | |||||
| request.setAttribute(AuthorizationInterceptor.LOGIN_USER_KEY, user1.getId()); | |||||
| request.setAttribute(AuthorizationInterceptor.TENANT_ID, user1.getTenantId()); | |||||
| try { | try { | ||||
| wxMerchantBUserService.saveOrUpdate(user1); | wxMerchantBUserService.saveOrUpdate(user1); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -155,7 +159,7 @@ public class WxMerchantBUserController extends BaseController { | |||||
| return new ResultData(ErrorCode.DB_FAIL.getCode(), "数据库保存失败,e:" + e.getMessage()); | return new ResultData(ErrorCode.DB_FAIL.getCode(), "数据库保存失败,e:" + e.getMessage()); | ||||
| } | } | ||||
| resultMap.put("token", token); | |||||
| return new ResultData(resultMap); | return new ResultData(resultMap); | ||||
| } else { | } else { | ||||
| return new ResultData(ErrorCode.PASSWORD_ERROR); | return new ResultData(ErrorCode.PASSWORD_ERROR); | ||||