From dd9759eaa3dabd3d55943fc0c741fd5018d2d76e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 五月 2023 16:43:29 +0800
Subject: [PATCH] optimize dining

---
 service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 61 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 9acaae7..8974067 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,11 @@
 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.doc.annotation.*;
 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;
@@ -36,6 +38,43 @@
 import java.util.List;
 
 
+@Java110CmdDoc(title = "鏌ヨ鐗╀笟鍏徃",
+        description = "涓昏鎻愪緵缁欏绯荤粺鏌ヨ鐗╀笟鍏徃",
+        httpMethod = "get",
+        url = "http://{ip}:{port}/app/property.listProperty",
+        resource = "storeDoc",
+        author = "鍚村鏂�",
+        serviceCode = "property.listProperty",
+        seq = 4
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "storeId", length = 30, remark = "鐗╀笟缂栧彿"),
+        @Java110ParamDoc(name = "name", length = 64, remark = "鐗╀笟鍚嶇О"),
+        @Java110ParamDoc(name = "tel", length = 11, remark = "鐗╀笟鐢佃瘽"),
+        @Java110ParamDoc(name = "page",type="int", length = 11, remark = "椤垫暟"),
+        @Java110ParamDoc(name = "row",type="int", length = 11, remark = "琛屾暟"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+                @Java110ParamDoc(name = "data", type = "Array", length = 0, defaultValue = "鎴愬姛", remark = "鏁版嵁鑺傜偣"),
+                @Java110ParamDoc(parentNodeName = "data", name = "storeId", length = 30, remark = "鐗╀笟缂栧彿"),
+                @Java110ParamDoc(parentNodeName = "data", name = "name", length = 64, remark = "鐗╀笟鍚嶇О"),
+                @Java110ParamDoc(parentNodeName = "data", name = "nearbyLandmarks", length = 64, remark = "鍦版爣锛屽xx 鍏洯鏃�"),
+                @Java110ParamDoc(parentNodeName = "data", name = "tel", length = 11, remark = "鐗╀笟绠$悊鍛樼數璇� 浣滀负绠$悊鍛樿处鍙峰瘑鐮� 娣诲姞鍚庤鍙婃椂淇敼瀵嗙爜"),
+                @Java110ParamDoc(parentNodeName = "data", name = "address", length = 11, remark = "鍏徃鍦板潃"),
+                @Java110ParamDoc(parentNodeName = "data", name = "corporation", length = 11, remark = "娉曚汉"),
+                @Java110ParamDoc(parentNodeName = "data", name = "foundingTime", length = 11, remark = "鎴愮珛鏃ユ湡"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="http://{ip}:{port}/app/property.listProperty?storeId=&name=&tel=&page=1&row=10",
+        resBody="{'code':0,'msg':'鎴愬姛'}"
+)
 /**
  * 绫昏〃杩帮細鏌ヨ
  * 鏈嶅姟缂栫爜锛歴tore.listStore
@@ -47,11 +86,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) {
@@ -75,12 +118,26 @@
         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