分类新增 图标

增加重置密码API
修改 注册API的BUG

dgtly-common/src/main/java/com/dgtly/common/core/domain/ResultType.java

@@ -11,6 +11,7 @@ public enum ResultType {
     ,PASSWORDERROR(303,"账号或密码错误")
     ,VERIFICATIONERROR(304,"验证码错误")
     ,PASSWORD_LENGTH_ERROR(305,"密码长度为6~19位")
+    ,ACCOUNT_PHONE_ERROR(306,"未找到相应账户（手机号或账号错误）")
 
 
 

dgtly-member/dgtly-member-api/src/main/java/com/dgtly/member/controller/MemberInfoController.java

@@ -58,13 +58,13 @@ public class MemberInfoController extends ApiBaseController {
         ParameterObject obj =  getParameterObject();
         MemberInfo memberInfo = obj.parseBean(MemberInfo.class);
         //校验用户名唯一性
-        MemberInfo memberInfo1 = iMemberInfoService.checkMemberUnique(memberInfo.getLoginAccount());
-        if(memberInfo1 != null){
+        int i = iMemberInfoService.checkMemberUnique(memberInfo.getLoginAccount());
+        if(i>0){
             return AjaxResult.error(ResultType.LOGINNAMEREPEAT);
         }
         //校验手机号码唯一性
-        MemberInfo memberInfo2 = iMemberInfoService.checkMemberPhoneUnique(memberInfo.getPhone());
-        if(memberInfo1 != null){
+        i = iMemberInfoService.checkMemberPhoneUnique(memberInfo.getPhone());
+        if(i>0){
             return AjaxResult.error(ResultType.PHONEREPEAT);
         }
         memberInfo.setLoginTime(DateUtils.getNowDate());
@@ -173,4 +173,36 @@ public class MemberInfoController extends ApiBaseController {
 
     }
 
+
+    /**
+     * @descption: 重设密码
+     * @param: token  用户信息
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-2-28 15:01
+     */
+    @ApiOperation(value = "重设密码")
+    @ApiImplicitParam(name = "params" , paramType = "body")
+    @ApiPassToken
+    @PostMapping("/resetPassword")
+    public Object resetPassword(){
+        ParameterObject obj =  getParameterObject();
+        obj.checkParameterNotNull("loginAccount,loginPassword,phone,validateCode");
+        MemberInfo memberInfo = obj.parseBean(MemberInfo.class);
+        /*验证短信验证码*/
+
+
+
+        MemberInfo m = iMemberInfoService.selectMemberInfoByAccountPhone(memberInfo.getLoginAccount(),memberInfo.getPhone());
+        if(m==null){
+            return AjaxResult.error(ResultType.ACCOUNT_PHONE_ERROR);
+        }
+        MemberInfo inMember = new MemberInfo();
+        inMember.setId(m.getId());
+        inMember.setLoginPassword(memberInfo.getLoginPassword());
+
+        int flag = iMemberInfoService.updateMemberInfo(inMember);
+        return toAjax(flag);
+    }
+
 }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/member/mapper/MemberInfoMapper.java

@@ -1,6 +1,8 @@
 package com.dgtly.member.mapper;
 
 import com.dgtly.member.domain.MemberInfo;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -67,7 +69,7 @@ public interface MemberInfoMapper
      * @auther: LiuLingChao
      * @date: 2020-2-25 15:12
      */
-    public MemberInfo checkMemberUnique(String loginAccount);
+    public int checkMemberUnique(String loginAccount);
     /**
      * @descption: 检测手机号的唯一性
      * @param: 手机号
@@ -75,7 +77,7 @@ public interface MemberInfoMapper
      * @auther: LiuLingChao
      * @date: 2020-2-25 15:12
      */
-    public MemberInfo checkMemberPhoneUnique(String phone);
+    public int checkMemberPhoneUnique(String phone);
 
 
     /**
@@ -95,4 +97,13 @@ public interface MemberInfoMapper
      * @date: 2020-03-11 10:47
      */
     public int countMemberInfo();
+
+    /**
+            * @descption: 统计平台会员注册数量
+     * @param:
+        * @return:
+        * @auther: LiuLingChao
+     * @date: 2020-03-11 10:47
+        */
+    public MemberInfo selectMemberInfoByAccountPhone(@Param("loginAccount") String loginAccount, @Param("phone")String phone);
 }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/member/service/IMemberInfoService.java

@@ -66,7 +66,7 @@ public interface IMemberInfoService
      * @auther: LiuLingChao
      * @date: 2020-2-25 15:12
      */
-     public MemberInfo checkMemberUnique(String loginAccount );
+     public int checkMemberUnique(String loginAccount );
     /**
      * @descption: 检测手机号唯一性
      * @param: 手机号
@@ -74,7 +74,7 @@ public interface IMemberInfoService
      * @auther: LiuLingChao
      * @date: 2020-2-25 15:12
      */
-     public MemberInfo checkMemberPhoneUnique(String phone );
+     public int checkMemberPhoneUnique(String phone );
 
 
      /**
@@ -95,4 +95,13 @@ public interface IMemberInfoService
      * @date: 2020-03-11 10:46
      */
     public int countMemberInfo();
+
+    /**
+     * @descption: 查询
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020-03-11 10:46
+     */
+    public MemberInfo selectMemberInfoByAccountPhone(String loginAccount, String loginPassword);
 }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/member/service/impl/MemberInfoServiceImpl.java

@@ -98,12 +98,12 @@ public class MemberInfoServiceImpl implements IMemberInfoService
 
 
     @Override
-    public MemberInfo checkMemberUnique(String loginAccount) {
+    public int checkMemberUnique(String loginAccount) {
         return memberInfoMapper.checkMemberUnique(loginAccount);
     }
 
     @Override
-    public MemberInfo checkMemberPhoneUnique(String phone) {
+    public int checkMemberPhoneUnique(String phone) {
         return memberInfoMapper.checkMemberPhoneUnique(phone);
     }
 
@@ -117,4 +117,9 @@ public class MemberInfoServiceImpl implements IMemberInfoService
     public int countMemberInfo() {
         return memberInfoMapper.countMemberInfo();
     }
+
+    @Override
+    public MemberInfo selectMemberInfoByAccountPhone(String loginAccount, String phone) {
+        return memberInfoMapper.selectMemberInfoByAccountPhone(loginAccount,phone);
+    }
 }

dgtly-member/dgtly-member-common/src/main/resources/mapper/member/MemberInfoMapper.xml

@@ -91,13 +91,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="checkMemberUnique" parameterType="java.lang.String" resultMap="MemberInfoResult">
-          select id, login_account, login_password
+    <select id="checkMemberUnique" parameterType="java.lang.String" resultType="int">
+          select count(1)
           from member_info where login_account = #{loginAccount}
     </select>
 
-    <select id="checkMemberPhoneUnique" parameterType="java.lang.String" resultMap="MemberInfoResult">
-        select id, login_account, login_password
+    <select id="checkMemberPhoneUnique" parameterType="java.lang.String" resultType="int">
+        select count(1)
         from member_info where phone = #{phone}
     </select>
 
@@ -110,4 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="countMemberInfo" resultType="java.lang.Integer">
         select COUNT(login_account) as memberNum from member_info where del_flag=0
     </select>
+
+    <select id="selectMemberInfoByAccountPhone"  resultMap="MemberInfoResult">
+        <include refid="selectMemberInfoVo"/>
+        where login_account = #{loginAccount} and phone = #{phone}
+    </select>
 </mapper>