rk
11 小时以前 580f4d3c2ca9eee53eee95a4de2f6610b790780a
server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -1,12 +1,15 @@
package com.doumee.api.web;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.LoginShopRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.aliyun.ALiYunSmSUtil;
import com.doumee.dao.business.model.Areas;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.dto.UserCenterVO;
import com.doumee.dao.web.request.UpdateMemberRequest;
import com.doumee.dao.web.request.WxPhoneRequest;
import com.doumee.dao.web.response.AccountResponse;
@@ -14,9 +17,12 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.java.Log;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.HashMap;
import java.util.Map;
@@ -40,32 +46,31 @@
    @ApiOperation(value = "小程序登陆方式", notes = "小程序端")
    @GetMapping("/wxLogin")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "微信code", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "recId", value = "分享码", required = false)
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "微信code", required = true)
    })
    public ApiResponse<AccountResponse> wxLogin(@RequestParam String code, Integer recId) {
        return  ApiResponse.success(memberService.wxLogin(code,recId));
    public ApiResponse<AccountResponse> wxLogin(@RequestParam String code) {
        return  ApiResponse.success(memberService.wxLogin(code));
    }
    @ApiOperation(value = "测试登陆接口", notes = "小程序端")
    @GetMapping("/testLogin")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "memberId", value = "用户编码", required = false)
    })
    public ApiResponse testLogin(@RequestParam   Integer memberId) {
        return  ApiResponse.success(memberService.wxLoginTest(memberId));
    }
    @LoginRequired
    @ApiOperation(value = "绑定手机号", notes = "小程序端")
    @PostMapping("/wxPhone")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse wxLogin(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
        wxPhoneRequest.setMemberId(getMemberId());
        memberService.wxPhone(wxPhoneRequest);
        return  ApiResponse.success("绑定成功");
    public ApiResponse<AccountResponse> wxPhone(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
        return  ApiResponse.success(memberService.wxPhone(wxPhoneRequest));
    }
//    @ApiOperation(value = "测试登陆接口", notes = "小程序端")
//    @GetMapping("/testLogin")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "memberId", value = "用户编码", required = false)
//    })
//    public ApiResponse testLogin(@RequestParam   Integer memberId) {
//        return  ApiResponse.success(memberService.wxLoginTest(memberId));
//    }
    @ApiOperation(value = "获取系统配置", notes = "小程序端")
    @GetMapping("/getPlatformAboutUs")
    public ApiResponse<UserCenterVO> getPlatformAboutUs() {
        return  ApiResponse.success("查询成功",shopcartService.getPlatformAboutUs());
    }
    @LoginRequired
@@ -74,10 +79,12 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<Member> updateMember(@RequestBody UpdateMemberRequest UpdateMemberRequest) {
    public ApiResponse updateMember(@RequestBody UpdateMemberRequest UpdateMemberRequest) {
        UpdateMemberRequest.setMemberId(getMemberId());
        return  ApiResponse.success("操作成功",memberService.updateMember(UpdateMemberRequest));
        memberService.updateMember(UpdateMemberRequest);
        return  ApiResponse.success("操作成功");
    }
    @LoginRequired
    @ApiOperation(value = "获取用户信息", notes = "小程序端")
@@ -87,9 +94,11 @@
    })
    public ApiResponse<Member> getUserInfo() {
        Member member = memberService.findById(getMemberId());
        member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()
                +member.getImgurl());
        if(StringUtils.isNotBlank(member.getImgurl())){
            member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                    systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()
                    +member.getImgurl());
        }
        Areas areas = areasService.findById(member.getCityId(), Constants.ONE);
        member.setCityName(Optional.ofNullable(areas).map(s->s.getName()).orElse(""));
        return  ApiResponse.success("获取成功",member);
@@ -120,4 +129,28 @@
        return  ApiResponse.success("操作成功");
    }
    @LoginRequired
    @ApiOperation("消费者 - 退出登录")
    @GetMapping("/logOut")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse logOut(HttpServletRequest request) {
        memberService.logOut(request.getHeader(JwtTokenUtil.HEADER_KEY),getMemberId());
        return ApiResponse.success("操作成功");
    }
    @LoginRequired
    @ApiOperation("用户注销")
    @GetMapping("/logOff")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse logOff(HttpServletRequest request) {
        memberService.logOff(request.getHeader(JwtTokenUtil.HEADER_KEY),getMemberId());
        return ApiResponse.success("操作成功");
    }
}