diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java index c657c2ac8..c472f59f0 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -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(); diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java index 4b2d6c1e2..ca1f109bc 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java @@ -30,6 +30,14 @@ public interface WxMerchantBUserService { * @return */ WxMerchantBUser getByToken(String token); + + /** + * 根据appId,phone获得实体 + * + * @param record + * @return + */ + WxMerchantBUser getBUserByAppId(WxMerchantBUser record); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java index 75851f985..73e0558aa 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java @@ -27,6 +27,11 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { return wxMerchantBUserMapper.selectByPrimaryKey(id); } + @Override + public WxMerchantBUser getBUserByAppId(WxMerchantBUser record) { + return wxMerchantBUserMapper.selectOne(record); + } + @Override public WxMerchantBUser getByToken(String token) { return wxMerchantBUserMapper.findByToken(token);