From cab3425bb92d01f3494eb25c1f299038dc634c65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 15 三月 2023 23:43:48 +0800
Subject: [PATCH] 优化保养转单功能
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
index 5f3346a..27782a9 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
@@ -14,6 +14,7 @@
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.user.bmo.owner.IQueryOwnerStatisticsBMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -103,6 +104,9 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+ @Autowired
+ private IQueryOwnerStatisticsBMO queryOwnerStatisticsBMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "page", "璇锋眰涓湭鍖呭惈page淇℃伅");
@@ -129,11 +133,15 @@
List<OwnerDto> ownerDtos = new ArrayList<>();
if (total > 0) {
List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwners(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
+
+ // 鏌ヨ缁熻鏁版嵁
+ ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
+
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", reqJson.getString("userId"));
for (OwnerDto ownerDto : ownerDtoList) {
//鏌ヨ鐓х墖
FileRelDto fileRelDto = new FileRelDto();
- fileRelDto.setObjId(ownerDto.getOwnerId());
+ fileRelDto.setObjId(ownerDto.getMemberId());
fileRelDto.setRelTypeCd("10000"); //涓氫富鐓х墖
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
if (fileRelDtos != null && fileRelDtos.size() > 0) {
@@ -211,6 +219,9 @@
List<OwnerDto> ownerDtos = new ArrayList<>();
if (total > 0) {
List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(tmpOwnerDto);
+ // 鏌ヨ缁熻鏁版嵁
+ ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
+
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
for (OwnerDto ownerDto : ownerDtoList) {
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
--
Gitblit v1.8.0