From cd9f7a2adbeb3dcc6060f6a5ea3a9d54dced5c64 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 16 May 2022 15:10:59 +0800
Subject: [PATCH] fix regiter
---
src/main/resources/mapper/modules/MallRegisterAppealMapper.xml | 10 +++++
src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java | 8 ++++
src/main/java/cc/mrbird/febs/mall/mapper/MallRegisterAppealMapper.java | 10 +++++
src/main/java/cc/mrbird/febs/mall/entity/MallRegisterAppeal.java | 23 +++++++++++
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java | 2 +
src/main/java/cc/mrbird/febs/mall/dto/RegisterAppealDto.java | 24 ++++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 21 ++++++++++
7 files changed, 97 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java
index 24589fa..8f6c8f3 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.ForgetPwdDto;
import cc.mrbird.febs.mall.dto.LoginDto;
+import cc.mrbird.febs.mall.dto.RegisterAppealDto;
import cc.mrbird.febs.mall.dto.RegisterDto;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import io.swagger.annotations.Api;
@@ -47,4 +48,11 @@
public FebsResponse forgetPwd(@RequestBody ForgetPwdDto forgetPwdDto) {
return memberService.forgetPwd(forgetPwdDto);
}
+
+ @ApiOperation(value = "提交注册申诉", notes = "提交注册申诉")
+ @PostMapping(value = "addRegisterAppeal")
+ public FebsResponse addRegisterAppeal(@RequestBody RegisterAppealDto registerAppeal) {
+ memberService.addRegisterAppeal(registerAppeal);
+ return new FebsResponse().success().message("申请成功");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/RegisterAppealDto.java b/src/main/java/cc/mrbird/febs/mall/dto/RegisterAppealDto.java
new file mode 100644
index 0000000..13298f8
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/RegisterAppealDto.java
@@ -0,0 +1,24 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author wzy
+ * @date 2022-05-16
+ **/
+@Data
+@ApiModel(value = "RegisterAppealDto")
+public class RegisterAppealDto {
+
+ @NotBlank(message = "参数错误")
+ @ApiModelProperty(value = "手机号", example = "13412341234")
+ private String phone;
+
+ @NotBlank(message = "参数错误")
+ @ApiModelProperty(value = "姓名", example = "123")
+ private String name;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallRegisterAppeal.java b/src/main/java/cc/mrbird/febs/mall/entity/MallRegisterAppeal.java
new file mode 100644
index 0000000..7d6266c
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallRegisterAppeal.java
@@ -0,0 +1,23 @@
+package cc.mrbird.febs.mall.entity;
+
+import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2022-05-16
+ **/
+@Data
+@TableName("mall_register_appeal")
+public class MallRegisterAppeal extends BaseEntity {
+
+ private String phone;
+
+ private String name;
+
+ /**
+ * 审核状态 1-审核通过 2-审核中 3-审核失败
+ */
+ private Integer status;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallRegisterAppealMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallRegisterAppealMapper.java
new file mode 100644
index 0000000..fc43677
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallRegisterAppealMapper.java
@@ -0,0 +1,10 @@
+package cc.mrbird.febs.mall.mapper;
+
+import cc.mrbird.febs.mall.entity.MallRegisterAppeal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+public interface MallRegisterAppealMapper extends BaseMapper<MallRegisterAppeal> {
+
+ MallRegisterAppeal selectByPhoneAndName(@Param("name") String name, @Param("phone") String phone);
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
index ba377fa..333e65f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
@@ -56,4 +56,6 @@
void shopApply(ShopApplyDto shopApplyDto);
MallShopApply findNewestApply();
+
+ void addRegisterAppeal(RegisterAppealDto registerAppeal);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 94ee6ee..9001cfc 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -58,6 +58,7 @@
private final MallMemberPaymentMapper mallMemberPaymentMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallShopApplyMapper mallShopApplyMapper;
+ private final MallRegisterAppealMapper mallRegisterAppealMapper;
@Value("${spring.profiles.active}")
@@ -73,7 +74,10 @@
List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
if (CollUtil.isNotEmpty(mallMembers)) {
- return new FebsResponse().code(HttpStatus.ACCEPTED).message("用户名已存在");
+ MallRegisterAppeal registerAppeal = mallRegisterAppealMapper.selectByPhoneAndName(registerDto.getName(), registerDto.getAccount());
+ if (registerAppeal == null || registerAppeal.getStatus() != 1) {
+ return new FebsResponse().code(HttpStatus.ACCEPTED).message("用户名已存在");
+ }
}
String account = registerDto.getAccount();
@@ -509,4 +513,19 @@
return mallShopApplyMapper.selectNewestApplyByMemberId(member.getId());
}
+
+ @Override
+ public void addRegisterAppeal(RegisterAppealDto registerAppeal) {
+ MallRegisterAppeal isExist = mallRegisterAppealMapper.selectByPhoneAndName(registerAppeal.getName(), registerAppeal.getPhone());
+ if (isExist != null) {
+ throw new FebsException("申诉已存在");
+ }
+
+ isExist = new MallRegisterAppeal();
+ isExist.setName(registerAppeal.getName());
+ isExist.setPhone(registerAppeal.getPhone());
+ isExist.setStatus(2);
+
+ mallRegisterAppealMapper.insert(isExist);
+ }
}
diff --git a/src/main/resources/mapper/modules/MallRegisterAppealMapper.xml b/src/main/resources/mapper/modules/MallRegisterAppealMapper.xml
new file mode 100644
index 0000000..9a3b8f4
--- /dev/null
+++ b/src/main/resources/mapper/modules/MallRegisterAppealMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.mall.mapper.MallRegisterAppealMapper">
+
+
+ <select id="selectByPhoneAndName" resultType="cc.mrbird.febs.mall.entity.MallRegisterAppeal">
+ select * from mall_register_appeal
+ where phone=#{phone} and name=#{name}
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1