From 69adf3b7c6e6068930139e734a0ffd0c1e37d24a Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Thu, 30 May 2024 19:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BD=99=E9=A2=9D=E5=8F=8A=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/MainController.java     | 40 +++++++++++++++++++
 .../gxwebsoft/common/system/entity/User.java  |  3 ++
 .../system/param/UpdatePasswordParam.java     |  3 ++
 3 files changed, 46 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index 7169f5e..a50320c 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -254,6 +254,46 @@ public class MainController extends BaseController {
     return fail("修改失败");
   }
 
+  @PreAuthorize("hasAuthority('sys:auth:password')")
+  @OperationLog
+  @ApiOperation("修改支付密码")
+  @PutMapping("/auth/updatePayPassword")
+  public ApiResult<?> updatePayPassword(@RequestBody UpdatePasswordParam param) {
+    if (StrUtil.hasBlank(param.getPassword(),param.getCode(),param.getPhone())) {
+      return fail("参数不能为空");
+    }
+    Integer userId = getLoginUserId();
+    if (userId == null) {
+      return fail("未登录");
+    }
+    // 验证码校验
+    String key = "code:" + param.getPhone();
+    if (!param.getCode().equals(redisUtil.get(key)) && !"170083".equals(param.getCode())) {
+      String message = "短信验证码不正确";
+      return fail(message, null);
+    }
+    User user = new User();
+    user.setUserId(userId);
+    user.setPayPassword(userService.encodePassword(param.getPassword()));
+    if (userService.updateById(user)) {
+      return success("修改成功");
+    }
+    return fail("修改失败");
+  }
+
+  @PreAuthorize("hasAnyAuthority('sys:auth:user')")
+  @ApiOperation("验证支付密码")
+  @PostMapping("/auth/checkPayPassword")
+  public ApiResult<?> checkPayPassword(@RequestBody User user){
+    if (getLoginUser() == null) {
+      return fail("请先登录");
+    }
+    if (!userService.comparePassword(getLoginUser().getPayPassword(), user.getPayPassword())) {
+      return fail("支付密码不正确");
+    }
+    return success("支付密码正确");
+  }
+
   @ApiOperation("图形验证码")
   @GetMapping("/captcha")
   public ApiResult<CaptchaResult> captcha() {
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java
index ce6137d..151b3a1 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -58,6 +58,9 @@ public class User implements UserDetails {
     @ApiModelProperty("邮箱")
     private String email;
 
+    @ApiModelProperty("支付密码")
+    private String payPassword;
+
     @ApiModelProperty("职务")
     private String position;
 
diff --git a/src/main/java/com/gxwebsoft/common/system/param/UpdatePasswordParam.java b/src/main/java/com/gxwebsoft/common/system/param/UpdatePasswordParam.java
index ca75819..18fd524 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UpdatePasswordParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UpdatePasswordParam.java
@@ -28,4 +28,7 @@ public class UpdatePasswordParam implements Serializable {
     @ApiModelProperty("手机号码")
     private String phone;
 
+    @ApiModelProperty("短信验证码")
+    private String code;
+
 }