权星相关接口修复

mall-mbg/src/main/java/com/macro/mall/model/dto/quanxing/UmsMemberRequestParam.java

@@ -16,5 +16,6 @@ public class UmsMemberRequestParam implements Serializable {
     private String authCode;
     @ApiModelProperty(value="新密码")
     private String newPassWord;
-
+    @ApiModelProperty(value="新手机号")
+    private String newPhone;
 }

mall-portal/src/main/java/com/macro/mall/portal/controller/member/UmsMemberController.java

@@ -8,10 +8,7 @@ import com.macro.mall.portal.domain.UmsMemberPhoneReviewAddParam;
 import com.macro.mall.domain.UmsMemberVerified;
 import com.macro.mall.portal.service.UmsMemberPhoneReviewService;
 import com.macro.mall.service.member.UmsMemberService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -59,6 +56,28 @@ public class UmsMemberController {
         return CommonResult.failed(res.getMsg());
     }
 
+    @ApiOperation("权星小程序_用户修改手机号")
+    @RequestMapping(value = "/updatePhone", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult updatePhone(@RequestBody UmsMemberRequestParam umsMemberRequestParam) {
+        ResultMsg res = memberService.updatePhone(umsMemberRequestParam);
+        if(res.isFlag()){
+            return CommonResult.success(null,res.getMsg());
+        }
+        return CommonResult.failed(res.getMsg());
+    }
+
+    @ApiOperation("权星后台_根据会员id修改一条会员数据")
+    @RequestMapping(value = "/updateOneById", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult updateOneById(@ApiParam("会员对象,传入Id,以及对应的要修改的值.例如帐号启用状态:0->禁用；1->启用  禁用账号在对应的字段传入0") @RequestBody UmsMember umsMember){
+        ResultMsg res = this.memberService.updateOtherById(umsMember);
+        if(res.isFlag()){
+            return  CommonResult.success(null,res.getMsg());
+        }
+        return  CommonResult.failed(res.getMsg());
+    }
+
     @ApiOperation(value = "刷新token")
     @RequestMapping(value = "/refreshToken", method = RequestMethod.GET)
     @ResponseBody

mall-service/src/main/java/com/macro/mall/service/member/UmsMemberService.java

@@ -204,4 +204,6 @@ public interface UmsMemberService {
      * @return
      */
     ResultMsg updateOtherById(UmsMember umsMember);
+
+    ResultMsg updatePhone(UmsMemberRequestParam umsMemberRequestParam);
 }

mall-service/src/main/java/com/macro/mall/service/member/impl/UmsMemberServiceImpl.java

@@ -249,6 +249,33 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public ResultMsg updatePhone(UmsMemberRequestParam umsMemberRequestParam){
+        if(umsMemberRequestParam.getId() == null ){
+            return new ResultMsg(false,"传入会员id为空");
+        }
+        if(umsMemberRequestParam.getPhone() == null || "".equals(umsMemberRequestParam.getPhone())){
+            return new ResultMsg(false,"传入手机号为空");
+        }
+        if(umsMemberRequestParam.getAuthCode() == null || "".equals(umsMemberRequestParam.getAuthCode())){
+            return new ResultMsg(false,"传入验证码为空");
+        }
+        if(umsMemberRequestParam.getNewPhone() == null || "".equals(umsMemberRequestParam.getNewPhone())){
+            return new ResultMsg(false,"传入新手机号为空");
+        }
+        //对比传入验证码
+        if(this.redisService.get(umsMemberRequestParam.getPhone()).equals(umsMemberRequestParam.getAuthCode())){
+            //如果相等 则修改密码
+            UmsMember umsMember = new UmsMember();
+            umsMember.setId(umsMemberRequestParam.getId());
+            umsMember.setPhone(umsMemberRequestParam.getNewPhone());
+            this.umsMemberMapper.updateByPrimaryKeySelective(umsMember);
+            return new ResultMsg(true,"修改成功");
+        }
+        return new ResultMsg(false,"验证码校验不成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResultMsg updatePassword(UmsMemberRequestParam umsMemberRequestParam) {
         if(umsMemberRequestParam.getId() == null ){
             return new ResultMsg(false,"传入会员id为空");