From 94e9dc3adb80baf6e1d7d56e54a93917996bc339 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 28 四月 2024 11:21:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
rest/src/main/java/cn/stylefeng/rest/modular/user/service/CustomerLoginBizService.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/service/CustomerLoginBizService.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/service/CustomerLoginBizService.java
index c8a78b9..638f5d8 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/service/CustomerLoginBizService.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/service/CustomerLoginBizService.java
@@ -56,6 +56,23 @@
.eq(Customer::getWxOpenId, wxOpenId);
Customer customer = customerService.getOne(wrapper, false);
+ if (customer == null && StrUtil.isNotBlank(phone)) {
+ // 判断手机号是否注册
+ Wrapper phonewrapper = Wrappers.<Customer>lambdaQuery()
+ .eq(Customer::getUserType, userType.getCode())
+ .eq(Customer::getAccount, phone)
+ .last("LIMIT 1");
+ customer = customerService.getOne(phonewrapper, false);
+ if (customer != null) {
+ // 更新微信openId
+ customerService.update(
+ Wrappers.<Customer>lambdaUpdate()
+ .set(Customer::getWxOpenId, wxOpenId)
+ .eq(Customer::getCustomerId, customer.getCustomerId())
+ );
+ }
+ }
+
// 账号不存在时，判断是否去注册
assertAccountNoExistToReg(customer, userType, phone, wxOpenId);
--
Gitblit v1.7.1