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/IZfPropertyServiceImpl.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 0c73e22..9fffd7f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -6,18 +6,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.EsModel;
-import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.constant.MenuAuthority;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.*;
-import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.update.UpdateRequest;
@@ -29,8 +24,6 @@
import javax.annotation.Resource;
import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -64,6 +57,15 @@
@Resource
RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ private IZfPropertyDownloadService zfPropertyDownloadService;
+
+ @Resource
+ private IZfPropertyShareService iZfPropertyShareService;
+
+ @Resource
+ private MemoBookService memoBookService;
// private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
@@ -231,7 +233,7 @@
fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
Long motherFaId = 0L;
if(myself.getMomId()!=null)
- motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -242,7 +244,11 @@
//鍔犱笂鐖舵瘝瀹舵棌id
idList.add(fatherFaId);
idList.add(motherFaId);
-
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ idList.addAll(fms);
+ }
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds();
LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, idList);
@@ -290,7 +296,7 @@
fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
Long motherFaId = 0L;
if(myself.getMomId()!=null)
- motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
@@ -298,7 +304,11 @@
//鍔犱笂鐖舵瘝瀹舵棌id
idList.add(fatherFaId);
idList.add(motherFaId);
-
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ idList.addAll(fms);
+ }
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds();
LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, idList);
@@ -317,7 +327,7 @@
public List<ZfProperty> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfProperty> beanRecords){
return beanRecords.stream().peek(
bean -> {
- if (bean.getFamilyId() == familyId||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
bean.setOwnData(1);
} else {
bean.setOwnData(0);
@@ -451,6 +461,8 @@
}
}
+
+
@Resource
ZfLogService zfLogService;
@@ -563,10 +575,17 @@
if (!familyIdList.contains(data.getFamilyId())){
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+ List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(data.getId().longValue(),2007L);
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
+ return AjaxResult.error();
+
}
List<ZfProperty> zfPropertys = listByIds(Arrays.asList(ids));
+ if (! (zfPropertyDownloadService.deleteData(ids) && iZfPropertyShareService.deleteByContentId(ids))){
+ return AjaxResult.error();
+ }
if (zfPropertyService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎es涓殑鏁版嵁
@@ -581,6 +600,8 @@
throw new RuntimeException(e);
}}
});
+ System.out.println("15165132165346153246153");
+
return AjaxResult.success();
}else {
return AjaxResult.error();
--
Gitblit v1.9.1