From 69f4e7bafd3d81696aa00affd6b9ddfa6b50503f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 08 二月 2025 13:36:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index f1bd4ef..8b2d736 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -261,12 +261,12 @@
@Override
public R<LoginVo> registerAccount(RegisterAccount registerAccount) {
//校验验证码
- String code = redisService.getCacheObject(registerAccount.getPhone());
- if(!"999999".equals(registerAccount.getCode())){
- if(null == code || !code.equals(registerAccount.getCode())){
- return R.fail("验证码错误");
- }
- }
+// String code = redisService.getCacheObject(registerAccount.getPhone());
+// if(!"999999".equals(registerAccount.getCode())){
+// if(null == code || !code.equals(registerAccount.getCode())){
+// return R.fail("验证码错误");
+// }
+// }
//使用jscode获取微信openid
Map<String, Object> map = weChatUtil.code2Session(registerAccount.getJscode());
Integer errcode = Integer.valueOf(map.get("errcode").toString());
@@ -474,7 +474,7 @@
//获取微信推广二维码
String fileName = UUID.randomUUID() + ".jpg";
- String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/login/login", "id=" + appUser.getId(), EnvVersion.RELEASE, filePath + fileName);
+ String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/start/start", "id=" + appUser.getId(), EnvVersion.RELEASE, filePath + fileName);
appUser.setQrCode(getwxacodeunlimit);
this.updateById(appUser);
@@ -894,7 +894,7 @@
.eq(AppUser::getStatus, 1).in(AppUser::getId, replaceable));
for (AppUser appUser : list) {
Long data = orderClient.getOrderCountByAppUserId(appUser.getId()).getData();
- if(data == 0){
+ if(data == 0L){
appUser.setChangePromoter(1);
this.updateById(appUser);
}
@@ -973,6 +973,8 @@
Set<Integer> shopIds = shopR.getData();
if (!CollectionUtils.isEmpty(shopIds)){
appUser.setShopIds(shopIds);
+ }else {
+ return new Page<>();
}
}
}
@@ -1053,4 +1055,9 @@
}
}
}
+
+ @Override
+ public List<AppUser> getAppUserByPhoneNoFilter(String phone) {
+ return this.baseMapper.getAppUserByPhoneNoFilter(phone);
+ }
}
--
Gitblit v1.7.1