From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码

---
 service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java b/service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java
index 865b11f..5a84840 100644
--- a/service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java
@@ -18,9 +18,10 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.store.StoreDto;
+import com.java110.intf.store.IStoreInnerServiceSMO;
 import com.java110.intf.store.IStoreV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -47,11 +48,15 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "property.listProperty")
-public class ListPropertyCmd extends AbstractServiceCmdListener {
+public class ListPropertyCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(ListPropertyCmd.class);
+
     @Autowired
     private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -72,14 +77,29 @@
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
         StoreDto storeDto = BeanConvertUtil.covertBean(reqJson, StoreDto.class);
+        storeDto.setUserId("");
         storeDto.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
+
+        StoreDto storeDto1 = BeanConvertUtil.covertBean(reqJson, StoreDto.class);
+        storeDto1.setUserId("");
+        storeDto1.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
 
         int count = storeV1InnerServiceSMOImpl.queryStoresCount(storeDto);
 
-        List<StoreDto> storeDtos = null;
+        List<StoreDto> storeDtos = new ArrayList<>();
 
         if (count > 0) {
-            storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+            List<StoreDto> storeList = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+            List<StoreDto> stores = storeInnerServiceSMOImpl.getStores(storeDto1);
+            for (StoreDto store : storeList) {
+                for (StoreDto store1 : stores) {
+                    if (store.getStoreId().equals(store1.getStoreId())) {
+                        store.setNearByLandmarks(store1.getNearByLandmarks());
+                    }
+                }
+                storeDtos.add(store);
+            }
+//            storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
         } else {
             storeDtos = new ArrayList<>();
         }

--
Gitblit v1.8.0