mitao
2024-04-29 151d70eba459a86218a18c679adafa0a865d3a98
修改用户密码登录、忘记密码提示语
3个文件已修改
18 ■■■■ 已修改文件
meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
meiya-rest/src/main/java/com/sinata/rest/modular/member/service/impl/MemUserServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
meiya-rest/src/main/java/com/sinata/rest/modular/system/controller/SmsController.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
@@ -234,7 +234,7 @@
        wrapper.eq(MemUser::getPhone, phone);
        MemUser user = userService.getOne(wrapper);
        if (user == null) {
            return ApiUtils.returnNG(null, "帐号或密码错误");
            return ApiUtils.returnNG(null, "手机号不存在,请注册");
        }
        if (1 == user.getIsLock()) {
            return ApiUtils.returnNG(null, "您帐号已被锁定");
meiya-rest/src/main/java/com/sinata/rest/modular/member/service/impl/MemUserServiceImpl.java
@@ -373,6 +373,7 @@
    @Override
    @Transactional
    public ApiUtils applySaleUser(BodyApplySaleUser body) {
        log.info("推荐他人入司,入参:{}", body);
        MallOrder mallOrder = mallOrderService.getById(body.getOrderNo());
        log.info("推荐他人入司,订单:{}", mallOrder);
        if (mallOrder == null || mallOrder.getOrderType() == EnumMallGoodsGroupType.GOODS.index || mallOrder.getUseUserId() != 0) {
meiya-rest/src/main/java/com/sinata/rest/modular/system/controller/SmsController.java
@@ -3,9 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.sinata.common.enums.EnumRemoteSet;
import com.sinata.rest.common.ApiUtils;
import com.sinata.rest.core.aliyun.sms.AliSmsApi;
import com.sinata.rest.core.aliyun.sms.HwSmsApi;
import com.sinata.rest.core.util.ToolUtil;
import com.sinata.rest.modular.member.model.MemUser;
import com.sinata.rest.modular.member.service.IMemUserService;
import com.sinata.rest.modular.system.model.RemoteSet;
import com.sinata.rest.modular.system.model.SmsRecord;
import com.sinata.rest.modular.system.service.IRemoteSetService;
@@ -14,14 +15,14 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.time.LocalDateTime;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
@Slf4j
@RestController
@@ -35,6 +36,8 @@
    @Autowired
    IRemoteSetService remoteSetService;
    @Autowired
    IMemUserService memUserService;
    private static final String note = "发送验证码 type = 1 注册; type = 2 登录 type = 3 修改密码 type = 4 修改手机号 type = 5修改交易密码";
    @GetMapping(value = "/send")
@@ -50,6 +53,12 @@
        if (StringUtils.isEmpty(phone)) {
            return ApiUtils.returnNG(null, "发送失败");
        }
        LambdaQueryWrapper<MemUser> userWrapper = new LambdaQueryWrapper<>();
        userWrapper.eq(MemUser::getPhone, phone);
        MemUser user = memUserService.getOne(userWrapper);
        if (Objects.isNull(user)) {
            return ApiUtils.returnNG(null, "手机号不存在,请注册");
        }
        // 条件查询
        LambdaQueryWrapper<SmsRecord> wrapper = new LambdaQueryWrapper();
        wrapper.eq(SmsRecord::getCodeType, type).eq(SmsRecord::getPhone, phone);