|
|
|
@@ -73,16 +73,20 @@ public class WxMerchantBUserController extends BaseController |
|
|
|
WxMerchantBUser user = new WxMerchantBUser(); |
|
|
|
user.setAppId(appId); |
|
|
|
user.setPhone(phone); |
|
|
|
user.setBUserPwd(password); |
|
|
|
|
|
|
|
try { |
|
|
|
WxMerchantBUser user1 = wxMerchantBUserService.getById(user.getId()); |
|
|
|
WxMerchantBUser user1 = wxMerchantBUserService.getBUserByAppId(user); |
|
|
|
if (user1 != null) { |
|
|
|
user1.createToken(new Date()); |
|
|
|
token = user1.getToken(); |
|
|
|
wxMerchantBUserService.saveOrUpdate(user1); |
|
|
|
resultMap.put("token", token); |
|
|
|
if (user1.getBUserPwd() == password) { |
|
|
|
user1.createToken(new Date()); |
|
|
|
token = user1.getToken(); |
|
|
|
wxMerchantBUserService.saveOrUpdate(user1); |
|
|
|
resultMap.put("token", token); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.PASSWORD_ERROR); |
|
|
|
} |
|
|
|
} else { |
|
|
|
user.setBUserPwd(password); |
|
|
|
user.createToken(new Date()); |
|
|
|
token = user.getToken(); |
|
|
|
|
|
|
|
|