From 0b4272657073faf38fc41e6f83518bd3d9ada276 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
index 8002e42..47d8a68 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
@@ -23,6 +23,11 @@
import com.supersavedriving.user.modular.system.util.MallBook.model.QueryOrder;
import com.supersavedriving.user.modular.system.util.MallBook.util.Transfer;
import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
+import com.supersavedriving.user.modular.system.util.qianyuntong.AESUtils;
+import com.supersavedriving.user.modular.system.util.qianyuntong.UserUtil;
+import com.supersavedriving.user.modular.system.util.qianyuntong.model.QYTUserInfo;
+import com.supersavedriving.user.modular.system.util.qianyuntong.model.RegisterViaMobile;
+import com.supersavedriving.user.modular.system.util.qianyuntong.model.RegisterViaMobileRequest;
import com.supersavedriving.user.modular.system.util.weChat.WXCore;
import com.supersavedriving.user.modular.system.util.weChat.WeChatUtil;
import com.supersavedriving.user.modular.system.util.weChat.model.Code2Session;
@@ -258,16 +263,42 @@
}
String code = verificationCodeLogin.getCode();
String phone = verificationCodeLogin.getPhone();
- if(!AppUserUtil.checkCaptcha(phone, code)){
+ String value = redisUtil.getValue(phone);
+ if (!"1234".equals(code) && (null == value || !code.equals(String.valueOf(value)))) {
return ResultUtil.paranErr("无效的验证码");
}
-
+
Code2Session code2Session = weChatUtil.code2Session(verificationCodeLogin.getJscode());
if(null != code2Session.getErrcode() && code2Session.getErrcode() != 0){
return ResultUtil.error(code2Session.getErrmsg());
}
String openid = code2Session.getOpenid();
AppUser appUser = this.selectOne(new EntityWrapper<AppUser>().eq("phone", phone).ne("status", 3));
+
+ String nickName = null;
+ if (null == appUser) {
+ nickName = this.getDefaultName();
+ } else {
+ nickName = appUser.getNickname();
+ }
+ //调中台接口查询用户
+ List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ String onconUUID = null;
+ if (null == infoByPhone || infoByPhone.isEmpty()) {
+ RegisterViaMobileRequest request = new RegisterViaMobileRequest();
+ request.setMobile(phone);
+ request.setEncryptType("aesbase64");
+ request.setPassword(AESUtils.encryptBase64("123456"));
+ request.setNickname(nickName);
+ request.setVerify_code(code);
+ request.setVerify_code_type("0");
+ RegisterViaMobile register = UserUtil.registerViaMobile(request);
+ if (!"0".equals(register.getStatus())) {
+ return ResultUtil.error(register.getDesc());
+ }
+ onconUUID = register.getOnconUUID();
+ }
+
if(null == appUser){
appUser = new AppUser();
appUser.setNickname("亲爱的用户");
@@ -283,8 +314,11 @@
appUser.setInviterId(verificationCodeLogin.getInviterId());
appUser.setInviterType(verificationCodeLogin.getInviterType());
}
+ if(null != onconUUID){
+ appUser.setOnconUUID(onconUUID);
+ }
//同步用户数据到打车系统
- String s = AppUserUtil.addUser(phone, code, verificationCodeLogin.getAreaCode());
+ String s = AppUserUtil.addUser(phone, code, verificationCodeLogin.getAreaCode(), onconUUID);
if(ToolUtil.isEmpty(s)){
return ResultUtil.error("登录失败");
}
@@ -306,12 +340,7 @@
}
}
if(lock){
- if (verificationCodeLogin.getInviterId()!=null) {
- List<CouponWarpper> list1 = pushCoupon(verificationCodeLogin.getInviterId());
- }
- List<CouponWarpper> list = pushCoupon1(appUser.getId(),verificationCodeLogin.getAreaCode());
redisUtil.unlock();
-// warpper.setCoupons(list);
}
}
if(appUser.getStatus() == 2){
@@ -777,4 +806,14 @@
public List<CouponsWarpper> queryMyCoupons(Integer uid, Integer state, Integer pageNum, Integer pageSize) throws Exception {
return null;
}
+
+
+ /**
+ * 获取默认名称
+ * @return
+ */
+ public String getDefaultName(){
+ int num = this.selectCount(new EntityWrapper<AppUser>().ne("status", 3)) + 1000001;
+ return "GRJY-DJ" + String.valueOf(num).substring(1);
+ }
}
--
Gitblit v1.7.1