From 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 六月 2023 14:27:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/cmd/complaint/ListComplaintsCmd.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/complaint/ListComplaintsCmd.java b/service-store/src/main/java/com/java110/store/cmd/complaint/ListComplaintsCmd.java
index 26c8d17..8d60598 100644
--- a/service-store/src/main/java/com/java110/store/cmd/complaint/ListComplaintsCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/complaint/ListComplaintsCmd.java
@@ -5,13 +5,15 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.complaint.ComplaintDto;
import com.java110.dto.file.FileRelDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.intf.common.IComplaintUserInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.store.IComplaintInnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -41,6 +43,9 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯淇℃伅");
@@ -49,6 +54,9 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ //濡傛灉鏍规嵁涓氫富ID鏌ヨ杞崲涓虹敤鎵嬫満鍙锋煡璇�
+ hasOwnerId(reqJson);
+
ComplaintDto complaintDto = BeanConvertUtil.covertBean(reqJson, ComplaintDto.class);
String roomId = reqJson.getString("roomId");
if (!StringUtil.isEmpty(roomId) && roomId.contains("-")) {
@@ -82,6 +90,22 @@
context.setResponseEntity(responseEntity);
}
+ /**
+ * //濡傛灉鏍规嵁涓氫富ID鏌ヨ杞崲涓虹敤鎵嬫満鍙锋煡璇�
+ * @param reqJson
+ */
+ private void hasOwnerId(JSONObject reqJson) {
+ if(reqJson.containsKey("ownerId") && !StringUtil.isEmpty(reqJson.getString("ownerId"))){
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setMemberId(reqJson.getString("ownerId"));
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+ if(ownerDtos != null && ownerDtos.size() > 0){
+ reqJson.put("tel",ownerDtos.get(0).getLink());
+ }
+ }
+ }
+
private List<ComplaintDto> freshCurrentUser(List<ComplaintDto> complaintDtos) {
List<ComplaintDto> tmpComplaintDtos = new ArrayList<>();
for (ComplaintDto complaintDto : complaintDtos) {
--
Gitblit v1.8.0