From 3e02abec44a648f01174a4c3494a96ccb46a3b1a Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 11 十一月 2025 21:39:20 +0800
Subject: [PATCH] 会员&充值相关模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 189 +++++++++++++++++++++++++++++++++--------------
1 files changed, 132 insertions(+), 57 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index d403fe5..9e60ac8 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -10,13 +11,11 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.*;
import com.ruoyi.mapper.ZInfoUserMapper;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfFamilyService;
-import com.ruoyi.service.ZfRelationService;
-import com.ruoyi.service.ZfRoleService;
+import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +23,9 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import javax.crypto.spec.PSource;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -52,6 +50,67 @@
@Resource
private ZfRoleService zfRoleService;
+
+ @Resource
+ private ZfClanService zfClanService;
+
+
+
+ /** 浣跨浉鍚岀敤鎴峰悕+鐢佃瘽鍙风爜鐩稿悓鐨勭敤鎴峰搴旂殑uaid鍚屾*/
+ @Override
+ public Boolean setUaidSame(String phone, String username,String uniqueId){
+ UpdateWrapper<ZInfoUser> wrapper = new UpdateWrapper<>();
+ wrapper.eq(phone!=null,"phone_number", phone)
+ .eq(username!=null,"old_name",username)
+ .set("uaid",uniqueId );
+ this.update(null, wrapper); // 鎵ц鏇存柊
+
+ return true;
+ }
+
+ /** 浣跨浉鍚岀敤鎴峰悕+鐢佃瘽鍙风爜鐩稿悓鐨勭敤鎴峰搴旂殑inforuser琛ㄥ悓姝�*/
+ @Override
+ public void setUserInfoSame(ZInfoUser zInfoUser){
+
+ ZInfoUser zInfoUser1 = new ZInfoUser();
+ zInfoUser1.setPhoneNumber(zInfoUser.getPhoneNumber());
+ zInfoUser1.setOldName(zInfoUser.getOldName());
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser1);
+ if (list(lqw).size() != 0){
+ ZInfoUser newUser = new ZInfoUser();
+ // 鎷疯礉鎵�鏈夊睘鎬�
+ BeanUtils.copyProperties(list(lqw).get(0), newUser);
+
+ newUser.setUserId(zInfoUser.getUserId());
+ newUser.setSysId(zInfoUser.getSysId());
+ newUser.setFamilyId(null);
+ newUser.setFatherId(null);
+ newUser.setMomId(null);
+ newUser.setUrl(null);
+ newUser.setSpouseId(null);
+ newUser.setIsMyFamily(null);
+ newUser.setCreateTime(null);
+ newUser.setClanId(null);
+ newUser.setNickName(null);
+
+ System.out.println("ddddd"+newUser);
+
+
+ this.updateById(newUser);
+ }
+
+ }
+
+
+ @Override
+ public void setSpouseOnly(Long spouse){
+ UpdateWrapper<ZInfoUser> wrapper = new UpdateWrapper<>();
+ System.out.println("{{{{{{{{{{{{{"+spouse);
+ wrapper.eq("spouse_id", spouse) // 浣跨敤瀛楃涓插瓧娈靛悕
+ .set("spouse_id", null); // 鐩存帴璁剧疆瀛楁鍊�
+ this.update(null, wrapper); // 鎵ц鏇存柊
+ }
+
@Override
public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) {
@@ -85,6 +144,20 @@
}
@Override
+ public List<ZInfoUser> findByUaidToFaid(String usid) {
+ if(usid!=null) {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setUaid(usid);
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ List<ZInfoUser> ls = list(lqw);
+ // System.out.println(ls.size()+":==========sdfs55dfsdf");
+ return ls;
+ }else {
+ return new ArrayList<>();
+ }
+ }
+
+ @Override
public List<ZInfoUser> selectByClanId(Integer clanId) {
ZInfoUser zInfoUser = new ZInfoUser();
zInfoUser.setClanId(clanId);
@@ -101,22 +174,25 @@
// }
@Override
- public AjaxResult findInfoUserNameAClan(String nickName)
+ public AjaxResult findUserNameAClan(List<String> nickNames)
{
+ List<ZfShareOther> shareOtherClans = new ArrayList<>();
+ for (String nickName:nickNames) {
ZInfoUser zInfoUser = new ZInfoUser();
zInfoUser.setNickName(nickName);
LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
List<ZInfoUser> zInfoUsers = list(lqw);
- List<ShareOtherClan> shareOtherClans = new ArrayList<>();
+
for (ZInfoUser zInfoUser1: zInfoUsers) {
- ShareOtherClan shareOtherClan = new ShareOtherClan();
- shareOtherClan.setNickName(zInfoUser1.getNickName());
+ ZfShareOther shareOtherClan = new ZfShareOther();
+ shareOtherClan.setUserName(zInfoUser1.getNickName());
shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
shareOtherClan.setClanId(zInfoUser1.getClanId());
+ shareOtherClan.setClanName(zfClanService.getById(zInfoUser1.getClanId()).getClanName());
shareOtherClans.add(shareOtherClan);
- }
+ }}
return AjaxResult.success(shareOtherClans);
}
@@ -171,8 +247,10 @@
lqw.like(StringUtils.isNotEmpty(zInfoUser.getUnit()), ZInfoUser::getUnit, zInfoUser.getUnit());
lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
- lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
+ lqw.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
+
+ lqw.eq(zInfoUser.getUaid() !=null, ZInfoUser::getUaid, zInfoUser.getUaid());
return lqw;
}
@@ -182,6 +260,7 @@
LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = buildCondition(zInfoUser);
List<ZInfoUser> list = list(lambdaQueryWrapper);
log.info("杩斿洖鐨勬暟鎹负:{}", list);
+
return list;
}
@@ -449,15 +528,14 @@
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
// lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
// lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
-// lqw.between(zInfoUser.getHappenStartTime() != null && zInfoUser.getHappenEndTime() != null, ZInfoUser::getBirth, zInfoUser.getHappenStartTime(),zInfoUser.getHappenEndTime());
+// lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId());
List<ZInfoUser> allPeopleList = list(lqw);
-// System.out.println(allPeopleList);
-// System.out.println("============z=============zzzzzzzzzzzzzzzzzzz");
+ // System.out.println(allPeopleList);
+ //System.out.println("============z=============zzzzzzzzzzzzzzzzzzz");
// List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
-// if (depth != null){
try {
result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && ((people.getFatherId()!=null&&people.getFatherId() == 0) || (people.getMomId()!=null&&people.getMomId() == 0)))
.map(people -> {
@@ -467,7 +545,6 @@
}
return people;
}).collect(Collectors.toList());
-//
} catch (NullPointerException e) {
throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
}
@@ -518,25 +595,25 @@
userList.clear();
List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
recursionFindUser(treeList);
-// System.out.println(userList);
-// System.out.println("---------------");
- List<Genealogy> allData = userList.stream().map(
- zInfoUser -> {
- Genealogy newGenealogy = new Genealogy();
- BeanUtils.copyProperties(zInfoUser, newGenealogy);
- if (zInfoUser.getSpouseId() != null) {
- ZInfoUser spouse = getById(zInfoUser.getSpouseId());
+ List<Genealogy> allData = userList.stream().map(
+ zInfoUser -> {
+ Genealogy newGenealogy = new Genealogy();
+ BeanUtils.copyProperties(zInfoUser, newGenealogy);
- Genealogy spouseInfo = new Genealogy();
- BeanUtils.copyProperties(spouse,spouseInfo);
- newGenealogy.setSpouse(spouseInfo);
- spouseInfo.setIdentity(newGenealogy.getIdentity());
- spouseInfo.setSpouseName(zInfoUser.getNickName());
- newGenealogy.setSpouseName(spouse.getNickName());
- }
- return newGenealogy;
- }
+ if (zInfoUser.getSpouseId() != null) {
+ ZInfoUser spouse = getById(zInfoUser.getSpouseId());
+
+ Genealogy spouseInfo = new Genealogy();
+ BeanUtils.copyProperties(spouse,spouseInfo);
+ newGenealogy.setSpouse(spouseInfo);
+ spouseInfo.setIdentity(newGenealogy.getIdentity());
+ spouseInfo.setSpouseName(zInfoUser.getNickName());
+ newGenealogy.setSpouseName(spouse.getNickName());
+ }
+ System.out.println(newGenealogy);
+ return newGenealogy;
+ }
).collect(Collectors.toList());
List<Genealogy> collect = allData.stream()
.distinct()
@@ -545,20 +622,15 @@
.collect(Collectors.toList());
List<Genealogy> resultData = new ArrayList<>();
- for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize + pageSize; i++) {
- if (i >= collect.size()) {
- break;
- }
- resultData.add(collect.get(i));
- }
-// System.out.println(resultData);
-// System.out.println("999999999988888888888++++++++++++++++++++++");
+
+ // System.out.println(resultData);
+ // System.out.println("999999999988888888888++++++++++++++++++++++");
//
//
//瀵箁esult鍋氫竴涓潯浠剁瓫閫�
- Iterator<Genealogy> it = resultData.iterator(); //杩唬鍣� 浠巒ull寮�濮�
- while(it.hasNext()){ //鍒ゆ柇涓嬩竴涓寚閽堟寚鍚戝厓绱犳槸鍚︿负绌�
- Genealogy data = it.next(); //璺冲埌涓嬩竴涓厓绱�
+ Iterator<Genealogy> it = collect.iterator();
+ while(it.hasNext()){
+ Genealogy data = it.next();
if(genealogy.getIdentity()!=null){
if(data.getIdentity()!=genealogy.getIdentity()){
@@ -596,16 +668,12 @@
}
if(genealogy.getBirth()!=null){
- if(data.getBirth().compareTo(genealogy.getBirth())!=0){ //姣旇緝
- it.remove();
- continue;
+ if(data.getBirth()!=null) {
+ if (data.getBirth().compareTo(genealogy.getBirth()) != 0) {
+ it.remove();
+ }
}
- }
- if(genealogy.getHappenEndTime() != null && genealogy.getHappenStartTime() != null ){
- if (data.getBirth() == null) {it.remove(); continue;}
- if(data.getBirth().before(genealogy.getHappenStartTime()) || data.getBirth().after(genealogy.getHappenEndTime())){
- it.remove();
- }
+ else it.remove();
}
}
@@ -641,10 +709,17 @@
// }
//
// }
+ for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize; i++) {
+ if (i >= collect.size()) {
+ break;
+ }
+ System.out.println(i+"//////"+collect.get(i));
+ resultData.add(collect.get(i));
+ }
HashMap<String, Object> resultMap = new HashMap<>();
resultMap.put("data", resultData);
- resultMap.put("total", resultData.size());
+ resultMap.put("total", collect.size());
resultMap.put("pageNum", pageNum);
resultMap.put("pageSize", pageSize);
@@ -710,7 +785,6 @@
@Override
public ZInfoUser getInfoById(Long userId) {
ZInfoUser user = getInfoBysysId(userId);
-
if(user==null) {
//鍒╃敤userId鏌ヨ
@@ -787,6 +861,8 @@
return null;
}
+
+
private void recursionFindUser(List<ZInfoUser> treeList) {
@@ -942,7 +1018,6 @@
// layer = layer + 1;
// System.out.println(depth);
-
List<ZInfoUser> collect = allPeopleList.stream().filter(
one -> Objects.equals(one.getFatherId(), people.getUserId()) || Objects.equals(one.getMomId(),people.getUserId())
).map(
--
Gitblit v1.9.1