From 7128d05a28bc673ebea37245140a05bf145aecaa Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sun, 16 Feb 2025 16:38:44 +0800 Subject: [PATCH] source type and rebind mobile --- .../controller/CustInfoController.java | 8 ++++--- .../core/customer/dto/CustBindMobileDTO.java | 24 +++++++++++++++++++ .../customer/service/CustInfoService.java | 2 +- .../service/impl/CustInfoServiceImpl.java | 13 ++++++---- 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/CustBindMobileDTO.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustInfoController.java index 7f695c15..b8a60fa8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/controller/CustInfoController.java @@ -3,6 +3,7 @@ package com.bonus.core.customer.controller; import com.bonus.core.common.base.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.constant.SourceTypeEnum; +import com.bonus.core.customer.dto.CustBindMobileDTO; import com.bonus.core.customer.dto.CustQueryDTO; import com.bonus.core.customer.vo.CustInfoVo; import com.bonus.domain.CustInfo; @@ -49,7 +50,7 @@ public class CustInfoController extends BaseController { //content.setNewPassword(AesEncryptUtil.aesDecode(content.getNewPassword())); AjaxResult ajaxResult = new AjaxResult(); try { - ajaxResult = this.custInfoService.rebindMobile(content); + ajaxResult = this.custInfoService.custForgetPassword(content); return ajaxResult; } catch (Exception e) { log.error("忘记密码异常", e); @@ -59,10 +60,11 @@ public class CustInfoController extends BaseController { @ApiOperation("重新绑定手机号") @PostMapping({"/rebind/mobile"}) - public AjaxResult rebindMobile(@Validated @RequestBody CustForgetPasswordDTO content) { + public AjaxResult rebindMobile(@RequestHeader Map headers, @Validated @RequestBody CustBindMobileDTO content) { AjaxResult ajaxResult = new AjaxResult(); try { - ajaxResult = this.custInfoService.custForgetPassword(content); + Integer sourceType = this.getSourceTypeByHeaders(headers); + ajaxResult = this.custInfoService.rebindMobile(content, sourceType); return ajaxResult; } catch (Exception e) { log.error("忘记密码异常", e); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/CustBindMobileDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/CustBindMobileDTO.java new file mode 100644 index 00000000..c3c2d48f --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/CustBindMobileDTO.java @@ -0,0 +1,24 @@ +package com.bonus.core.customer.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@ApiModel("小程序绑定新手机号") +@Data +public class CustBindMobileDTO implements Serializable { + @ApiModelProperty("mobile") + private @NotBlank( + message = "手机号不能为空" + ) String mobile; + + @ApiModelProperty("newMobile") + private @NotBlank( + message = "手机号不能为空" +) String newMobile; + + @ApiModelProperty("验证码") + private String code; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustInfoService.java index 293e63cb..f9aa2731 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustInfoService.java @@ -26,7 +26,7 @@ public interface CustInfoService extends IService { AjaxResult custForgetPassword(CustForgetPasswordDTO content); - AjaxResult rebindMobile(CustForgetPasswordDTO content); + AjaxResult rebindMobile(CustBindMobileDTO content, Integer sourceType); String getOrderQRCode(Integer sourceType, String paramValue); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoServiceImpl.java index 49175dca..5950302a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoServiceImpl.java @@ -253,7 +253,6 @@ public class CustInfoServiceImpl extends ServiceImpl i @Override public AjaxResult custForgetPassword(CustForgetPasswordDTO content) { -// content.setMobile(AesEncryptUtil.aesDecode(content.getMobile())); AjaxResult ajaxResult = new AjaxResult(); content.setNewPassword(AesEncryptUtil.aesDecode(content.getNewPassword())); SmsCodeVerifyDTO smsCodeVerifyDTO = new SmsCodeVerifyDTO(); @@ -286,11 +285,10 @@ public class CustInfoServiceImpl extends ServiceImpl i } @Override - public AjaxResult rebindMobile(CustForgetPasswordDTO content) { + public AjaxResult rebindMobile(CustBindMobileDTO content, Integer sourceType) { AjaxResult ajaxResult = new AjaxResult(); - content.setNewPassword(AesEncryptUtil.aesDecode(content.getNewPassword())); SmsCodeVerifyDTO smsCodeVerifyDTO = new SmsCodeVerifyDTO(); - smsCodeVerifyDTO.setTelephoneNumber(content.getMobile()); + smsCodeVerifyDTO.setTelephoneNumber(content.getNewMobile()); smsCodeVerifyDTO.setCode(content.getCode()); if (!verifySmsCode(smsCodeVerifyDTO, CacheConstants.VERIFICATION_CODE)) { ajaxResult.put("msg", "验证码异常"); @@ -304,8 +302,13 @@ public class CustInfoServiceImpl extends ServiceImpl i ajaxResult.put("msg", "修改密码错误：人员不存在"); ajaxResult.put("code", "500"); } else { - custInfo.setPwd(SM4EncryptUtils.sm4Encryptbyconfig(content.getMobile())); + custInfo.setMobile(SM4EncryptUtils.sm4Encryptbyconfig(content.getNewMobile())); custInfoMapper.updateById(custInfo); + CustCasual custCasual = this.custInfoMapper.selectCustCasualByCustId(custInfo.getCustId(), sourceType, DelFlagEnum.DEL_FALSE.key()); + if (Objects.nonNull(custCasual)) { + custCasual.setMobile(content.getNewMobile()); + this.custInfoMapper.updateCustCasual(custCasual); + } ajaxResult.put("msg", "修改成功"); ajaxResult.put("code", "200"); }