From 80bbdd3e2a435e47f33ccc991843559f4ebb212d Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Mon, 28 Apr 2025 20:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/busiz/web/H5LoginController.java | 29 ++++++++++++++++---
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/agent-manager/src/main/java/com/mortals/xhx/busiz/web/H5LoginController.java b/agent-manager/src/main/java/com/mortals/xhx/busiz/web/H5LoginController.java
index 696597a..f660cf9 100644
--- a/agent-manager/src/main/java/com/mortals/xhx/busiz/web/H5LoginController.java
+++ b/agent-manager/src/main/java/com/mortals/xhx/busiz/web/H5LoginController.java
@@ -117,9 +117,23 @@ public class H5LoginController extends BaseCRUDJsonBodyMappingController<UserSer
userQuery.setOpenId(req.getOpenId());
userEntity = userService.selectOne(userQuery);
if (ObjectUtils.isEmpty(userEntity)) {
- throw new AppException("涓嶅瓨鍦ㄥ綋鍓嶅尮閰嶇殑鍏宠仈鐢ㄦ埛锛乷penId:" + req.getOpenId());
+ //throw new AppException("涓嶅瓨鍦ㄥ綋鍓嶅尮閰嶇殑鍏宠仈鐢ㄦ埛锛乷penId:" + req.getOpenId());
+ userEntity = new UserEntity();
+ userEntity.initAttrValue();
+ userEntity.setOpenId(req.getOpenId());
+ userEntity.setRealName(req.getUserName());
+ userEntity.setLoginName(req.getOpenId());
+// userEntity.setPhone(req.getPhone());
+// userEntity.setMobile(req.getPhone());
+ userEntity.setLoginPwd(SecurityUtil.md5DoubleEncoding("123"));
+ userEntity.setUserType(2);
+ userEntity = userService.save(userEntity);
+ }
+ if(userEntity.getCompanyId()!=null){
+ CompanyEntity companyEntity= companyService.get(userEntity.getCompanyId());
+ data.put("parkId",companyEntity.getParkId());
+ data.put("parkName",companyEntity.getParkName());
}
-
data.put("id", userEntity.getId());
data.put("staffId", userEntity.getCustomerId());
@@ -184,6 +198,10 @@ public class H5LoginController extends BaseCRUDJsonBodyMappingController<UserSer
CompanyEntity companyEntity = companyService.getCompanyByH5(req);
userEntity.setCompanyId(companyEntity.getId());
userEntity = userService.save(userEntity);
+ }else {
+ userEntity.setPhone(req.getPhone());
+ userEntity.setMobile(req.getPhone());
+ userService.update(userEntity);
}
if (!ObjectUtils.isEmpty(userEntity)
@@ -197,9 +215,12 @@ public class H5LoginController extends BaseCRUDJsonBodyMappingController<UserSer
userEntity.setCompanyId(companyEntity.getId());
}
//褰撳墠鐢ㄦ埛缁戝畾鍏徃 鐢ㄦ埛鍚嶅彲涓巔hone缁戝畾
-
-
JSONObject data = new JSONObject();
+ if(userEntity.getCompanyId()!=null){
+ CompanyEntity companyEntity= companyService.get(userEntity.getCompanyId());
+ data.put("parkId",companyEntity.getParkId());
+ data.put("parkName",companyEntity.getParkName());
+ }
data.put("id", userEntity.getId());
data.put("userType", userEntity.getUserType());
userEntity.setLoginTime(System.currentTimeMillis());
--
2.24.3