Merge remote-tracking branch 'origin/master'

rk

7 小时以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

 server/web/src/main/java/com/doumee/api/web/MemberApi.java

@@ -3,25 +3,16 @@
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.dto.UpdMobileRequest;
import com.doumee.dao.dto.WithdrawalDTO;
import com.doumee.dao.dto.WxPhoneRequest;
import com.doumee.dao.vo.AccountResponse;
import com.doumee.dao.vo.UserCenterVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.SmsrecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -34,30 +25,16 @@
@Api(tags = "2、用户信息")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/user")
@RequestMapping("/web/member")
@Slf4j
public class UserApi extends  ApiController{
public class MemberApi extends  ApiController{


    @Autowired
    private MemberService memberService;

//    @Autowired
//    private IdentityInfoService identityInfoService;

//    @Autowired
//    private MemberRevenueService memberRevenueService;
//
//    @Autowired
//    private WithdrawalOrdersService withdrawalOrdersService;


    @ApiOperation(value = "获取系统配置", notes = "小程序端")
    @GetMapping("/getPlatformAboutUs")
    public ApiResponse<UserCenterVO> getPlatformAboutUs() {
        return  ApiResponse.success("查询成功",memberService.getPlatformAboutUs());
    }

    @Autowired
    private SmsrecordService smsrecordService;

    @LoginRequired
    @ApiOperation(value = "获取个人信息", notes = "小程序端")
@@ -65,7 +42,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<Member> getMemberInfo() {
    public ApiResponse<UserCenterVO> getMemberInfo() {
        return  ApiResponse.success("查询成功",memberService.getMemberInfo(getMemberId()));
    }

@@ -82,6 +59,32 @@
        return  ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation(value = "发送短信验证码", notes = "小程序端")
    @GetMapping("/sendSmsCode")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "手机号码", required = true)
    })
    public ApiResponse sendSmsCode(@RequestParam String phone) {
        smsrecordService.sendSms(getMemberId(),phone);
        return  ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "验证短信验证码", notes = "小程序端")
    @GetMapping("/verifyCode")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "手机号码", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "验证码", required = true)
    })
    public ApiResponse verifyCode(@RequestParam String phone,@RequestParam String code) {
        smsrecordService.verifyCode(getMemberId(),phone,code);
        return  ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation("验证手机号")