From c5977252fc888a5d83d26b1815461a305903c30b Mon Sep 17 00:00:00 2001
From: songmingsong <2929511417@qq.com>
Date: Tue, 10 Dec 2024 10:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mobile/AppMemberController.java | 6 ++--
.../mobile/weChat/DTO/WeChatUserInfoDTO.java | 5 +++
.../model/pc/member/resp/MemberRespVO.java | 6 +++-
.../impl/mobile/AppMemberServiceImpl.java | 1 +
src/main/resources/mapper/pc/MemberMapper.xml | 34 ++++++++++++++-----
5 files changed, 39 insertions(+), 13 deletions(-)
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 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycwl.basic.mapper.pc.MemberMapper">
<insert id="add">
- 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})
</insert>
<update id="update">
update member
@@ -11,6 +13,9 @@
<if test="openId!= null and openId!= ''">
openid = #{openId},
</if>
+ <if test="avatarUrl!= null and avatarUrl!= ''">
+ avatar_url = #{avatarUrl},
+ </if>
<if test="nickname!= null and nickname!= ''">
nickname = #{nickname},
</if>
@@ -42,13 +47,15 @@
where id = #{id}
</update>
<delete id="deleteById">
- delete from member where id = #{id}
+ delete
+ from member
+ where id = #{id}
</delete>
<select id="list" resultType="com.ycwl.basic.model.pc.member.resp.MemberRespVO">
- select id, openid, nickname, real_name, promo_code, broker_id, agreement, phone, country, province, city,
- (select count(1) from `order` where `order`.member_id = member.id) as order_count,
- create_date
-from member
+ select id, openid,avatar_url, nickname, real_name, promo_code, broker_id, agreement, phone, country, province, city,
+ (select count(1) from `order` where `order`.member_id = member.id) as order_count,
+ create_date
+ from member
<where>
<if test="openId!= null and openId!= ''">
and openid like concat('%',#{openId},'%')
@@ -83,7 +90,18 @@ from member
</where>
</select>
<select id="getById" resultType="com.ycwl.basic.model.pc.member.resp.MemberRespVO">
- select id, openid, nickname, real_name, promo_code, broker_id, agreement, phone, country, province, city
+ select id,
+ openid,
+ avatar_url,
+ nickname,
+ real_name,
+ promo_code,
+ broker_id,
+ agreement,
+ phone,
+ country,
+ province,
+ city
from member
where id = #{id}
</select>