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

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

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 
@@ -17,6 +18,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Accessors(chain = true)
 public class HyPartnerBaseInfoDO implements Serializable {
     @ApiModelProperty("")
     private Long id;

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

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 
@@ -17,6 +18,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Accessors(chain = true)
 public class HyPartnerLineInfoDO implements Serializable {
     @ApiModelProperty("")
     private Long id;
@@ -77,4 +79,7 @@ public class HyPartnerLineInfoDO implements Serializable {
 
     @ApiModelProperty("移除黑名单原因")
     private String removeBlackReason;
+
+    @ApiModelProperty("hy_partner_user_channel.id")
+    private Integer userChannelId;
 }

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

@@ -0,0 +1,43 @@
+package com.cool.store.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.naming.Name;
+
+/**
+ * hy_partner_user_channel
+ * @author 
+ */
+@Data
+@Accessors(chain = true)
+public class HyPartnerUserChannelDO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 来源id
+     */
+    private Long channelId;
+
+    /**
+     * 来源名称
+     */
+    private String channelName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 
@@ -17,6 +18,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Accessors(chain = true)
 public class HyPartnerUserInfoDO implements Serializable {
     @ApiModelProperty("")
     private Long id;

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

@@ -0,0 +1,19 @@
+package com.cool.store.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class SyncEcCustomerDO {
+
+    private Long id;
+
+    private String customername;
+
+    private String customermobile;
+
+    private String followname;
+
+    private String followmobile;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/CustomerInfoRequest.java

@@ -0,0 +1,26 @@
+package com.cool.store.request;
+
+import lombok.Data;
+
+/**
+ * @author hxd
+ * @since 2023/2/28
+ */
+@Data
+public class CustomerInfoRequest  {
+
+
+    private Long crmId;
+
+    private String mobile;
+
+    private String name;
+
+    private String channel;
+
+    private String followUserMobile;
+
+    private Long lastFollowUserId;
+
+    private String followUserName;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java

@@ -22,4 +22,6 @@ public class ApplyBaseInfoVO {
     @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单")
     private Integer lineStatus;
 
+    @ApiModelProperty("线索id")
+    private Long partnerLineId;
 }