多品牌使用

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

@@ -175,5 +175,6 @@ public class LineInfoDO {
 
     @Column(name = "join_mode")
     private Integer joinMode;
-
+    @Column(name = "franchise_brand")
+    private Integer franchiseBrand;
 }

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

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author suzhuhong
  * @Date 2024/3/27 16:32
@@ -18,6 +20,8 @@ public class LineListRequest extends PageBasicInfo {
     private String userName;
     @ApiModelProperty("线索手机号")
     private String mobile;
+    @ApiModelProperty("所属区域")
+    private List<Long> regionIds;
     @ApiModelProperty("关键字")
     private String keyword;
     @ApiModelProperty("线索子阶段")

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

@@ -4,6 +4,8 @@ import com.cool.store.common.PageBasicInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author suzhuhong
  * @Date 2024/4/1 11:21
@@ -12,7 +14,8 @@ import lombok.Data;
 @Data
 public class PartnerRequest extends PageBasicInfo {
 
-
+    @ApiModelProperty("所属区域")
+    private List<Long> regionIds;
     @ApiModelProperty("加密状态 1-蓄水池 2-正式")
     private Integer joinStatus;
     @ApiModelProperty("加盟上姓名或者手机号")

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

@@ -21,12 +21,15 @@ public class UpdateLineRequest {
     private String lineName;
     @ApiModelProperty("加盟意向区域")
     private Long wantShopAreaId;
-
+    @ApiModelProperty("所属区域")
+    private Long regionId;
     @NotNull
     @Min(1)
     @Max(2)
     @ApiModelProperty("加盟模式 1-社会加盟 2-强加盟")
     private Integer joinMode;
-
+    @NotNull
+    @ApiModelProperty("加盟品牌")
+    private Integer franchiseBrand;
 
 }

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

@@ -12,7 +12,8 @@ import java.util.List;
  */
 @Data
 public class BaseInfoVO {
-
+    @ApiModelProperty("所属区域")
+    private String regionName;
     @ApiModelProperty("线索ID")
     private Long lineId;
 

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

@@ -228,5 +228,6 @@ public class LineInfoVO {
 
     private Long bigRegionId;
 
+    private Integer franchiseBrand;
 
 }