Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/APPPartnerController.java

@@ -213,7 +213,7 @@ public class APPPartnerController extends BaseController {
             return sysPartnerService.loginAlipay(alipayBindVo);
         } catch (AlipayApiException e) {
             log.info(e.getMessage());
-            throw new SystemException("支付宝授权失败");
+            throw new SystemException("支付宝登录失败");
         }
     }
 
@@ -262,7 +262,7 @@ public class APPPartnerController extends BaseController {
             return sysPartnerService.loginWechat(wechatLoginVo);
         } catch (WxErrorException e) {
             log.info(e.getMessage());
-            throw new SystemException("微信授权失败");
+            throw new SystemException("微信登录失败");
         }
     }
 
@@ -281,7 +281,7 @@ public class APPPartnerController extends BaseController {
             return sysPartnerService.bindWechat(wechatBindVo, userId);
         } catch (WxErrorException e) {
             log.info(e.getMessage());
-            throw new SystemException("微信授权失败");
+            throw new SystemException("微信绑定失败");
         }
     }
 

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -311,6 +311,7 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/updatePartnerPwd")
     @ApiOperation(value = "合伙人密码修改")
     public HttpResult updatePartnerPwd(@RequestParam String id, @RequestParam String password, @RequestParam String oldPassword) {
+        log.info("修改密码参数：userId:{}, 新密码:{},旧密码:{}",id,password,oldPassword);
         if (StringUtils.isEmpty(id) || StringUtils.isEmpty(password)) {
             return HttpResult.error("ID和密码不能为空");
         }
@@ -373,6 +374,7 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/updatePartnerMobile")
     @ApiOperation(value = "合伙人手机号更新")
     public HttpResult updatePartnerMobile(@RequestParam String id, @RequestParam String mobile) {
+        log.info("手机号参数：userId:{}, 新手机号:{}",id,mobile);
         if (StringUtils.isEmpty(id) || StringUtils.isEmpty(mobile)) {
             return HttpResult.error("ID和手机号不能为空");
         }
@@ -380,13 +382,16 @@ public class SysUserController extends BaseController {
         if (sysUser == null) {
             return HttpResult.error("ID不存在");
         }
+        if (sysUser.getMobile().equals(mobile)) {
+            return HttpResult.error("新手机号不能与已绑定手机号相同");
+        }
 
         LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
         lqw.ne(SysUser::getId, id);
         lqw.eq(SysUser::getMobile, mobile);
 
         List<SysUser> users = sysUserService.list(lqw);
-        if (users != null && !users.isEmpty()) {
+        if (!CollectionUtils.isEmpty(users)) {
             return HttpResult.error("手机号已存在");
         }