From f397fd496bf8275618f7d98f357ba0c7771b7d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Sun, 25 Jun 2023 15:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cool/store/vo/PartnerIntentInfoVO.java    |  3 +-
 .../com/cool/store/vo/WantShopInfoVO.java     | 43 +++++++++++++++++++
 .../impl/HyPartnerIntentInfoServiceImpl.java  |  3 +-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
index b601bbb1d..da78ff652 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
@@ -1,5 +1,6 @@
 package com.cool.store.vo;
 
+import com.cool.store.request.WantShopInfoRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,7 +52,7 @@ public class PartnerIntentInfoVO {
     private Integer isHaveWantShop;
 
     @ApiModelProperty("意向铺位信息,json字段,最多5个")
-    private String wantShopInfo;
+    private List<WantShopInfoVO> wantShopInfo;
 
     @ApiModelProperty("最大预算")
     private String maxBudget;
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java
new file mode 100644
index 000000000..833f3dcc4
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java
@@ -0,0 +1,43 @@
+package com.cool.store.vo;
+
+import com.cool.store.request.WantShopInfoRequest;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/25 15:53
+ * @Version 1.0
+ */
+@Data
+public class WantShopInfoVO {
+
+
+    private ShopInfoVO shopInfo;
+
+
+    private String uuid;
+
+
+
+    @Data
+    static  class ShopInfoVO{
+        private ShopAddressVO shopAddress;
+
+        private String storeIsTakeDown;
+
+        private String takeDown;
+
+    }
+
+    @Data
+    static  class ShopAddressVO{
+
+        private String address;
+
+        private String longitude;
+
+        private String latitude;
+
+    }
+
+}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
index b5ae8d7df..1584402c1 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
@@ -23,6 +23,7 @@ import com.cool.store.utils.StringUtil;
 import com.cool.store.vo.PartnerIntentApplyInfoVO;
 import com.cool.store.vo.PartnerIntentInfoVO;
 import com.cool.store.vo.PartnerUserInfoVO;
+import com.cool.store.vo.WantShopInfoVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
@@ -223,7 +224,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         partnerIntentInfoVO.setOtherBand(hyPartnerIntentInfoDO.getOtherBand());
         partnerIntentInfoVO.setStrength(hyPartnerIntentInfoDO.getStrength());
         partnerIntentInfoVO.setNeedImprove(hyPartnerIntentInfoDO.getNeedImprove());
-        partnerIntentInfoVO.setWantShopInfo(hyPartnerIntentInfoDO.getWantShopInfo());
+        partnerIntentInfoVO.setWantShopInfo(JSONObject.parseArray(hyPartnerIntentInfoDO.getWantShopInfo(), WantShopInfoVO.class));
         return partnerIntentInfoVO;
     }