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/ZfClanServiceImpl.java | 172 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 104 insertions(+), 68 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
index 194fad3..1efa98a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import java.io.IOException;
+import java.sql.SQLIntegrityConstraintViolationException;
import java.time.LocalDateTime;
import java.util.*;
@@ -41,25 +42,19 @@
private ZfClanService zfClanService;
@Resource
- private ZfClanManageService zfClanManageService;
+ private ZfAncestorService zfAncestorService;
private LambdaQueryWrapper<ZfClan> buildCondition(ZfClan zfClan) {
LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfClan::getClanId);
- lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName())
- .like(zfClan.getAdminId() != null, ZfClan::getAdminId, zfClan.getAdminId())
- .like(zfClan.getMomId() != null, ZfClan::getDadId, zfClan.getDadId())
- .like(zfClan.getDadId() != null, ZfClan::getMomId, zfClan.getMomId());
+ lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
return lqw;
}
private LambdaQueryWrapper<ZfClan> uniqueCondition(ZfClan zfClan){
LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
lqw.eq(!StringUtils.isEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
- lqw.eq(zfClan.getAdminId() !=null, ZfClan::getAdminId, zfClan.getAdminId());
- lqw.eq(zfClan.getDadId() !=null , ZfClan::getDadId, zfClan.getDadId());
- lqw.eq(zfClan.getMomId() !=null, ZfClan::getMomId, zfClan.getMomId());
return lqw;
}
@@ -80,36 +75,58 @@
@Override
public AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize) {
LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
- List<ZfClan> beanRecords = list(lqw);
- List<ZfClanDate> zfClanDates=new ArrayList<>();
- System.out.println(beanRecords);
- for (ZfClan zfClan1: beanRecords) {
- ZfClanDate zfClanDate = new ZfClanDate();
- HashMap<Integer,String> adminName = new HashMap<>();
- adminName.put(zfClan1.getAdminId(),zInfoUserService.getById(zfClan1.getAdminId()).getNickName());
- zfClanDate.setAdminName(adminName);
- HashMap<Integer,String> momName = new HashMap<>();
- momName.put(zfClan1.getMomId(),zInfoUserService.getById(zfClan1.getMomId()).getNickName());
- zfClanDate.setMomName(momName);
- HashMap<Integer,String> dadName = new HashMap<>();
- dadName.put(zfClan1.getDadId(),zInfoUserService.getById(zfClan1.getDadId()).getNickName());
- zfClanDate.setDadName(dadName);
- zfClanDate.setClanId(zfClan1.getClanId());
- zfClanDate.setClanName(zfClan1.getClanName());
- zfClanDates.add(zfClanDate);
+ Page<ZfClan> zfClanPage = new Page<>(pageNum, pageSize);
+ Page<ZfClan> pageResult = page(zfClanPage, lqw);
+
+ List<ZfClan> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data); }
+
+ @Override
+ public AjaxResult selectData() {
+ List<ZfClan> lis = this.list();
+ return AjaxResult.success(lis);
+ }
+
+ @Override
+ public AjaxResult selectDataList(ZfClan zfClan){
+ LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
+ List<ZfClan> zfClans = list(lqw);
+ List<ZfClan> satisfyList = new ArrayList<>();
+ for (ZfClan zfClan1: zfClans) {
+ if (zfAncestorService.count(zfClan1.getClanId())){
+ satisfyList.add(zfClan1);}
}
+ return AjaxResult.success(satisfyList);
+ }
- return AjaxResult.success(zfClanDates);
+ @Override
+ public List<ZfClan> selectByCondition(ZfClan zfClan) {
-}
+ System.out.println("8008888//"+zfClan.getClanId());
+ LambdaQueryWrapper<ZfClan> lambdaQueryWrapper = buildCondition(zfClan);
+ lambdaQueryWrapper.eq(zfClan.getClanId()!=null,ZfClan::getClanId,zfClan.getClanId());
+
+ return list(lambdaQueryWrapper);
+ }
+
+ @Override
+ public List<ZfClan> selectByIds(Long[] ids) {
+ List<ZfClan> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
@Override
public AjaxResult addData(ZfClan zfClan) {
LambdaQueryWrapper<ZfClan> lqw = uniqueCondition(zfClan);
List<ZfClan> list = list(lqw);
-
if(list.size()>0){
throw new RuntimeException("璇峰嬁鏂板閲嶅瀹舵棌");
@@ -131,10 +148,7 @@
// esModel.setFid(familyId);
esSer.insertTable(esModel);
// System.out.println(esModel);
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getDadId(),2);
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getMomId(),2);
-// if (!zfClan.getDadId().equals(zfClan.getAdminId()) && !zfClan.getMomId().equals(zfClan.getAdminId()) )
- zfClanManageService.addA(zfClan.getClanId(),zfClan.getAdminId(),1);
+
return AjaxResult.success();
} else {
@@ -154,52 +168,73 @@
ZfLog zfLog = new ZfLog();
zfLog.setUpdateTime(LocalDateTime.now());
zfLog.setModule("瀹舵棌");
- zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+// zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
zfLogService.save(zfLog);
+
+ LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
+ lqw.orderByDesc(ZfClan::getClanId);
+ lqw.eq(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
+ List<ZfClan> lis = this.list(lqw);
// System.out.println("===================================="+meeting);
- if(updateById(zfClan)){
- //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
- ZfClan dataById = getById(zfClan.getClanId());
+ if(lis.size()>0)
+ {
+ return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
- //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
- EsModel esResult = esSer.findByCtId(dataById.getClanId(), "瀹舵棌");
-// System.out.println("===================================="+meeting);
- if (esResult == null){
- return AjaxResult.success();
- }
-
- //鎿嶄綔es淇敼鏁版嵁
- EsModel newModel = new EsModel();
- if(zfClan.getClanName()!=null){
- newModel.setBy1(zfClan.getClanName());
- }else {
- newModel.setBy1(dataById.getClanName());
- }
-//
-
- UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
- updateRequest.doc(
- "by1",newModel.getBy1()
-
- );
-
- try {
- restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- return AjaxResult.success();
- }else {
- return AjaxResult.error();
}
+ else
+ {
+ boolean res = updateById(zfClan);
+ return AjaxResult.success();
+ }
+
+ // if(res){
+
+ // }else {
+ // return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
+ // }
+
+
+
+ // return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
+// //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+// ZfClan dataById = getById(zfClan.getClanId());
+//
+// //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+// EsModel esResult = esSer.findByCtId(dataById.getClanId(), "瀹舵棌");
+//// System.out.println("===================================="+meeting);
+// if (esResult == null){
+// return AjaxResult.success();
+// }
+//
+// //鎿嶄綔es淇敼鏁版嵁
+// EsModel newModel = new EsModel();
+// if(zfClan.getClanName()!=null){
+// newModel.setBy1(zfClan.getClanName());
+// }else {
+// newModel.setBy1(dataById.getClanName());
+// }
+////
+//
+// UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+// updateRequest.doc(
+// "by1",newModel.getBy1()
+//
+// );
+
+// try {
+// restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+
+
}
@Override
public AjaxResult deleteData(Long ids) {
List<ZfClan> zfClans = listByIds(Arrays.asList(ids));
- zfClanManageService.deleteMember(ids);
+ zfAncestorService.deleteMember(ids);
if (zfClanService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎es涓殑鏁版嵁
@@ -216,6 +251,7 @@
});
+
return AjaxResult.success();
} else {
return AjaxResult.error();
--
Gitblit v1.9.1