Просмотр исходного кода

跳蚤市场返回业主ID信息

java110 лет назад: 6
Родитель
Сommit
1c4a17c4a4

+ 30 - 2
Api/src/main/java/com/java110/api/listener/junkRequirement/ListJunkRequirementsListener.java

@@ -6,9 +6,11 @@ import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.smo.file.IFileRelInnerServiceSMO;
 import com.java110.core.smo.junkRequirement.IJunkRequirementInnerServiceSMO;
+import com.java110.core.smo.owner.IOwnerAppUserInnerServiceSMO;
 import com.java110.dto.advert.AdvertItemDto;
 import com.java110.dto.file.FileRelDto;
 import com.java110.dto.junkRequirement.JunkRequirementDto;
+import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeJunkRequirementConstant;
 import com.java110.utils.util.BeanConvertUtil;
@@ -35,6 +37,9 @@ public class ListJunkRequirementsListener extends AbstractServiceApiListener {
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
+
     @Override
     public String getServiceCode() {
         return ServiceCodeJunkRequirementConstant.LIST_JUNKREQUIREMENTS;
@@ -77,7 +82,7 @@ public class ListJunkRequirementsListener extends AbstractServiceApiListener {
 
         if (count > 0) {
             junkRequirements = BeanConvertUtil.covertBeanList(junkRequirementInnerServiceSMOImpl.queryJunkRequirements(junkRequirementDto), ApiJunkRequirementDataVo.class);
-            refreshPhotos(junkRequirements);
+            refreshPhotoAndOwners(junkRequirements);
         } else {
             junkRequirements = new ArrayList<>();
         }
@@ -94,9 +99,15 @@ public class ListJunkRequirementsListener extends AbstractServiceApiListener {
 
     }
 
-    private void refreshPhotos(List<ApiJunkRequirementDataVo> junkRequirements) {
+    private void refreshPhotoAndOwners(List<ApiJunkRequirementDataVo> junkRequirements) {
         List<PhotoVo> photoVos = null;
         PhotoVo photoVo = null;
+
+        if (junkRequirements == null || junkRequirements.size() < 1) {
+            return;
+        }
+
+        List<String> userIds = new ArrayList<>();
         for (ApiJunkRequirementDataVo junkRequirementDataVo : junkRequirements) {
             FileRelDto fileRelDto = new FileRelDto();
             fileRelDto.setObjId(junkRequirementDataVo.getJunkRequirementId());
@@ -109,7 +120,24 @@ public class ListJunkRequirementsListener extends AbstractServiceApiListener {
             }
 
             junkRequirementDataVo.setPhotos(photoVos);
+            userIds.add(junkRequirementDataVo.getPublishUserId());
 
         }
+
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setAppUserId(junkRequirements.get(0).getCommunityId());
+
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+        if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+            return;
+        }
+
+        for (OwnerAppUserDto tmpOwnerAppUserdto : ownerAppUserDtos) {
+            for (ApiJunkRequirementDataVo apiJunkRequirementDataVo : junkRequirements) {
+                if (tmpOwnerAppUserdto.getAppUserId().equals(apiJunkRequirementDataVo.getPublishUserId())) {
+                    apiJunkRequirementDataVo.setMemberId(tmpOwnerAppUserdto.getMemberId());
+                }
+            }
+        }
     }
 }

+ 10 - 0
java110-bean/src/main/java/com/java110/dto/owner/OwnerAppUserDto.java

@@ -28,6 +28,8 @@ public class OwnerAppUserDto extends PageDto implements Serializable {
     private String appTypeCd;
     private String memberId;
     private String userId;
+    private String[] userIds;
+
 
     private String[] states;
 
@@ -165,4 +167,12 @@ public class OwnerAppUserDto extends PageDto implements Serializable {
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public String[] getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(String[] userIds) {
+        this.userIds = userIds;
+    }
 }

+ 9 - 0
java110-bean/src/main/java/com/java110/vo/api/junkRequirement/ApiJunkRequirementDataVo.java

@@ -19,6 +19,7 @@ public class ApiJunkRequirementDataVo implements Serializable {
     private String stateName;
     private String communityId;
     private String bId;
+    private String memberId;//业主ID
     private List<PhotoVo> photos;
 
     private String createTime;
@@ -151,4 +152,12 @@ public class ApiJunkRequirementDataVo implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
 }

+ 14 - 0
java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml

@@ -179,6 +179,13 @@
         <if test="userId !=null and userId != ''">
             and t.user_id = #{userId}
         </if>
+        <if test="userIds !=null">
+            and t.user_id in
+            <foreach collection="userIds" open="(" close=")"
+                     separator=","  item="item">
+                #{item}
+            </foreach>
+        </if>
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -286,6 +293,13 @@
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
+        <if test="userIds !=null">
+            and t.user_id in
+            <foreach collection="userIds" open="(" close=")"
+                     separator=","  item="item">
+                #{item}
+            </foreach>
+        </if>
 
 
     </select>