From b63a69e616542bc18edabfd1f71151f72be21bc1 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 09:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=BA=97=E9=93=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/PartnerIntentInfoRequest.java     |  2 +-
 .../store/request/WantShopInfoRequest.java    | 45 +++++++++++++++++++
 .../impl/HyPartnerIntentInfoServiceImpl.java  |  4 +-
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java
index 5d74e7ec2..e1bab4f83 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java
@@ -37,7 +37,7 @@ public class PartnerIntentInfoRequest {
     private Integer isHaveWantShop;
 
     @ApiModelProperty("意向铺位信息,json字段,最多5个")
-    private String wantShopInfo;
+    private List<WantShopInfoRequest> wantShopInfo;
 
     @ApiModelProperty("最大预算")
     private String maxBudget;
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java
new file mode 100644
index 000000000..d58220b70
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java
@@ -0,0 +1,45 @@
+package com.cool.store.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/21 22:07
+ * @Version 1.0
+ */
+@Data
+public class WantShopInfoRequest {
+
+
+    private ShopInfo shopInfo;
+
+
+    private String uuid;
+
+
+
+    @Data
+    static  class ShopInfo{
+        private ShopAddress shopAddress;
+
+        private String storeIsTakeDown;
+
+        private String takeDown;
+
+    }
+
+  @Data
+  static  class ShopAddress{
+
+      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 397c0c2a9..b5ae8d7df 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
@@ -173,7 +173,9 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         intentInfoDO.setWantShopArea(request.getWantShopArea());
         intentInfoDO.setAcceptAdjustType(request.getAcceptAdjustType());
         intentInfoDO.setIsHaveWantShop(request.getIsHaveWantShop());
-        intentInfoDO.setWantShopInfo(request.getWantShopInfo());
+        if (CollectionUtils.isNotEmpty(request.getWantShopInfo())){
+            intentInfoDO.setWantShopInfo(JSONObject.toJSONString(request.getWantShopInfo()));
+        }
         intentInfoDO.setMaxBudget(request.getMaxBudget());
         intentInfoDO.setMoneySource(request.getMoneySource());
         if(CollectionUtils.isNotEmpty(request.getMoneyProve())){