submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTempPosterController.java

@@ -82,10 +82,8 @@ public class DistributionActivityTempPosterController extends BaseController {
     /**
      * 修改【请填写功能名称】
      */
-    @ApiOperation("修改【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:poster:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @ApiOperation("修改海报模板")
+    @PutMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody DistributionActivityTempPosterEditBo bo) {
         return toAjax(iDistributionActivityTempPosterService.updateByEditBo(bo) ? 1 : 0);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityAddBo.java

@@ -26,7 +26,7 @@ public class DistributionActivityAddBo {
     @ApiModelProperty("活动名称")
     private String name;
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
     /** 开始时间 */
     @ApiModelProperty("开始时间")
@@ -34,12 +34,21 @@ public class DistributionActivityAddBo {
     /** 结束时间 */
     @ApiModelProperty("结束时间")
     private Long endTime;
+    /** 使用状态：1启用，0关闭 */
+    @ApiModelProperty("使用状态：1启用，0关闭 ")
+    private Integer useStatus;
     /** 模板ID */
     @ApiModelProperty("模板ID")
     private Long tempId;
     /** 海报模板ID */
     @ApiModelProperty("海报模板ID")
-    private Long posterTempId;
+    private Long posterId;
+    /** 拥挤冻结期（天） */
+    @ApiModelProperty("拥挤冻结期（天）")
+    private Integer freezingPeriod;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityEditBo.java

@@ -32,7 +32,7 @@ public class DistributionActivityEditBo {
     private String name;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
     /** 开始时间 */
@@ -43,14 +43,24 @@ public class DistributionActivityEditBo {
     @ApiModelProperty("结束时间")
     private Long endTime;
 
+    /** 使用状态：1启用，0关闭 */
+    @ApiModelProperty("使用状态：1启用，0关闭 ")
+    private Integer useStatus;
+
     /** 模板ID */
     @ApiModelProperty("模板ID")
     private Long tempId;
 
     /** 海报模板ID */
     @ApiModelProperty("海报模板ID")
-    private Long posterTempId;
+    private Long posterId;
 
+    /** 拥挤冻结期（天） */
+    @ApiModelProperty("拥挤冻结期（天）")
+    private Integer freezingPeriod;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityGoodsAddBo.java

@@ -2,10 +2,9 @@ package com.zhongzheng.modules.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
 
+import java.math.BigDecimal;
 
 
 /**
@@ -26,9 +25,9 @@ public class DistributionActivityGoodsAddBo {
     private Long goodsId;
     /** 总佣金上限 */
     @ApiModelProperty("总佣金上限")
-    private Long profitMax;
+    private BigDecimal profitMax;
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
@@ -41,11 +40,11 @@ public class DistributionActivityGoodsAddBo {
     private Integer profitType;
     /** 一级拥金 */
     @ApiModelProperty("一级拥金")
-    private Long profitOne;
+    private BigDecimal profitOne;
     /** 二级拥金 */
     @ApiModelProperty("二级拥金")
-    private Long profitTwo;
+    private BigDecimal profitTwo;
     /** 三级拥金 */
     @ApiModelProperty("三级拥金")
-    private Long profitThree;
+    private BigDecimal profitThree;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityGoodsEditBo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 
 /**
  * 【请填写功能名称】编辑对象 distribution_activity_goods
@@ -29,10 +31,10 @@ public class DistributionActivityGoodsEditBo {
 
     /** 总佣金上限 */
     @ApiModelProperty("总佣金上限")
-    private Long profitMax;
+    private BigDecimal profitMax;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
     /** 修改时间 */
@@ -45,15 +47,15 @@ public class DistributionActivityGoodsEditBo {
 
     /** 一级拥金 */
     @ApiModelProperty("一级拥金")
-    private Long profitOne;
+    private BigDecimal profitOne;
 
     /** 二级拥金 */
     @ApiModelProperty("二级拥金")
-    private Long profitTwo;
+    private BigDecimal profitTwo;
 
     /** 三级拥金 */
     @ApiModelProperty("三级拥金")
-    private Long profitThree;
+    private BigDecimal profitThree;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityGoodsQueryBo.java

@@ -46,7 +46,7 @@ public class DistributionActivityGoodsQueryBo extends BaseEntity {
 	@ApiModelProperty("总佣金上限")
 	private Long profitMax;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 	/** 层级拥挤类型：1百分比，2固定金额 */
 	@ApiModelProperty("层级拥挤类型：1百分比，2固定金额")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterAddBo.java

@@ -19,6 +19,9 @@ public class DistributionActivityPosterAddBo {
     /** 海报模板地址 */
     @ApiModelProperty("海报模板地址")
     private String url;
+    /** 海报模板名称 */
+    @ApiModelProperty("海报模板名称")
+    private String name;
     /** 海报标题 */
     @ApiModelProperty("海报标题")
     private String posterHead;
@@ -45,12 +48,18 @@ public class DistributionActivityPosterAddBo {
     private String posterDistributionConfig;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
+    /** 使用状态：1启用，0关闭 */
+    @ApiModelProperty("使用状态：1启用，0关闭")
+    private Integer useStatus;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterEditBo.java

@@ -2,9 +2,7 @@ package com.zhongzheng.modules.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
 
 
 /**
@@ -21,6 +19,10 @@ public class DistributionActivityPosterEditBo {
     @ApiModelProperty("活动海报模板ID")
     private Long posterId;
 
+    /** 海报模板名称 */
+    @ApiModelProperty("海报模板名称")
+    private String name;
+
     /** 海报模板地址 */
     @ApiModelProperty("海报模板地址")
     private String url;
@@ -51,12 +53,18 @@ public class DistributionActivityPosterEditBo {
     private String posterDistributionConfig;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
+    /** 使用状态：1启用，0关闭 */
+    @ApiModelProperty("使用状态：1启用，0关闭")
+    private Integer useStatus;
 
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterQueryBo.java

@@ -40,6 +40,6 @@ public class DistributionActivityPosterQueryBo extends BaseEntity {
 	@ApiModelProperty("海报模板地址")
 	private String url;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityQueryBo.java

@@ -46,7 +46,7 @@ public class DistributionActivityQueryBo extends BaseEntity {
 	@ApiModelProperty("活动名称")
 	private String name;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 	/** 开始时间 */
 	@ApiModelProperty("开始时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempAddBo.java

@@ -27,8 +27,17 @@ public class DistributionActivityTempAddBo {
     @ApiModelProperty("活动名称")
     private String name;
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
+    /** 拥挤冻结期（天） */
+    @ApiModelProperty("拥挤冻结期（天）")
+    private Integer freezingPeriod;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 发布状态：1已发布，0未发布 */
+    @ApiModelProperty("发布状态：1已发布，0未发布")
+    private Integer publishStatus;
     /** 海报模板ID */
     @ApiModelProperty("海报模板ID")
     private Long posterTempId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempEditBo.java

@@ -34,9 +34,18 @@ public class DistributionActivityTempEditBo {
     private String name;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
+    /** 发布状态：1已发布，0未发布 */
+    @ApiModelProperty("发布状态：1已发布，0未发布")
+    private Integer publishStatus;
+    /** 拥挤冻结期（天） */
+    @ApiModelProperty("拥挤冻结期（天）")
+    private Integer freezingPeriod;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
     /** 海报模板ID */
     @ApiModelProperty("海报模板ID")
     private Long posterTempId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsAddBo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 
 
 /**
@@ -24,9 +25,9 @@ public class DistributionActivityTempGoodsAddBo {
     private Long goodsId;
     /** 佣金上限 */
     @ApiModelProperty("佣金上限")
-    private Long profitMax;
+    private BigDecimal profitMax;
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
@@ -39,11 +40,11 @@ public class DistributionActivityTempGoodsAddBo {
     private Integer profitType;
     /** 一级拥金 */
     @ApiModelProperty("一级拥金")
-    private Long profitOne;
+    private BigDecimal profitOne;
     /** 二级拥金 */
     @ApiModelProperty("二级拥金")
-    private Long profitTwo;
+    private BigDecimal profitTwo;
     /** 三级拥金 */
     @ApiModelProperty("三级拥金")
-    private Long profitThree;
+    private BigDecimal profitThree;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsEditBo.java

@@ -2,9 +2,9 @@ package com.zhongzheng.modules.distribution.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
+
+import java.math.BigDecimal;
 
 
 /**
@@ -31,10 +31,10 @@ public class DistributionActivityTempGoodsEditBo {
 
     /** 佣金上限 */
     @ApiModelProperty("佣金上限")
-    private Long profitMax;
+    private BigDecimal profitMax;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
     /** 修改时间 */
@@ -46,12 +46,12 @@ public class DistributionActivityTempGoodsEditBo {
     private Integer profitType;
     /** 一级拥金 */
     @ApiModelProperty("一级拥金")
-    private Long profitOne;
+    private BigDecimal profitOne;
     /** 二级拥金 */
     @ApiModelProperty("二级拥金")
-    private Long profitTwo;
+    private BigDecimal profitTwo;
     /** 三级拥金 */
     @ApiModelProperty("三级拥金")
-    private Long profitThree;
+    private BigDecimal profitThree;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempGoodsQueryBo.java

@@ -1,15 +1,12 @@
 package com.zhongzheng.modules.distribution.bo;
 
+import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
+import java.math.BigDecimal;
 
 /**
  * 【请填写功能名称】分页查询对象 distribution_activity_temp_goods
@@ -44,8 +41,8 @@ public class DistributionActivityTempGoodsQueryBo extends BaseEntity {
 	private Long goodsId;
 	/** 佣金上限 */
 	@ApiModelProperty("佣金上限")
-	private Long profitMax;
+	private BigDecimal profitMax;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterAddBo.java

@@ -19,9 +19,15 @@ public class DistributionActivityTempPosterAddBo {
     /** 海报模板地址 */
     @ApiModelProperty("海报模板地址")
     private String posterUrl;
+    /** 海报模板名称 */
+    @ApiModelProperty("海报模板名称")
+    private String name;
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
+    /** 使用状态：1启用，0关闭 */
+    @ApiModelProperty("使用状态：1启用，0关闭")
+    private Integer useStatus;
     /** 海报标题 */
     @ApiModelProperty("海报标题")
     private String posterHead;
@@ -52,4 +58,7 @@ public class DistributionActivityTempPosterAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterEditBo.java

@@ -18,7 +18,9 @@ public class DistributionActivityTempPosterEditBo {
     /** 活动海报模板ID */
     @ApiModelProperty("活动海报模板ID")
     private Long posterTempId;
-
+    /** 海报模板名称 */
+    @ApiModelProperty("海报模板名称")
+    private String name;
     /** 海报模板地址 */
     @ApiModelProperty("海报模板地址")
     private String posterUrl;
@@ -49,11 +51,18 @@ public class DistributionActivityTempPosterEditBo {
     private String posterDistributionConfig;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
+    /** 使用状态：1启用，0关闭 */
+    @ApiModelProperty("使用状态：1启用，0关闭")
+    private Integer useStatus;
+
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempPosterQueryBo.java

@@ -1,16 +1,11 @@
 package com.zhongzheng.modules.distribution.bo;
 
+import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
 /**
  * 【请填写功能名称】分页查询对象 distribution_activity_temp_poster
  *
@@ -39,7 +34,10 @@ public class DistributionActivityTempPosterQueryBo extends BaseEntity {
 	/** 海报模板地址 */
 	@ApiModelProperty("海报模板地址")
 	private String posterUrl;
+	/** 海报模板名称 */
+	@ApiModelProperty("海报模板名称")
+	private String name;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempQueryBo.java

@@ -46,7 +46,7 @@ public class DistributionActivityTempQueryBo extends BaseEntity {
 	@ApiModelProperty("活动名称")
 	private String name;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 	/** 海报模板ID */
 	@ApiModelProperty("海报模板ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationAddBo.java

@@ -22,7 +22,7 @@ public class DistributionActivityTempRelationAddBo {
     @ApiModelProperty("分销模板ID")
     private Long distributionTempId;
     /** 状态：1开启，0关闭 */
-    @ApiModelProperty("状态：1开启，0关闭")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationEditBo.java

@@ -27,7 +27,7 @@ public class DistributionActivityTempRelationEditBo {
 
 
     /** 状态：1开启，0关闭 */
-    @ApiModelProperty("状态：1开启，0关闭")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
     /** 修改时间 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityTempRelationQueryBo.java

@@ -40,6 +40,6 @@ public class DistributionActivityTempRelationQueryBo extends BaseEntity {
 	@ApiModelProperty("分销模板ID")
 	private Long distributionTempId;
 	/** 状态：1开启，0关闭 */
-	@ApiModelProperty("状态：1开启，0关闭")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanAccountAddBo.java

@@ -31,7 +31,7 @@ public class DistributionSalesmanAccountAddBo {
     @ApiModelProperty("微信unionId")
     private String unionId;
     /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanAccountEditBo.java

@@ -38,7 +38,7 @@ public class DistributionSalesmanAccountEditBo {
     private String unionId;
 
     /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanAccountQueryBo.java

@@ -49,6 +49,6 @@ public class DistributionSalesmanAccountQueryBo extends BaseEntity {
 	@ApiModelProperty("微信unionId")
 	private String unionId;
 	/** 状态 1正常 0关闭 */
-	@ApiModelProperty("状态 1正常 0关闭")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanAddBo.java

@@ -56,7 +56,7 @@ public class DistributionSalesmanAddBo {
     @ApiModelProperty("冻结佣金")
     private BigDecimal brokerageFreeze;
     /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanEditBo.java

@@ -71,7 +71,7 @@ public class DistributionSalesmanEditBo {
     private BigDecimal brokerageFreeze;
 
     /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanPosterAddBo.java

@@ -34,7 +34,7 @@ public class DistributionSalesmanPosterAddBo {
     @ApiModelProperty("海报配置（二维码坐标JSON）")
     private String posterConfig;
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanPosterEditBo.java

@@ -42,7 +42,7 @@ public class DistributionSalesmanPosterEditBo {
     private String posterConfig;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，0无效")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
     /** 修改时间 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanPosterQueryBo.java

@@ -52,6 +52,6 @@ public class DistributionSalesmanPosterQueryBo extends BaseEntity {
 	@ApiModelProperty("海报配置（二维码坐标JSON）")
 	private String posterConfig;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanQueryBo.java

@@ -74,6 +74,6 @@ public class DistributionSalesmanQueryBo extends BaseEntity {
 	@ApiModelProperty("冻结佣金")
 	private BigDecimal brokerageFreeze;
 	/** 状态 1正常 0关闭 */
-	@ApiModelProperty("状态 1正常 0关闭")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanRelationAddBo.java

@@ -25,7 +25,7 @@ public class DistributionSalesmanRelationAddBo {
     @ApiModelProperty("业务员ID")
     private Long salesmanId;
     /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
     /** 添加时间 */
     @ApiModelProperty("添加时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanRelationEditBo.java

@@ -30,7 +30,7 @@ public class DistributionSalesmanRelationEditBo {
     private Long salesmanId;
 
     /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
+    @ApiModelProperty("状态：1有效，-1无效")
     private Integer status;
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSalesmanRelationQueryBo.java

@@ -1,16 +1,11 @@
 package com.zhongzheng.modules.distribution.bo;
 
+import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
 /**
  * 【请填写功能名称】分页查询对象 distribution_salesman_relation
  *
@@ -43,6 +38,6 @@ public class DistributionSalesmanRelationQueryBo extends BaseEntity {
 	@ApiModelProperty("业务员ID")
 	private Long salesmanId;
 	/** 状态 1正常 0关闭 */
-	@ApiModelProperty("状态 1正常 0关闭")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivity.java

@@ -41,8 +41,14 @@ private static final long serialVersionUID=1L;
     private Long endTime;
     /** 模板ID */
     private Long tempId;
-    /** 海报模板ID */
-    private Long posterTempId;
+    /** 海报ID */
+    private Long posterId;
+    /** 使用状态：1启用，0关闭 */
+    private Integer useStatus;
+    /** 拥挤冻结期（天） */
+    private Integer freezingPeriod;
+    /** 备注 */
+    private String remark;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityGoods.java

@@ -1,13 +1,15 @@
 package com.zhongzheng.modules.distribution.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
 import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 【请填写功能名称】对象 distribution_activity_goods
@@ -31,7 +33,7 @@ private static final long serialVersionUID=1L;
     /** 商品ID */
     private Long goodsId;
     /** 总佣金上限 */
-    private Long profitMax;
+    private BigDecimal profitMax;
     /** 状态：1有效，0无效 */
     private Integer status;
     /** 添加时间 */
@@ -43,9 +45,9 @@ private static final long serialVersionUID=1L;
     /** 层级拥挤类型：1百分比，2固定金额 */
     private Integer profitType;
     /** 一级拥金 */
-    private Long profitOne;
+    private BigDecimal profitOne;
     /** 二级拥金 */
-    private Long profitTwo;
+    private BigDecimal profitTwo;
     /** 三级拥金 */
-    private Long profitThree;
+    private BigDecimal profitThree;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityPoster.java

@@ -27,10 +27,14 @@ private static final long serialVersionUID=1L;
     /** 活动海报模板ID */
     @TableId(value = "poster_id")
     private Long posterId;
+    /** 海报模板名称 */
+    private String name;
     /** 海报模板地址 */
     private String url;
     /** 状态：1有效，0无效 */
     private Integer status;
+    /** 使用状态：1启用，0关闭 */
+    private Integer useStatus;
     /** 海报标题 */
     private String posterHead;
     /** 海报广告语 */
@@ -53,4 +57,6 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    /** 备注 */
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTemp.java

@@ -35,8 +35,14 @@ private static final long serialVersionUID=1L;
     private String name;
     /** 状态：1有效，0无效 */
     private Integer status;
+    /** 发布状态：1已发布，0未发布 */
+    private Integer publishStatus;
     /** 海报模板ID */
     private Long posterTempId;
+    /** 拥挤冻结期（天） */
+    private Integer freezingPeriod;
+    /** 备注 */
+    private String remark;
     /** 开始时间 */
     private Long startTime;
     /** 结束时间 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTempGoods.java

@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 【请填写功能名称】对象 distribution_activity_temp_goods
@@ -32,7 +33,7 @@ private static final long serialVersionUID=1L;
     /** 商品ID */
     private Long goodsId;
     /** 佣金上限 */
-    private Long profitMax;
+    private BigDecimal profitMax;
     /** 状态：1有效，0无效 */
     private Integer status;
     /** 添加时间 */
@@ -44,9 +45,9 @@ private static final long serialVersionUID=1L;
     /** 层级拥挤类型：1百分比，2固定金额 */
     private Integer profitType;
     /** 一级拥金 */
-    private Long profitOne;
+    private BigDecimal profitOne;
     /** 二级拥金 */
-    private Long profitTwo;
+    private BigDecimal profitTwo;
     /** 三级拥金 */
-    private Long profitThree;
+    private BigDecimal profitThree;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityTempPoster.java

@@ -27,6 +27,8 @@ private static final long serialVersionUID=1L;
     /** 活动海报模板ID */
     @TableId(value = "poster_temp_id")
     private Long posterTempId;
+    /** 海报模板名称 */
+    private String name;
     /** 海报模板地址 */
     private String posterUrl;
     /** 海报标题 */
@@ -47,10 +49,14 @@ private static final long serialVersionUID=1L;
     private String posterDistributionConfig;
     /** 状态：1有效，0无效 */
     private Integer status;
+    /** 使用状态：1启用，0关闭 */
+    private Integer useStatus;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    /** 备注 */
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempPosterServiceImpl.java

@@ -6,14 +6,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTempPosterQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityTemp;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityTempPoster;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempPosterMapper;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityTempPosterService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityTempService;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityTempPosterVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -29,6 +33,9 @@ import java.util.stream.Collectors;
 @Service
 public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<DistributionActivityTempPosterMapper, DistributionActivityTempPoster> implements IDistributionActivityTempPosterService {
 
+    @Autowired
+    private IDistributionActivityTempService iDistributionActivityTempService;
+
     @Override
     public DistributionActivityTempPosterVo queryById(Long posterTempId){
         DistributionActivityTempPoster db = this.baseMapper.selectById(posterTempId);
@@ -74,6 +81,14 @@ public class DistributionActivityTempPosterServiceImpl extends ServiceImpl<Distr
 
     @Override
     public Boolean updateByEditBo(DistributionActivityTempPosterEditBo bo) {
+        //校验是否有绑定活动
+        int count = iDistributionActivityTempService.count(new LambdaQueryWrapper<DistributionActivityTemp>()
+                .eq(DistributionActivityTemp::getPosterTempId, bo.getPosterTempId())
+                .eq(DistributionActivityTemp::getStatus, 1)
+                .eq(DistributionActivityTemp::getPublishStatus, 1));
+        if (count > 0 ){
+            throw new CustomException("该海报模板已绑定发布的分销活动，请勿修改！");
+        }
         DistributionActivityTempPoster update = BeanUtil.toBean(bo, DistributionActivityTempPoster.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTempAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTempEditBo;
@@ -20,6 +21,7 @@ import com.zhongzheng.modules.distribution.service.IDistributionActivityTempGood
 import com.zhongzheng.modules.distribution.service.IDistributionActivityTempRelationService;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityTempService;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityTempVo;
+import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,11 +43,25 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
     private IDistributionActivityTempRelationService iDistributionActivityTempRelationService;
     @Autowired
     private IDistributionActivityTempGoodsService iDistributionActivityTempGoodsService;
+    @Autowired
+    private ISysOldOrgService iSysOldOrgService;
 
     @Override
     public DistributionActivityTempVo queryById(Long id){
         DistributionActivityTemp db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionActivityTempVo.class);
+        DistributionActivityTempVo vo = BeanUtil.toBean(db, DistributionActivityTempVo.class);
+        //获取商品和机构信息
+        List<DistributionActivityTempRelation> relationList = iDistributionActivityTempRelationService
+                .list(new LambdaQueryWrapper<DistributionActivityTempRelation>()
+                .eq(DistributionActivityTempRelation::getDistributionTempId, vo.getId()));
+//        if (CollectionUtils.isNotEmpty(relationList)){
+//            relationList.stream().map(item -> {
+//                DistributionActivityTenantVo tenantVo = new DistributionActivityTenantVo();
+//
+//            })
+//        }
+
+        return vo;
     }
 
     @Override
@@ -90,21 +106,26 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         this.save(add);
+        this.saveRelation(bo,add.getId());
+        return true;
+    }
+
+    //添加关联信息
+    private void saveRelation(DistributionActivityTempAddBo bo,Long tempId){
         //机构信息
         if (ObjectUtils.isNotNull(bo.getIsAllOrg()) && bo.getIsAllOrg() == 1){
             //发布所有机构
             DistributionActivityTempRelation entity = new DistributionActivityTempRelation();
-            entity.setDistributionTempId(add.getId());
+            entity.setDistributionTempId(tempId);
             entity.setTenantId(0L);
             entity.setCreateTime(DateUtils.getNowTime());
             entity.setUpdateTime(DateUtils.getNowTime());
             iDistributionActivityTempRelationService.save(entity);
-            return true;
         }
         if (CollectionUtils.isNotEmpty(bo.getTenantIds())){
             List<DistributionActivityTempRelation> entitys = bo.getTenantIds().stream().map(id -> {
                 DistributionActivityTempRelation entity = new DistributionActivityTempRelation();
-                entity.setDistributionTempId(add.getId());
+                entity.setDistributionTempId(tempId);
                 entity.setTenantId(id);
                 entity.setCreateTime(DateUtils.getNowTime());
                 entity.setUpdateTime(DateUtils.getNowTime());
@@ -116,23 +137,39 @@ public class DistributionActivityTempServiceImpl extends ServiceImpl<Distributio
         if (CollectionUtils.isNotEmpty(bo.getGoodsList())){
             List<DistributionActivityTempGoods> collect = bo.getGoodsList().stream().map(item -> {
                 DistributionActivityTempGoods entity = BeanUtil.toBean(item, DistributionActivityTempGoods.class);
-                entity.setDistributionTempId(add.getId());
+                entity.setDistributionTempId(tempId);
                 entity.setCreateTime(DateUtils.getNowTime());
                 entity.setUpdateTime(DateUtils.getNowTime());
                 return entity;
             }).collect(Collectors.toList());
             iDistributionActivityTempGoodsService.saveBatch(collect);
         }
-
-        return true;
     }
 
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(DistributionActivityTempEditBo bo) {
+        //校验
+        DistributionActivityTemp activityTemp = getById(bo.getId());
+        if (activityTemp.getPublishStatus() == 1){
+            throw new CustomException("活动已发布，不能修改！");
+        }
         DistributionActivityTemp update = BeanUtil.toBean(bo, DistributionActivityTemp.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
+        this.updateById(update);
+        //删除活动商品和下发机构重新绑定
+        iDistributionActivityTempGoodsService.remove(new LambdaQueryWrapper<DistributionActivityTempGoods>()
+        .eq(DistributionActivityTempGoods::getDistributionTempId,bo.getId()));
+        iDistributionActivityTempRelationService.remove(new LambdaQueryWrapper<DistributionActivityTempRelation>()
+        .eq(DistributionActivityTempRelation::getDistributionTempId,bo.getId()));
+        DistributionActivityTempAddBo addBo = new DistributionActivityTempAddBo();
+        addBo.setIsAllOrg(bo.getIsAllOrg());
+        addBo.setGoodsList(bo.getGoodsList());
+        addBo.setTenantIds(bo.getTenantIds());
+        this.saveRelation(addBo,bo.getId());
+        return true;
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityGoodsVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 
 
 /**
@@ -33,10 +34,10 @@ public class DistributionActivityGoodsVo {
 	/** 总佣金上限 */
 	@Excel(name = "总佣金上限")
 	@ApiModelProperty("总佣金上限")
-	private Long profitMax;
+	private BigDecimal profitMax;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 	/** 层级拥挤类型：1百分比，2固定金额 */
 	@Excel(name = "层级拥挤类型：1百分比，2固定金额")
@@ -45,13 +46,13 @@ public class DistributionActivityGoodsVo {
 	/** 一级拥金 */
 	@Excel(name = "一级拥金")
 	@ApiModelProperty("一级拥金")
-	private Long profitOne;
+	private BigDecimal profitOne;
 	/** 二级拥金 */
 	@Excel(name = "二级拥金")
 	@ApiModelProperty("二级拥金")
-	private Long profitTwo;
+	private BigDecimal profitTwo;
 	/** 三级拥金 */
 	@Excel(name = "三级拥金")
 	@ApiModelProperty("三级拥金")
-	private Long profitThree;
+	private BigDecimal profitThree;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityPosterVo.java

@@ -26,6 +26,9 @@ public class DistributionActivityPosterVo {
 	@Excel(name = "海报模板地址")
 	@ApiModelProperty("海报模板地址")
 	private String url;
+	/** 海报模板名称 */
+	@ApiModelProperty("海报模板名称")
+	private String name;
 	/** 海报标题 */
 	@ApiModelProperty("海报标题")
 	private String posterHead;
@@ -52,6 +55,12 @@ public class DistributionActivityPosterVo {
 	private String posterDistributionConfig;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
+	/** 使用状态：1启用，0关闭 */
+	@ApiModelProperty("使用状态：1启用，0关闭")
+	private Integer useStatus;
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempGoodsVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 
 
 /**
@@ -30,24 +31,26 @@ public class DistributionActivityTempGoodsVo {
 	@Excel(name = "商品ID")
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
+	@ApiModelProperty("商品价格")
+	private BigDecimal goodsPrice;
 	/** 佣金上限 */
 	@Excel(name = "佣金上限")
 	@ApiModelProperty("佣金上限")
-	private Long profitMax;
+	private BigDecimal profitMax;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 	/** 层级拥挤类型：1百分比，2固定金额 */
 	@ApiModelProperty("层级拥挤类型：1百分比，2固定金额 ")
 	private Integer profitType;
 	/** 一级拥金 */
 	@ApiModelProperty("一级拥金")
-	private Long profitOne;
+	private BigDecimal profitOne;
 	/** 二级拥金 */
 	@ApiModelProperty("二级拥金")
-	private Long profitTwo;
+	private BigDecimal profitTwo;
 	/** 三级拥金 */
 	@ApiModelProperty("三级拥金")
-	private Long profitThree;
+	private BigDecimal profitThree;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempPosterVo.java

@@ -52,6 +52,9 @@ public class DistributionActivityTempPosterVo {
 	private String posterDistributionConfig;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
+	/** 使用状态：1启用，0关闭 */
+	@ApiModelProperty("使用状态：1启用，0关闭")
+	private Integer useStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempRelationVo.java

@@ -30,6 +30,6 @@ public class DistributionActivityTempRelationVo {
 	private Long distributionTempId;
 	/** 状态：1开启，0关闭 */
 	@Excel(name = "状态：1开启，0关闭")
-	@ApiModelProperty("状态：1开启，0关闭")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTempVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
 
 
 /**
@@ -36,8 +37,17 @@ public class DistributionActivityTempVo {
 	private String name;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
+	/** 发布状态：1已发布，0未发布 */
+	@ApiModelProperty("发布状态：1已发布，0未发布")
+	private Integer publishStatus;
+	/** 拥挤冻结期（天） */
+	@ApiModelProperty("拥挤冻结期（天）")
+	private Integer freezingPeriod;
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remark;
 	/** 海报模板ID */
 	@Excel(name = "海报模板ID")
 	@ApiModelProperty("海报模板ID")
@@ -50,4 +60,10 @@ public class DistributionActivityTempVo {
 	@Excel(name = "结束时间")
 	@ApiModelProperty("结束时间")
 	private Long endTime;
+
+	@ApiModelProperty("机构集合")
+	private List<DistributionActivityTenantVo> tenantList;
+
+	@ApiModelProperty("活动商品集合")
+	private List<DistributionActivityTempGoodsVo> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTenantVo.java

@@ -0,0 +1,24 @@
+package com.zhongzheng.modules.distribution.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年03月08日 15:35
+ */
+@Data
+public class DistributionActivityTenantVo implements Serializable {
+
+    @ApiModelProperty("机构ID")
+    private Long tenantId;
+
+    @ApiModelProperty("机构名称")
+    private String tenantName;
+
+    @ApiModelProperty("地址")
+    private String address;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityVo.java

@@ -36,8 +36,14 @@ public class DistributionActivityVo {
 	private String name;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
+	/** 拥挤冻结期（天） */
+	@ApiModelProperty("拥挤冻结期（天）")
+	private Integer freezingPeriod;
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remark;
 	/** 开始时间 */
 	@Excel(name = "开始时间")
 	@ApiModelProperty("开始时间")
@@ -46,12 +52,15 @@ public class DistributionActivityVo {
 	@Excel(name = "结束时间")
 	@ApiModelProperty("结束时间")
 	private Long endTime;
+	/** 使用状态：1启用，0关闭 */
+	@ApiModelProperty("使用状态：1启用，0关闭 ")
+	private Integer useStatus;
 	/** 模板ID */
 	@Excel(name = "模板ID")
 	@ApiModelProperty("模板ID")
 	private Long tempId;
 	/** 海报模板ID */
-	@Excel(name = "海报模板ID")
-	@ApiModelProperty("海报模板ID")
-	private Long posterTempId;
+	@Excel(name = "海报ID")
+	@ApiModelProperty("海报ID")
+	private Long posterId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionSalesmanAccountVo.java

@@ -40,6 +40,6 @@ public class DistributionSalesmanAccountVo {
 	private String unionId;
 	/** 状态 1正常 0关闭 */
 	@Excel(name = "状态 1正常 0关闭")
-	@ApiModelProperty("状态 1正常 0关闭")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionSalesmanPosterVo.java

@@ -26,6 +26,9 @@ public class DistributionSalesmanPosterVo {
 	@Excel(name = "海报模板ID")
 	@ApiModelProperty("海报模板ID")
 	private Long posterId;
+	/** 海报模板名称 */
+	@ApiModelProperty("海报模板名称")
+	private String name;
 	/** 业务员ID */
 	@Excel(name = "业务员ID")
 	@ApiModelProperty("业务员ID")
@@ -44,6 +47,9 @@ public class DistributionSalesmanPosterVo {
 	private String posterConfig;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，0无效")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionSalesmanRelationVo.java

@@ -32,6 +32,6 @@ public class DistributionSalesmanRelationVo {
 	private Long salesmanId;
 	/** 状态 1正常 0关闭 */
 	@Excel(name = "状态 1正常 0关闭")
-	@ApiModelProperty("状态 1正常 0关闭")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionSalesmanVo.java

@@ -75,6 +75,6 @@ public class DistributionSalesmanVo {
 	private BigDecimal brokerageFreeze;
 	/** 状态 1正常 0关闭 */
 	@Excel(name = "状态 1正常 0关闭")
-	@ApiModelProperty("状态 1正常 0关闭")
+	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
 }