Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerTaskInfoLogDO.java

@@ -46,8 +46,18 @@ public class HyPartnerTaskInfoLogDO implements Serializable {
     private Date updateTime;
 
     @ApiModelProperty("hy_partner_user_info.partner_id")
-    private Long partnerId;
+    private String partnerId;
 
     @ApiModelProperty("字段备份")
     private String fieldCopy;
+
+    public HyPartnerTaskInfoLogDO(String partnerId, Long partnerLineId, String workflowStage, String workflowStatus, String operateUserId, String operateUsername, String message) {
+        this.partnerId = partnerId;
+        this.partnerLineId = partnerLineId;
+        this.workflowStage = workflowStage;
+        this.workflowStatus = workflowStatus;
+        this.operateUserId = operateUserId;
+        this.operateUsername = operateUsername;
+        this.message = message;
+    }
 }

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;

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;
+
+    }
+
+}