diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java index 3e33564..24b36db 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java @@ -28,7 +28,6 @@ public class AppMemberController { /** * 登录 * - * @param code * @param userInfoDTO * @return * @throws Exception @@ -36,9 +35,8 @@ public class AppMemberController { @ApiOperation("登录") @PostMapping("/login") @IgnoreToken - public ApiResponse login(@RequestParam(value = "code") String code, - @RequestParam(value = "userInfoDTO") WeChatUserInfoDTO userInfoDTO) throws Exception { - return memberService.login(code, userInfoDTO); + public ApiResponse login(@RequestBody WeChatUserInfoDTO userInfoDTO) throws Exception { + return memberService.login(userInfoDTO.getCode(), userInfoDTO); } /** diff --git a/src/main/java/com/ycwl/basic/model/mobile/weChat/DTO/WeChatUserInfoDTO.java b/src/main/java/com/ycwl/basic/model/mobile/weChat/DTO/WeChatUserInfoDTO.java index 40c13c8..7976264 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/weChat/DTO/WeChatUserInfoDTO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/weChat/DTO/WeChatUserInfoDTO.java @@ -11,6 +11,11 @@ import lombok.Data; */ @Data public class WeChatUserInfoDTO { + /** + * code + */ + private String code; + /** * 头像 */ diff --git a/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java b/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java index fd12f5e..8d17090 100644 --- a/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java @@ -1,6 +1,5 @@ package com.ycwl.basic.model.pc.member.resp; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -21,6 +20,11 @@ public class MemberRespVO { */ @ApiModelProperty("微信openId") private String openId; + /** + * 微信头像 + */ + @ApiModelProperty("微信头像") + private String avatarUrl; /** * 微信昵称 */ diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java index 6d00dec..907f3e3 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java @@ -99,6 +99,7 @@ public class AppMemberServiceImpl implements AppMemberService { if (list.isEmpty()) { MemberEntity memberEntity = new MemberEntity(); memberEntity.setId(SnowFlakeUtil.getLongId()); + memberEntity.setOpenId(openId.toString()); BeanCopierUtils.copyProperties(userInfoDTO, memberEntity); memberMapper.add(memberEntity); BeanCopierUtils.copyProperties(memberEntity, memberRespVO); diff --git a/src/main/resources/mapper/pc/MemberMapper.xml b/src/main/resources/mapper/pc/MemberMapper.xml index 6d75ccd..85d279b 100644 --- a/src/main/resources/mapper/pc/MemberMapper.xml +++ b/src/main/resources/mapper/pc/MemberMapper.xml @@ -2,8 +2,10 @@ - insert into member(id, openid, nickname, real_name, promo_code, broker_id, agreement, phone, country, province, city) - values (#{id}, #{openId}, #{nickname}, #{realName}, #{promoCode}, #{brokerId}, #{agreement}, #{phone}, #{country}, #{province}, #{city}) + insert into member(id, openid,avatar_url, nickname, real_name, promo_code, broker_id, agreement, phone, country, province, + city) + values (#{id}, #{openId}, #{avatarUrl},#{nickname}, #{realName}, #{promoCode}, #{brokerId}, #{agreement}, #{phone}, + #{country}, #{province}, #{city}) update member @@ -11,6 +13,9 @@ openid = #{openId}, + + avatar_url = #{avatarUrl}, + nickname = #{nickname}, @@ -42,13 +47,15 @@ where id = #{id} - delete from member where id = #{id} + delete + from member + where id = #{id}