From d20ede4470f761d0c76a0c993170ebbd96a1bcc1 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 11 二月 2025 11:33:19 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 2561d96..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());
@@ -286,6 +286,12 @@
if(null != appUser1 && appUser1.getStatus() == 2){
return R.fail("手机号已注册，请直接登录！");
}
+
+ String avatar = registerAccount.getAvatar();
+ if (StringUtils.isEmpty(avatar)){
+ avatar = "http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/admin/aedfbbb41280471f8d9fa7905298b65f.png";
+ }
+
//如果手机号已注册，但是没有微信号，则将微信号添加到已有账户上
if(null != appUser1 && StringUtils.isEmpty(appUser1.getWxOpenid())){
appUser1.setWxOpenid(openid);
@@ -293,7 +299,7 @@
appUser = appUser1;
}else if(null == appUser){
appUser = new AppUser();
- appUser.setAvatar(registerAccount.getAvatar());
+ appUser.setAvatar(avatar);
appUser.setName(registerAccount.getName());
appUser.setPhone(registerAccount.getPhone());
appUser.setWxOpenid(openid);
@@ -468,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);
@@ -888,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);
}
@@ -967,6 +973,8 @@
Set<Integer> shopIds = shopR.getData();
if (!CollectionUtils.isEmpty(shopIds)){
appUser.setShopIds(shopIds);
+ }else {
+ return new Page<>();
}
}
}
@@ -1047,4 +1055,9 @@
}
}
}
+
+ @Override
+ public List<AppUser> getAppUserByPhoneNoFilter(String phone) {
+ return this.baseMapper.getAppUserByPhoneNoFilter(phone);
+ }
}
--
Gitblit v1.7.1