From e2d7c984c4a85f1df8875701ebfe00a69e317558 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 May 2023 17:05:20 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E4=BC=9A=E5=91=98sq?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/MemberService.java | 4 ++-- .../src/main/resources/mapper/pile/MemberBasicInfoMapper.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index cd8f5cde8..751e62ad1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -101,14 +101,14 @@ public class MemberService { // 校验短信验证码 两种情况不能通过校验，1-验证码错误；2-超时 验证码10分钟有效 checkVerificationCode(dto); String merchantId = ""; - return memberRegisterAndLogin(dto.getMobileNumber(), merchantId, null); + return memberRegisterAndLogin(dto.getMobileNumber(), dto.getMerchantId(), dto.getOpenId()); } /** * 公共登陆注册方法 * @param phoneNumber 手机号 * @param merchantId 商户id - * @return + * @return token返给前端 */ private String memberRegisterAndLogin(String phoneNumber, String merchantId, String openId) { if (StringUtils.isBlank(phoneNumber)) { diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 5f964495c..76cc6c6f2 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -158,7 +158,6 @@ and merchant_id = #{merchantId,jdbcType=VARCHAR} order by create_time DESC, update_time DESC - limit 1