You've already forked FrameTour-BE
修改BUG
This commit is contained in:
@ -28,7 +28,6 @@ public class AppMemberController {
|
|||||||
/**
|
/**
|
||||||
* 登录
|
* 登录
|
||||||
*
|
*
|
||||||
* @param code
|
|
||||||
* @param userInfoDTO
|
* @param userInfoDTO
|
||||||
* @return
|
* @return
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
@ -36,9 +35,8 @@ public class AppMemberController {
|
|||||||
@ApiOperation("登录")
|
@ApiOperation("登录")
|
||||||
@PostMapping("/login")
|
@PostMapping("/login")
|
||||||
@IgnoreToken
|
@IgnoreToken
|
||||||
public ApiResponse<?> login(@RequestParam(value = "code") String code,
|
public ApiResponse<?> login(@RequestBody WeChatUserInfoDTO userInfoDTO) throws Exception {
|
||||||
@RequestParam(value = "userInfoDTO") WeChatUserInfoDTO userInfoDTO) throws Exception {
|
return memberService.login(userInfoDTO.getCode(), userInfoDTO);
|
||||||
return memberService.login(code, userInfoDTO);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -11,6 +11,11 @@ import lombok.Data;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class WeChatUserInfoDTO {
|
public class WeChatUserInfoDTO {
|
||||||
|
/**
|
||||||
|
* code
|
||||||
|
*/
|
||||||
|
private String code;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 头像
|
* 头像
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package com.ycwl.basic.model.pc.member.resp;
|
package com.ycwl.basic.model.pc.member.resp;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
@ -21,6 +20,11 @@ public class MemberRespVO {
|
|||||||
*/
|
*/
|
||||||
@ApiModelProperty("微信openId")
|
@ApiModelProperty("微信openId")
|
||||||
private String openId;
|
private String openId;
|
||||||
|
/**
|
||||||
|
* 微信头像
|
||||||
|
*/
|
||||||
|
@ApiModelProperty("微信头像")
|
||||||
|
private String avatarUrl;
|
||||||
/**
|
/**
|
||||||
* 微信昵称
|
* 微信昵称
|
||||||
*/
|
*/
|
||||||
|
@ -99,6 +99,7 @@ public class AppMemberServiceImpl implements AppMemberService {
|
|||||||
if (list.isEmpty()) {
|
if (list.isEmpty()) {
|
||||||
MemberEntity memberEntity = new MemberEntity();
|
MemberEntity memberEntity = new MemberEntity();
|
||||||
memberEntity.setId(SnowFlakeUtil.getLongId());
|
memberEntity.setId(SnowFlakeUtil.getLongId());
|
||||||
|
memberEntity.setOpenId(openId.toString());
|
||||||
BeanCopierUtils.copyProperties(userInfoDTO, memberEntity);
|
BeanCopierUtils.copyProperties(userInfoDTO, memberEntity);
|
||||||
memberMapper.add(memberEntity);
|
memberMapper.add(memberEntity);
|
||||||
BeanCopierUtils.copyProperties(memberEntity, memberRespVO);
|
BeanCopierUtils.copyProperties(memberEntity, memberRespVO);
|
||||||
|
@ -2,8 +2,10 @@
|
|||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!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">
|
<mapper namespace="com.ycwl.basic.mapper.pc.MemberMapper">
|
||||||
<insert id="add">
|
<insert id="add">
|
||||||
insert into member(id, openid, nickname, real_name, promo_code, broker_id, agreement, phone, country, province, city)
|
insert into member(id, openid,avatar_url, nickname, real_name, promo_code, broker_id, agreement, phone, country, province,
|
||||||
values (#{id}, #{openId}, #{nickname}, #{realName}, #{promoCode}, #{brokerId}, #{agreement}, #{phone}, #{country}, #{province}, #{city})
|
city)
|
||||||
|
values (#{id}, #{openId}, #{avatarUrl},#{nickname}, #{realName}, #{promoCode}, #{brokerId}, #{agreement}, #{phone},
|
||||||
|
#{country}, #{province}, #{city})
|
||||||
</insert>
|
</insert>
|
||||||
<update id="update">
|
<update id="update">
|
||||||
update member
|
update member
|
||||||
@ -11,6 +13,9 @@
|
|||||||
<if test="openId!= null and openId!= ''">
|
<if test="openId!= null and openId!= ''">
|
||||||
openid = #{openId},
|
openid = #{openId},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="avatarUrl!= null and avatarUrl!= ''">
|
||||||
|
avatar_url = #{avatarUrl},
|
||||||
|
</if>
|
||||||
<if test="nickname!= null and nickname!= ''">
|
<if test="nickname!= null and nickname!= ''">
|
||||||
nickname = #{nickname},
|
nickname = #{nickname},
|
||||||
</if>
|
</if>
|
||||||
@ -42,10 +47,12 @@
|
|||||||
where id = #{id}
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
<delete id="deleteById">
|
<delete id="deleteById">
|
||||||
delete from member where id = #{id}
|
delete
|
||||||
|
from member
|
||||||
|
where id = #{id}
|
||||||
</delete>
|
</delete>
|
||||||
<select id="list" resultType="com.ycwl.basic.model.pc.member.resp.MemberRespVO">
|
<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 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,
|
(select count(1) from `order` where `order`.member_id = member.id) as order_count,
|
||||||
create_date
|
create_date
|
||||||
from member
|
from member
|
||||||
@ -83,7 +90,18 @@ from member
|
|||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
<select id="getById" resultType="com.ycwl.basic.model.pc.member.resp.MemberRespVO">
|
<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
|
from member
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
Reference in New Issue
Block a user