From b60e601d62c0e2d5c4fd1df9f12fa09f2bf99987 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 14 十月 2024 17:56:48 +0800
Subject: [PATCH] 调试支付
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
index 09bad30..9562d59 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
@@ -23,13 +23,13 @@
import com.xinquan.system.api.model.AppLoginUser;
import com.xinquan.system.api.model.AppVerifyCellPhoneBody;
import com.xinquan.system.api.model.AppWXLoginBody;
-import com.xinquan.user.api.domain.AppUser;
+import com.xinquan.system.api.domain.AppUser;
import com.xinquan.user.api.domain.dto.AppUserDTO;
-import com.xinquan.user.domain.AppUserQuestion;
-import com.xinquan.user.domain.AppUserTree;
-import com.xinquan.user.domain.Tag;
+import com.xinquan.system.api.domain.AppUserQuestion;
+import com.xinquan.system.api.domain.AppUserTree;
+import com.xinquan.system.api.domain.Tag;
import com.xinquan.user.domain.dto.UserAnswerDTO;
-import com.xinquan.user.domain.vo.AppUserVO;
+import com.xinquan.system.api.domain.vo.AppUserVO;
import com.xinquan.user.domain.vo.TagVO;
import com.xinquan.user.mapper.AppUserMapper;
import com.xinquan.user.service.AppUserQuestionService;
@@ -37,11 +37,9 @@
import com.xinquan.user.service.AppUserTreeService;
import com.xinquan.user.service.TagService;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -82,6 +80,10 @@
.ne(AppUser::getUserStatus, AppUserStatusEnum.LOGOUT.getCode()).oneOpt();
}
+ public static void main(String[] args) {
+ String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+ System.err.println(randomCode);
+ }
/**
* app用户注册
* @param appUserDTO
@@ -90,6 +92,11 @@
@Override
public AppUser registerAppUser(AppUserDTO appUserDTO) {
AppUser appUser = BeanUtils.copyBean(appUserDTO, AppUser.class);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String format = simpleDateFormat.format(new Date());
+ // 生成四位随机数字
+ String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+ appUser.setCode("YH"+format+randomCode);
this.save(appUser);
return appUser;
}
@@ -130,6 +137,11 @@
SysUser sysUserRes = registerResult.getData();
appUser = new AppUser();
appUser.setUserId(sysUserRes.getUserId());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String format = simpleDateFormat.format(new Date());
+ // 生成四位随机数字
+ String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+ appUser.setCode("YH"+format+randomCode);
appUser.setWxOpenId(body.getWxOpenId());
appUser.setNickname(body.getNickname());
appUser.setAvatar(body.getHeadImgUrl());
@@ -193,6 +205,11 @@
appUser.setTotalEnergyValue(0);
appUser.setRegisterTime(LocalDateTime.now());
appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String format = simpleDateFormat.format(new Date());
+ // 生成四位随机数字
+ String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+ appUser.setCode("YH"+format+randomCode);
this.save(appUser);
// 初始化用户树苗
initUserTree(appUser.getId());
@@ -254,6 +271,11 @@
appUser.setTotalEnergyValue(0);
appUser.setRegisterTime(LocalDateTime.now());
appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String format = simpleDateFormat.format(new Date());
+ // 生成四位随机数字
+ String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+ appUser.setCode("YH"+format+randomCode);
this.save(appUser);
// 初始化用户树苗
initUserTree(appUser.getId());
@@ -278,7 +300,6 @@
appUserTree.setTreeLevelType(TreeLevelEnum.SEED.getCode());
appUserTree.setGrowthValue(0);
appUserTree.setSowAgain(2);
- appUserTree.setCurrentEnergyValue(0);
appUserTreeService.save(appUserTree);
}
@@ -305,6 +326,8 @@
} else {
appUser.setAppleId(wxOrAppleId);
}
+ appUser.setEmail(body.getEmail());
+ appUser.setNickname(body.getName());
// 查询系统用户
sysUser = sysUserClient.getSysUser(appUser.getUserId()).getData();
if (Objects.isNull(sysUser)) {
@@ -322,6 +345,8 @@
}
appUser = userOptional.get();
appUser.setCellPhone(body.getCellPhone());
+ appUser.setEmail(body.getEmail());
+ appUser.setNickname(body.getName());
// 更新系统用户
sysUser = sysUserClient.getSysUser(appUser.getUserId()).getData();
if (Objects.isNull(sysUser)) {
@@ -455,7 +480,7 @@
* 获取当前登录用户信息
*
* @return 用户信息
- * @see com.xinquan.user.domain.vo.AppUserVO
+ * @see AppUserVO
*/
@Override
public AppUserVO getCurrentUser() {
--
Gitblit v1.7.1