diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java new file mode 100644 index 0000000..41d8d8e --- /dev/null +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java @@ -0,0 +1,45 @@ +package com.muyu.common.core.web.model; + +import com.muyu.common.core.web.page.PageDomain; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class QueryModel { + + /** + * 当前记录起始索引 + */ + private Integer pageNum; + + /** + * 每页显示记录数 + */ + private Integer pageSize; + + /** + * 排序列 + */ + private String orderByColumn; + + /** + * 排序的方向desc或者asc + */ + private boolean isAsc = true; + + + + public T domainBuild(PageDomain pageDomain){ + this.pageNum=pageDomain.getPageNum(); + this.pageSize=pageDomain.getPageSize(); + this.orderByColumn= pageDomain.getOrderByColumn(); + this.isAsc="asc".equals(pageDomain.getIsAsc()) ? true : false; + return (T) this; + } +} diff --git a/muyu-modules/muyu-marketing/marketing-common/pom.xml b/muyu-modules/muyu-marketing/marketing-common/pom.xml new file mode 100644 index 0000000..22a6fbf --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.muyu + muyu-marketing + 3.6.3 + + + marketing-common + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-common-core + + + + diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..75fcd65 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java @@ -0,0 +1,7 @@ +package com.muyu; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java new file mode 100644 index 0000000..102895a --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java @@ -0,0 +1,153 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.hibernate.validator.constraints.Length; + +/** +* 商品拼团信息 +* @TableName activity_team_info +*/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("activity_team_info") +@ApiModel(value = "ProjectInfo", description = "商品拼团信息") +public class ActivityTeamInfo extends BaseEntity { + + /** + * 主键 + */ + + @ApiModelProperty("主键") + private Integer id; + /** + * 拼团名称 + */ + + @ApiModelProperty("拼团名称") + private String name; + /** + * 商品ID + */ + + @ApiModelProperty("商品ID") + private Long productId; + /** + * 商品活动图 + */ + + @ApiModelProperty("商品活动图") + + private String productImage; + /** + * 活动简介 + */ + + @ApiModelProperty("活动简介") + + private String introduction; + /** + * 单位 + */ + + @ApiModelProperty("单位") + + private String unit; + /** + * 轮播图 + */ + + @ApiModelProperty("轮播图") + + private String imageList; + /** + * 活动结束时间 + */ + + @ApiModelProperty("活动结束时间") + private Date endTime; + /** + * 活动排序 + */ + + @ApiModelProperty("活动排序") + private Integer sort; + /** + * 活动详情 + */ + + @ApiModelProperty("活动详情") + + private String content; + /** + * 活动状态 + */ + + @ApiModelProperty("活动状态") + + private String status; + /** + * 策略类型 + */ + + @ApiModelProperty("策略类型") + + private String strategyType; + /** + * 策略ID + */ + + @ApiModelProperty("策略ID") + private Long strategyId; + /** + * 备注 + */ + + @ApiModelProperty("备注") + + private String remark; + /** + * 创建人 + */ + + @ApiModelProperty("创建人") + + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + + @ApiModelProperty("修改人") + + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + + + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java new file mode 100644 index 0000000..99d45b5 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java @@ -0,0 +1,379 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 团购活动执行表 +* @TableName activity_team_open_info +*/ +public class ActivityTeamOpenInfo implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 团购活动ID + */ + @NotNull(message="[团购活动ID]不能为空") + @ApiModelProperty("团购活动ID") + private Long teamId; + /** + * 团购类型 + */ + @NotBlank(message="[团购类型]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("团购类型") + @Length(max= 255,message="编码长度不能超过255") + private String teamType; + /** + * 团购策略 + */ + @NotBlank(message="[团购策略]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("团购策略") + @Length(max= 255,message="编码长度不能超过255") + private String teamStrategyId; + /** + * 参团类型 + */ + @NotBlank(message="[参团类型]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("参团类型") + @Length(max= 32,message="编码长度不能超过32") + private String executiveType; + /** + * 结束团购时间 + */ + @NotNull(message="[结束团购时间]不能为空") + @ApiModelProperty("结束团购时间") + private Date endTime; + /** + * 商品ID + */ + @NotBlank(message="[商品ID]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品ID") + @Length(max= 255,message="编码长度不能超过255") + private String productId; + /** + * 商品名称 + */ + @NotBlank(message="[商品名称]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品名称") + @Length(max= 255,message="编码长度不能超过255") + private String productName; + /** + * 商品规格 + */ + @NotBlank(message="[商品规格]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品规格") + @Length(max= 255,message="编码长度不能超过255") + private String productSku; + /** + * 开团标识 + */ + @NotBlank(message="[开团标识]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("开团标识") + @Length(max= 255,message="编码长度不能超过255") + private String key; + /** + * 订单ID + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("订单ID") + @Length(max= 255,message="编码长度不能超过255") + private String orderId; + /** + * 开团状态 + */ + @NotBlank(message="[开团状态]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("开团状态") + @Length(max= 255,message="编码长度不能超过255") + private String status; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 团购活动ID + */ + private void setTeamId(Long teamId){ + this.teamId = teamId; + } + + /** + * 团购类型 + */ + private void setTeamType(String teamType){ + this.teamType = teamType; + } + + /** + * 团购策略 + */ + private void setTeamStrategyId(String teamStrategyId){ + this.teamStrategyId = teamStrategyId; + } + + /** + * 参团类型 + */ + private void setExecutiveType(String executiveType){ + this.executiveType = executiveType; + } + + /** + * 结束团购时间 + */ + private void setEndTime(Date endTime){ + this.endTime = endTime; + } + + /** + * 商品ID + */ + private void setProductId(String productId){ + this.productId = productId; + } + + /** + * 商品名称 + */ + private void setProductName(String productName){ + this.productName = productName; + } + + /** + * 商品规格 + */ + private void setProductSku(String productSku){ + this.productSku = productSku; + } + + /** + * 开团标识 + */ + private void setKey(String key){ + this.key = key; + } + + /** + * 订单ID + */ + private void setOrderId(String orderId){ + this.orderId = orderId; + } + + /** + * 开团状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 团购活动ID + */ + private Long getTeamId(){ + return this.teamId; + } + + /** + * 团购类型 + */ + private String getTeamType(){ + return this.teamType; + } + + /** + * 团购策略 + */ + private String getTeamStrategyId(){ + return this.teamStrategyId; + } + + /** + * 参团类型 + */ + private String getExecutiveType(){ + return this.executiveType; + } + + /** + * 结束团购时间 + */ + private Date getEndTime(){ + return this.endTime; + } + + /** + * 商品ID + */ + private String getProductId(){ + return this.productId; + } + + /** + * 商品名称 + */ + private String getProductName(){ + return this.productName; + } + + /** + * 商品规格 + */ + private String getProductSku(){ + return this.productSku; + } + + /** + * 开团标识 + */ + private String getKey(){ + return this.key; + } + + /** + * 订单ID + */ + private String getOrderId(){ + return this.orderId; + } + + /** + * 开团状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java new file mode 100644 index 0000000..411b4ce --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java @@ -0,0 +1,246 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 商品拼团规格信息表 +* @TableName activity_team_product_sku_info +*/ +public class ActivityTeamProductSkuInfo implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 活动ID + */ + @NotNull(message="[活动ID]不能为空") + @ApiModelProperty("活动ID") + private Long teamId; + /** + * 商品ID + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品ID") + @Length(max= 255,message="编码长度不能超过255") + private String productId; + /** + * 商品SKU + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品SKU") + @Length(max= 255,message="编码长度不能超过255") + private String productSku; + /** + * 拼团库存 + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("拼团库存") + @Length(max= 255,message="编码长度不能超过255") + private String teamStock; + /** + * 拼团价格 + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("拼团价格") + @Length(max= 255,message="编码长度不能超过255") + private String teamPrice; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 活动ID + */ + private void setTeamId(Long teamId){ + this.teamId = teamId; + } + + /** + * 商品ID + */ + private void setProductId(String productId){ + this.productId = productId; + } + + /** + * 商品SKU + */ + private void setProductSku(String productSku){ + this.productSku = productSku; + } + + /** + * 拼团库存 + */ + private void setTeamStock(String teamStock){ + this.teamStock = teamStock; + } + + /** + * 拼团价格 + */ + private void setTeamPrice(String teamPrice){ + this.teamPrice = teamPrice; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 活动ID + */ + private Long getTeamId(){ + return this.teamId; + } + + /** + * 商品ID + */ + private String getProductId(){ + return this.productId; + } + + /** + * 商品SKU + */ + private String getProductSku(){ + return this.productSku; + } + + /** + * 拼团库存 + */ + private String getTeamStock(){ + return this.teamStock; + } + + /** + * 拼团价格 + */ + private String getTeamPrice(){ + return this.teamPrice; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java new file mode 100644 index 0000000..206b212 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java @@ -0,0 +1,307 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 拼团免单策略 +* @TableName team_strategy_exemption +*/ +public class TeamStrategyExemption implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 持续时间 + */ + @NotNull(message="[持续时间]不能为空") + @ApiModelProperty("持续时间") + private Integer duration; + /** + * 免单人数 + */ + @NotNull(message="[免单人数]不能为空") + @ApiModelProperty("免单人数") + private Integer exemptionNumber; + /** + * 最大购买量 + */ + @NotNull(message="[最大购买量]不能为空") + @ApiModelProperty("最大购买量") + private Integer maxBuy; + /** + * 单次购买量 + */ + @NotNull(message="[单次购买量]不能为空") + @ApiModelProperty("单次购买量") + private Integer oneBuy; + /** + * 虚拟人数 + */ + @NotNull(message="[虚拟人数]不能为空") + @ApiModelProperty("虚拟人数") + private Integer virtualNumber; + /** + * 面单类型 + */ + @NotBlank(message="[面单类型]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("面单类型") + @Length(max= 32,message="编码长度不能超过32") + private String type; + /** + * 返款阶梯 + */ + @Size(max= -1,message="编码长度不能超过-1") + @ApiModelProperty("返款阶梯") + @Length(max= -1,message="编码长度不能超过-1") + private String ruleInfo; + /** + * 策略状态 + */ + @NotBlank(message="[策略状态]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("策略状态") + @Length(max= 32,message="编码长度不能超过32") + private String status; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 持续时间 + */ + private void setDuration(Integer duration){ + this.duration = duration; + } + + /** + * 免单人数 + */ + private void setExemptionNumber(Integer exemptionNumber){ + this.exemptionNumber = exemptionNumber; + } + + /** + * 最大购买量 + */ + private void setMaxBuy(Integer maxBuy){ + this.maxBuy = maxBuy; + } + + /** + * 单次购买量 + */ + private void setOneBuy(Integer oneBuy){ + this.oneBuy = oneBuy; + } + + /** + * 虚拟人数 + */ + private void setVirtualNumber(Integer virtualNumber){ + this.virtualNumber = virtualNumber; + } + + /** + * 面单类型 + */ + private void setType(String type){ + this.type = type; + } + + /** + * 返款阶梯 + */ + private void setRuleInfo(String ruleInfo){ + this.ruleInfo = ruleInfo; + } + + /** + * 策略状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 持续时间 + */ + private Integer getDuration(){ + return this.duration; + } + + /** + * 免单人数 + */ + private Integer getExemptionNumber(){ + return this.exemptionNumber; + } + + /** + * 最大购买量 + */ + private Integer getMaxBuy(){ + return this.maxBuy; + } + + /** + * 单次购买量 + */ + private Integer getOneBuy(){ + return this.oneBuy; + } + + /** + * 虚拟人数 + */ + private Integer getVirtualNumber(){ + return this.virtualNumber; + } + + /** + * 面单类型 + */ + private String getType(){ + return this.type; + } + + /** + * 返款阶梯 + */ + private String getRuleInfo(){ + return this.ruleInfo; + } + + /** + * 策略状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java new file mode 100644 index 0000000..d0c9d11 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java @@ -0,0 +1,266 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 百人策略 +* @TableName team_strategy_exemption_hundred +*/ +public class TeamStrategyExemptionHundred implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 持续时间 + */ + @NotNull(message="[持续时间]不能为空") + @ApiModelProperty("持续时间") + private Integer duration; + /** + * 最大购买量 + */ + @NotNull(message="[最大购买量]不能为空") + @ApiModelProperty("最大购买量") + private Integer maxBuy; + /** + * 单次购买量 + */ + @NotNull(message="[单次购买量]不能为空") + @ApiModelProperty("单次购买量") + private Integer oneBuy; + /** + * 虚拟人数 + */ + @NotNull(message="[虚拟人数]不能为空") + @ApiModelProperty("虚拟人数") + private Integer virtualNumber; + /** + * 策略状态 + */ + @NotBlank(message="[策略状态]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("策略状态") + @Length(max= 32,message="编码长度不能超过32") + private String status; + /** + * 规则信息 + */ + @NotBlank(message="[规则信息]不能为空") + @Size(max= -1,message="编码长度不能超过-1") + @ApiModelProperty("规则信息") + @Length(max= -1,message="编码长度不能超过-1") + private String ruleInfo; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 持续时间 + */ + private void setDuration(Integer duration){ + this.duration = duration; + } + + /** + * 最大购买量 + */ + private void setMaxBuy(Integer maxBuy){ + this.maxBuy = maxBuy; + } + + /** + * 单次购买量 + */ + private void setOneBuy(Integer oneBuy){ + this.oneBuy = oneBuy; + } + + /** + * 虚拟人数 + */ + private void setVirtualNumber(Integer virtualNumber){ + this.virtualNumber = virtualNumber; + } + + /** + * 策略状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 规则信息 + */ + private void setRuleInfo(String ruleInfo){ + this.ruleInfo = ruleInfo; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 持续时间 + */ + private Integer getDuration(){ + return this.duration; + } + + /** + * 最大购买量 + */ + private Integer getMaxBuy(){ + return this.maxBuy; + } + + /** + * 单次购买量 + */ + private Integer getOneBuy(){ + return this.oneBuy; + } + + /** + * 虚拟人数 + */ + private Integer getVirtualNumber(){ + return this.virtualNumber; + } + + /** + * 策略状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 规则信息 + */ + private String getRuleInfo(){ + return this.ruleInfo; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java new file mode 100644 index 0000000..da14375 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java @@ -0,0 +1,264 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 普通策略 +* @TableName team_strategy_exemption_ordinary +*/ +public class TeamStrategyExemptionOrdinary implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 持续时间 + */ + @NotNull(message="[持续时间]不能为空") + @ApiModelProperty("持续时间") + private Integer duration; + /** + * 成团人数 + */ + @NotNull(message="[成团人数]不能为空") + @ApiModelProperty("成团人数") + private Integer teamNumber; + /** + * 最大购买量 + */ + @NotNull(message="[最大购买量]不能为空") + @ApiModelProperty("最大购买量") + private Integer maxBuy; + /** + * 单次购买量 + */ + @NotNull(message="[单次购买量]不能为空") + @ApiModelProperty("单次购买量") + private Integer oneBuy; + /** + * 虚拟人数 + */ + @NotNull(message="[虚拟人数]不能为空") + @ApiModelProperty("虚拟人数") + private Integer virtualNumber; + /** + * 策略状态 + */ + @NotBlank(message="[策略状态]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("策略状态") + @Length(max= 32,message="编码长度不能超过32") + private String status; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 持续时间 + */ + private void setDuration(Integer duration){ + this.duration = duration; + } + + /** + * 成团人数 + */ + private void setTeamNumber(Integer teamNumber){ + this.teamNumber = teamNumber; + } + + /** + * 最大购买量 + */ + private void setMaxBuy(Integer maxBuy){ + this.maxBuy = maxBuy; + } + + /** + * 单次购买量 + */ + private void setOneBuy(Integer oneBuy){ + this.oneBuy = oneBuy; + } + + /** + * 虚拟人数 + */ + private void setVirtualNumber(Integer virtualNumber){ + this.virtualNumber = virtualNumber; + } + + /** + * 策略状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 持续时间 + */ + private Integer getDuration(){ + return this.duration; + } + + /** + * 成团人数 + */ + private Integer getTeamNumber(){ + return this.teamNumber; + } + + /** + * 最大购买量 + */ + private Integer getMaxBuy(){ + return this.maxBuy; + } + + /** + * 单次购买量 + */ + private Integer getOneBuy(){ + return this.oneBuy; + } + + /** + * 虚拟人数 + */ + private Integer getVirtualNumber(){ + return this.virtualNumber; + } + + /** + * 策略状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java new file mode 100644 index 0000000..e4726eb --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java @@ -0,0 +1,15 @@ +package com.muyu.marketing.domain.model; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ActivityTeamInfoListModel { + private Integer id; + private String name; + private String addTeamNumber; + private String attendNumber; + private Date endTime; + private String status; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java new file mode 100644 index 0000000..a83228b --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java @@ -0,0 +1,24 @@ +package com.muyu.marketing.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import lombok.*; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ActivityTeamInfoListQueryModel extends QueryModel { + + /** + * 搜索关键词 + */ + private String keyWord; + + /** + * 活动转态 + */ + private Integer status; + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoReqListReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoReqListReq.java new file mode 100644 index 0000000..66cfede --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoReqListReq.java @@ -0,0 +1,43 @@ +package com.muyu.marketing.domain.req; + + +import com.muyu.common.core.web.page.PageDomain; +import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; +import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; +import lombok.*; + +import java.io.Serializable; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class TeamInfoReqListReq extends PageDomain { + + /** + * 搜索关键词 + */ + private String keyWord; + + /** + * 活动转态 + */ + private Integer status; + + public ActivityTeamInfoListQueryModel activityTeamInfoListModel (){ + ActivityTeamInfoListQueryModel build = ActivityTeamInfoListQueryModel.builder() + .keyWord(this.keyWord) + .status(this.status) + .build(); + build.domainBuild(this); + return ActivityTeamInfoListQueryModel.builder() + .keyWord(this.keyWord) + .status(this.status) + .build() + .domainBuild(this); + + } + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java new file mode 100644 index 0000000..d612101 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java @@ -0,0 +1,61 @@ +package com.muyu.marketing.domain.resp; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.marketing.domain.ActivityTeamInfo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName("team_info") +public class TeamInfoListResp { + /** + * 拼团活动Id + */ + private String id; + /** + * 拼团名称 + */ + private String name; + /** + * 拼团商品图片 + */ + private String productimage; + /** + * 商品价格 + */ + private String productPrice; + /** + * 拼团价格 + */ + private String teamPrice; + /** + * 拼团人数 + */ + private String openTeamNumber; + /** + * 开团人数 + */ + private String addTeamBumber; + /** + * 参团人数 + */ + private String teamStock; + /** + * 剩余库存 + */ + private String remainStock; + /** + * 团购结束时间 + */ + private String endTime; + /** + * 团购状态 + */ + private String status; + +} diff --git a/muyu-modules/muyu-marketing/marketing-remote/pom.xml b/muyu-modules/muyu-marketing/marketing-remote/pom.xml new file mode 100644 index 0000000..e9c93f2 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-remote/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.muyu + muyu-marketing + 3.6.3 + + + marketing-remote + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-marketing/marketing-remote/src/main/java/com/muyu/Main.java b/muyu-modules/muyu-marketing/marketing-remote/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..75fcd65 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-remote/src/main/java/com/muyu/Main.java @@ -0,0 +1,7 @@ +package com.muyu; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/muyu-modules/muyu-marketing/marketing-server/pom.xml b/muyu-modules/muyu-marketing/marketing-server/pom.xml new file mode 100644 index 0000000..9ac0417 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/pom.xml @@ -0,0 +1,119 @@ + + + + com.muyu + muyu-marketing + 3.6.3 + + 4.0.0 + + marketing-server + + + marketing-server营销模块 + + + + + + com.muyu + marketing-common + 3.6.3 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + com.dtflys.forest + forest-spring-boot-starter + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketingApplication.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketingApplication.java new file mode 100644 index 0000000..8f5f255 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketingApplication.java @@ -0,0 +1,22 @@ +package com.muyu.marketing; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author muyu + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class MuYuMarketingApplication { + public static void main (String[] args) { + SpringApplication.run(MuYuMarketingApplication.class, args); + } +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamController.java new file mode 100644 index 0000000..ccfab02 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamController.java @@ -0,0 +1,28 @@ +package com.muyu.marketing.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; +import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; +import com.muyu.marketing.domain.req.TeamInfoReqListReq; +import com.muyu.marketing.service.ActivityTeamInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/team") +public class ActivityTeamController { + @Autowired + private ActivityTeamInfoService activityTeamInfoService; + @PostMapping("list") + public Result list(@RequestBody TeamInfoReqListReq teamInfoReqListReq){ + ActivityTeamInfoListQueryModel queryModel = new ActivityTeamInfoListQueryModel(); + queryModel.domainBuild(teamInfoReqListReq); + queryModel.setKeyWord(teamInfoReqListReq.getKeyWord()); + queryModel.setStatus(teamInfoReqListReq.getStatus()); + activityTeamInfoService.query(queryModel); + return Result.success(); + } +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/TeamInfoController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/TeamInfoController.java new file mode 100644 index 0000000..d4bc51a --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/TeamInfoController.java @@ -0,0 +1,51 @@ +package com.muyu.marketing.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.marketing.domain.resp.TeamInfoListResp; +import com.muyu.marketing.service.TeamInfoService; +import com.muyu.marketing.domain.ActivityTeamInfo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(tags = "商品拼团信息") +@RestController +@RequestMapping("/teams") +public class TeamInfoController extends BaseController { + @Autowired + private TeamInfoService activityTeamInfoService; + + @PostMapping("list") + public Result list(@RequestBody TeamInfoListResp activityTeamInfo){ + Result> list = activityTeamInfoService.list(activityTeamInfo); + return list; + } + + + + @PostMapping("add") + public Result add(@RequestBody TeamInfoListResp activityTeamInfo){ + return activityTeamInfoService.add(activityTeamInfo); + } + + /** + * 拼团数据回显 + */ + @PostMapping("selectById/{id}") + public Result selectById(@PathVariable Integer id){ + return activityTeamInfoService.selectById(id); + } + + /** + * 删除 + * @param id + * @return + */ + @DeleteMapping("del/{id}") + public Result del(@PathVariable Integer id){ + return toAjax( activityTeamInfoService.removeById(id)); + } +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/mapper/ActivityInfoMapper.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/mapper/ActivityInfoMapper.java new file mode 100644 index 0000000..cd46b99 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/mapper/ActivityInfoMapper.java @@ -0,0 +1,7 @@ +package com.muyu.marketing.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.marketing.domain.ActivityTeamInfo; + +public interface ActivityInfoMapper extends BaseMapper { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/mapper/TeamInfoMapper.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/mapper/TeamInfoMapper.java new file mode 100644 index 0000000..e015545 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/mapper/TeamInfoMapper.java @@ -0,0 +1,8 @@ +package com.muyu.marketing.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.resp.TeamInfoListResp; + +public interface TeamInfoMapper extends BaseMapper { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityOpenInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityOpenInfoService.java new file mode 100644 index 0000000..76fb098 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityOpenInfoService.java @@ -0,0 +1,4 @@ +package com.muyu.marketing.service; + +public interface ActivityOpenInfoService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamInfoService.java new file mode 100644 index 0000000..16d9c23 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamInfoService.java @@ -0,0 +1,14 @@ +package com.muyu.marketing.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; + +import java.util.List; + +public interface ActivityTeamInfoService extends IService { + + + public TableDataInfo query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel); +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamProductSkuInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamProductSkuInfoService.java new file mode 100644 index 0000000..545a2c1 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamProductSkuInfoService.java @@ -0,0 +1,4 @@ +package com.muyu.marketing.service; + +public interface ActivityTeamProductSkuInfoService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamInfoService.java new file mode 100644 index 0000000..65f0e5e --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamInfoService.java @@ -0,0 +1,23 @@ +package com.muyu.marketing.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.domain.Result; +import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.resp.TeamInfoListResp; + +import java.util.List; + +public interface TeamInfoService extends IService { + + /** + * 商品拼团信息列表 + * @param activityTeamInfo + * @return + */ + Result> list(TeamInfoListResp activityTeamInfo); + + Result add(TeamInfoListResp activityTeamInfo); + + Result selectById(Integer id); + +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionHundredService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionHundredService.java new file mode 100644 index 0000000..89c6a87 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionHundredService.java @@ -0,0 +1,4 @@ +package com.muyu.marketing.service; + +public interface TeamStrategyExemptionHundredService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionOrdinaryService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionOrdinaryService.java new file mode 100644 index 0000000..17dcec0 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionOrdinaryService.java @@ -0,0 +1,4 @@ +package com.muyu.marketing.service; + +public interface TeamStrategyExemptionOrdinaryService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionService.java new file mode 100644 index 0000000..f3db8c1 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/TeamStrategyExemptionService.java @@ -0,0 +1,4 @@ +package com.muyu.marketing.service; + +public interface TeamStrategyExemptionService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityOpenInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityOpenInfoServiceImpl.java new file mode 100644 index 0000000..4a51f46 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityOpenInfoServiceImpl.java @@ -0,0 +1,6 @@ +package com.muyu.marketing.service.impl; + +import com.muyu.marketing.service.ActivityOpenInfoService; + +public class ActivityOpenInfoServiceImpl implements ActivityOpenInfoService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java new file mode 100644 index 0000000..30402a7 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java @@ -0,0 +1,51 @@ +package com.muyu.marketing.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; +import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; +import com.muyu.marketing.mapper.ActivityInfoMapper; +import com.muyu.marketing.service.ActivityTeamInfoService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@Service +public class ActivityTeamInfoServiceImpl extends ServiceImpl implements ActivityTeamInfoService { + + public TableDataInfo query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel) { + Page page = new Page<>(); + page.setCurrent(activityTeamInfoListQueryModel.getPageNum()); + page.setSize(activityTeamInfoListQueryModel.getPageSize()); + activityTeamInfoListQueryModel.getOrderByColumn(); + activityTeamInfoListQueryModel.isAsc(); + page.setOrders(Arrays.asList(new OrderItem())); + Page activityTeamInfoPage = this.page(new Page(), new LambdaQueryWrapper()); + + ArrayList list = new ArrayList<>(); + for (ActivityTeamInfo activityTeamInfo : list) { + ActivityTeamInfoListModel activityTeamInfoListModel = new ActivityTeamInfoListModel(); + activityTeamInfoListModel.setId(activityTeamInfo.getId()); + activityTeamInfoListModel.setName(activityTeamInfo.getName()); + activityTeamInfoListModel.setAddTeamNumber("00"); + activityTeamInfoListModel.setAttendNumber("00"); + activityTeamInfoListModel.setEndTime(activityTeamInfo.getEndTime()); + activityTeamInfoListModel.setStatus(activityTeamInfo.getStatus()); + } + + TableDataInfo tableDataInfo = new TableDataInfo<>(); + tableDataInfo.setTotal(activityTeamInfoPage.getTotal()); + tableDataInfo.setRows(activityTeamInfoPage.getRecords()); + + return tableDataInfo; + + } +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamProductSkuInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamProductSkuInfoServiceImpl.java new file mode 100644 index 0000000..627b24b --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamProductSkuInfoServiceImpl.java @@ -0,0 +1,6 @@ +package com.muyu.marketing.service.impl; + +import com.muyu.marketing.service.ActivityTeamProductSkuInfoService; + +public class ActivityTeamProductSkuInfoServiceImpl implements ActivityTeamProductSkuInfoService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamInfoServiceImpl.java new file mode 100644 index 0000000..bea6850 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamInfoServiceImpl.java @@ -0,0 +1,40 @@ +package com.muyu.marketing.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.domain.Result; +import com.muyu.marketing.domain.resp.TeamInfoListResp; +import com.muyu.marketing.mapper.TeamInfoMapper; +import com.muyu.marketing.service.TeamInfoService; +import com.muyu.marketing.domain.ActivityTeamInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; + + +@Service +public class TeamInfoServiceImpl extends ServiceImpl implements TeamInfoService { + @Autowired + private TeamInfoMapper activityTeamInfoMapper; + + @Override + public Result> list(TeamInfoListResp activityTeamInfo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + List list = this.list(); + return Result.success(list); + } + + @Override + public Result add(TeamInfoListResp activityTeamInfo) { + activityTeamInfoMapper.insert(activityTeamInfo); + return Result.success(0,"拼团成功"); + } + + @Override + public Result selectById(Integer id) { + return Result.success(activityTeamInfoMapper.selectById(id)); + } + +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionHundredServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionHundredServiceImpl.java new file mode 100644 index 0000000..04ced23 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionHundredServiceImpl.java @@ -0,0 +1,6 @@ +package com.muyu.marketing.service.impl; + +import com.muyu.marketing.service.TeamStrategyExemptionHundredService; + +public class TeamStrategyExemptionHundredServiceImpl implements TeamStrategyExemptionHundredService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java new file mode 100644 index 0000000..eac478e --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java @@ -0,0 +1,6 @@ +package com.muyu.marketing.service.impl; + +import com.muyu.marketing.service.TeamStrategyExemptionOrdinaryService; + +public class TeamStrategyExemptionOrdinaryServiceImpl implements TeamStrategyExemptionOrdinaryService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionServiceImpl.java new file mode 100644 index 0000000..14a2d50 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/TeamStrategyExemptionServiceImpl.java @@ -0,0 +1,6 @@ +package com.muyu.marketing.service.impl; + +import com.muyu.marketing.service.TeamStrategyExemptionService; + +public class TeamStrategyExemptionServiceImpl implements TeamStrategyExemptionService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/banner.txt b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..e22914f --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9209 + +# Spring +spring: + application: + # 应用名称 + name: muyu-marketing + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 1.94.29.101:8848 + config: + # 配置中心地址 + server-addr: 1.94.29.101:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/logback.xml b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/logback.xml new file mode 100644 index 0000000..aa340cd --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/mapper/marketing/ActivityTeamInfoMapper.xml b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/mapper/marketing/ActivityTeamInfoMapper.xml new file mode 100644 index 0000000..9883000 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/mapper/marketing/ActivityTeamInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/muyu-modules/muyu-marketing/pom.xml b/muyu-modules/muyu-marketing/pom.xml new file mode 100644 index 0000000..1ba558d --- /dev/null +++ b/muyu-modules/muyu-marketing/pom.xml @@ -0,0 +1,26 @@ + + + + com.muyu + muyu-modules + 3.6.3 + + pom + + marketing-common + marketing-remote + marketing-server + + 4.0.0 + + muyu-marketing + + + muyu-modules-marketing系统模块 + + + + + diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java index 156bd38..7d141b9 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java @@ -132,7 +132,7 @@ public class ProjectInfo extends BaseEntity { /** * 修改构造器 */ - public static ProjectInfo editBuild(Long id, ProjectInfoEditReq projectInfoEditReq){ + public static ProjectInfo editBuild(Long id, ProjectAddModel projectInfoEditReq){ return ProjectInfo.builder() .id(id) .name(projectInfoEditReq.getName()) diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/UpdAttributeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/UpdAttributeInfo.java new file mode 100644 index 0000000..3ca5217 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/UpdAttributeInfo.java @@ -0,0 +1,28 @@ +package com.muyu.product.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class UpdAttributeInfo { + + /** 属性编号 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "属性编号", value = "属性编号") + private Long id; + + /** 属性名 */ + @Excel(name = "属性名") + @ApiModelProperty(name = "属性名", value = "属性名", required = true) + private String name; +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java index 33bc029..16c1390 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ProjectAddModel.java @@ -1,6 +1,8 @@ package com.muyu.product.domain.model; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.product.domain.ProjectInfo; +import com.muyu.product.domain.req.ProjectInfoEditReq; import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.SuperBuilder; @@ -56,4 +58,24 @@ public class ProjectAddModel extends BaseEntity { /** 品牌 */ @ApiModelProperty(name = "品牌", value = "品牌") private Long brandId; + + + /** + * 修改构造器 + */ + public static ProjectInfo editBuild(Long id, ProjectAddModel projectInfoEditReq){ + return ProjectInfo.builder() + .id(id) + .name(projectInfoEditReq.getName()) + .introduction(projectInfoEditReq.getIntroduction()) + .mianType(projectInfoEditReq.getMianType()) + .parentType(projectInfoEditReq.getParentType()) + .type(projectInfoEditReq.getType()) + .image(projectInfoEditReq.getImage()) + .carouselImages(projectInfoEditReq.getCarouselImages()) + .status(projectInfoEditReq.getStatus()) + .ruleId(projectInfoEditReq.getRuleId()) + .brandId(projectInfoEditReq.getBrandId()) + .build(); + } } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java index 4711de1..7ac110e 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java @@ -1,5 +1,8 @@ package com.muyu.product.domain.req; +import com.muyu.product.domain.ProjectSkuInfo; +import com.muyu.product.domain.UpdAttributeInfo; +import com.muyu.product.domain.model.ProjectAddModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -8,6 +11,8 @@ import lombok.experimental.SuperBuilder; import io.swagger.annotations.*; import com.muyu.common.core.web.domain.BaseEntity; +import java.util.List; + /** * 商品信息对象 project_info * @@ -19,48 +24,13 @@ import com.muyu.common.core.web.domain.BaseEntity; @NoArgsConstructor @AllArgsConstructor @ApiModel(value = "ProjectInfoEditReq", description = "商品信息") -public class ProjectInfoEditReq extends BaseEntity { +public class ProjectInfoEditReq extends BaseEntity { private static final long serialVersionUID = 1L; - /** 商品名称 */ - @ApiModelProperty(name = "商品名称", value = "商品名称") - private String name; + private ProjectAddModel projectAddModel; + private List attrValueList; + private List productSkuList; - /** 商品描述 */ - @ApiModelProperty(name = "商品描述", value = "商品描述") - private String introduction; - - /** 主类型 */ - @ApiModelProperty(name = "主类型", value = "主类型") - private Long mianType; - - /** 父类型 */ - @ApiModelProperty(name = "父类型", value = "父类型") - private Long parentType; - - /** 商品类型 */ - @ApiModelProperty(name = "商品类型", value = "商品类型") - private Long type; - - /** 商品图片 */ - @ApiModelProperty(name = "商品图片", value = "商品图片") - private String image; - - /** 商品轮播图 */ - @ApiModelProperty(name = "商品轮播图", value = "商品轮播图") - private String carouselImages; - - /** 商品状态 */ - @ApiModelProperty(name = "商品状态", value = "商品状态") - private String status; - - /** 规格 */ - @ApiModelProperty(name = "规格", value = "规格") - private Long ruleId; - - /** 品牌 */ - @ApiModelProperty(name = "品牌", value = "品牌") - private Long brandId; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectInfoListResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectInfoListResp.java new file mode 100644 index 0000000..07a35e8 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectInfoListResp.java @@ -0,0 +1,26 @@ +package com.muyu.product.domain.resp; + +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +public class ProjectInfoListResp { + private Long id; + private String name; + private String introduction; + private Long mianType; + private Long parentType; + private Long type; + private String image; + private String carouselImages; + private String status; + private Long ruleId; + private Long brandId; + + public String mianTypeName; + private String parentTypeName; + private String typeName; + private String ruleName; + private String brandName; +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java index f1e3d62..4594145 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.muyu.product.cache.ProjectInfoCache; import com.muyu.product.domain.resp.ProjectDetailResp; +import com.muyu.product.domain.resp.ProjectInfoListResp; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -50,9 +51,9 @@ public class ProjectInfoController extends BaseController { @ApiOperation("获取商品信息列表") @RequiresPermissions("product:info:list") @GetMapping("/list") - public Result> list(ProjectInfoQueryReq projectInfoQueryReq) { + public Result> list(ProjectInfoQueryReq projectInfoQueryReq) { startPage(); - List list = projectInfoService.list(ProjectInfo.queryBuild(projectInfoQueryReq)); + List list = projectInfoService.pageInfo(ProjectInfo.queryBuild(projectInfoQueryReq)); return getDataTable(list); } @@ -99,7 +100,8 @@ public class ProjectInfoController extends BaseController { @GetMapping(value = "/detail/{id}") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) public Result getDetailInfo(@PathVariable("id") Long id) { - return Result.success(projectInfoService.getDetailInfo(id)); + ProjectDetailResp detailInfo = projectInfoService.getDetailInfo(id); + return Result.success(detailInfo); } /** @@ -110,7 +112,7 @@ public class ProjectInfoController extends BaseController { @PostMapping @ApiOperation("新增商品信息") public Result add(@RequestBody ProjectInfoSaveReq projectInfoSaveReq) { - return toAjax(projectInfoService.save(projectInfoSaveReq)); + return (projectInfoService.add(projectInfoSaveReq)); } /** @@ -121,7 +123,7 @@ public class ProjectInfoController extends BaseController { @PutMapping("/{id}") @ApiOperation("修改商品信息") public Result edit(@PathVariable Long id, @RequestBody ProjectInfoEditReq projectInfoEditReq) { - return toAjax(projectInfoService.updateById(ProjectInfo.editBuild(id,projectInfoEditReq))); + return projectInfoService.updAll(id,projectInfoEditReq); } /** diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java index 0924c9e..431a0ee 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java @@ -1,10 +1,14 @@ package com.muyu.product.service; import java.util.List; + +import com.muyu.common.core.domain.Result; import com.muyu.product.domain.ProjectInfo; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.product.domain.req.ProjectInfoEditReq; import com.muyu.product.domain.req.ProjectInfoSaveReq; import com.muyu.product.domain.resp.ProjectDetailResp; +import com.muyu.product.domain.resp.ProjectInfoListResp; /** * 商品信息Service接口 @@ -28,10 +32,19 @@ public interface ProjectInfoService extends IService { */ boolean save (ProjectInfoSaveReq projectInfoSaveReq); + + Result add(ProjectInfoSaveReq projectInfoSaveReq); /** * 通过商品ID获取商品详情 * @param id 商品ID * @return 商品详情 */ ProjectDetailResp getDetailInfo (Long id); + + + Result updAll(Long id, ProjectInfoEditReq projectInfoEditReq); + + + List pageInfo(ProjectInfo projectInfo); + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java index 448a3d9..4fa5916 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java @@ -2,15 +2,23 @@ package com.muyu.product.service.impl; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; +import java.util.stream.Stream; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; +import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.product.domain.*; import com.muyu.product.domain.model.*; +import com.muyu.product.domain.req.ProjectInfoEditReq; import com.muyu.product.domain.req.ProjectInfoSaveReq; import com.muyu.product.domain.resp.CategoryCommonElementResp; import com.muyu.product.domain.resp.ProjectDetailResp; +import com.muyu.product.domain.resp.ProjectInfoListResp; +import com.muyu.product.mapper.RuleInfoMapper; import com.muyu.product.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -18,6 +26,7 @@ import org.springframework.stereotype.Service; import com.muyu.product.mapper.ProjectInfoMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.util.CollectionUtils; /** * 商品信息Service业务层处理 @@ -48,6 +57,11 @@ public class ProjectInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectInfo::getName,name); + List projectInfos = projectInfoMapper.selectList(queryWrapper); + if(projectInfos.size()>0){ + return Result.success(500,"姓名重复，禁止添加"); + } + + save(projectInfoSaveReq); + return Result.success(0,"添加成功"); + + } + + /** * 通过商品ID获取商品详情 * @@ -190,9 +220,6 @@ public class ProjectInfoServiceImpl extends ServiceImpl productAttributeList = this.asProductAttributeInfoService.list( new LambdaQueryWrapper<>() {{ @@ -229,4 +256,88 @@ public class ProjectInfoServiceImpl extends ServiceImpl objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); + objectLambdaQueryWrapper.eq(ProjectInfo::getName,name); + List projectInfos = projectInfoMapper.selectList(objectLambdaQueryWrapper); + if(projectInfos.size()>0){ + return Result.success(500,"姓名重复，禁止修改"); + }else { + this.updateById(ProjectAddModel.editBuild(id, projectInfoEditReq.getProjectAddModel())); + if (!CollectionUtils.isEmpty(projectInfoEditReq.getAttrValueList())) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().eq(AttributeInfo::getId, id); + + List attributeInfos = projectInfoEditReq.getAttrValueList().stream().filter(attributeInfoUpdModel -> !StringUtils.isBlank(attributeInfoUpdModel.getName())) + .map(itm -> { + AttributeInfo attributeInfo = new AttributeInfo(); + attributeInfo.setId(itm.getId()); + attributeInfo.setName(itm.getName()); + + return attributeInfo; + }).toList(); + attributeInfoService.updateBatchById(attributeInfos); + } + + if (!CollectionUtils.isEmpty(projectInfoEditReq.getProductSkuList())) { + List skuInfoList = projectInfoEditReq.getProductSkuList().stream().map(proProductSku -> { + ProjectSkuInfo skuInfo = new ProjectSkuInfo(); + skuInfo.setSku(proProductSku.getSku()); + skuInfo.setImage(proProductSku.getImage()); + skuInfo.setStock(proProductSku.getStock()); + skuInfo.setProjectId(proProductSku.getProjectId()); + return proProductSku; + }).toList(); + + skuInfoList.forEach(projectSkuInfo -> { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + if (!StringUtils.isEmpty(projectSkuInfo.getImage())) { + + } + updateWrapper.set(ProjectSkuInfo::getStock, projectSkuInfo.getStock()); + updateWrapper.set(ProjectSkuInfo::getPrice, projectSkuInfo.getPrice()); + updateWrapper.eq(ProjectSkuInfo::getSku, projectSkuInfo.getSku()); + projectSkuInfoService.update(null, updateWrapper); + }); + } + return Result.success(0, "修改成功"); + } + } + + @Override + public List pageInfo(ProjectInfo projectInfo) { + List list = list(projectInfo); + LinkedList objectLinkedList = new LinkedList<>(); + list.forEach( n ->{ + CategoryInfo mianTypeName = categoryInfoService.getById(n.getRuleId()); + CategoryInfo byIdParent = categoryInfoService.getById(n.getParentType()); + CategoryInfo typeNum = n.getType()!=null ? categoryInfoService.getById(n.getType()) :null; + + RuleInfo ruleName = ruleInfoMapper.selectById(n.getRuleId()); + BrandInfo brandName = brandInfoService.getById(n.getBrandId()); + ProjectInfoListResp build = ProjectInfoListResp.builder() + .id(n.getId()) + .name(n.getName()) + .introduction(n.getIntroduction()) + .type(n.getType()) + .parentType(n.getParentType()) + .type(n.getType()) + .image(n.getImage()) + .carouselImages(n.getCarouselImages()) + .status(n.getStatus()) + .mianTypeName(mianTypeName != null ? brandName.getNam() :"") + .parentTypeName(byIdParent !=null ? byIdParent.getName(): "") + .typeName(typeNum != null ? typeNum.getName() : "") + .ruleName(ruleName != null ? ruleName.getName() :"") + .brandName(brandName != null ? brandName.getNam():"") + .build(); + objectLinkedList.add(build); + }); + + return objectLinkedList; + + } } diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 24447f2..ff15472 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -15,6 +15,7 @@ muyu-file muyu-product muyu-shop-cart + muyu-marketing muyu-modules diff --git a/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java b/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java new file mode 100644 index 0000000..b3bad35 --- /dev/null +++ b/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java @@ -0,0 +1,395 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 商品拼团信息 +* @TableName activity_team_info +*/ +public class ActivityTeamInfo implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 拼团名称 + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("拼团名称") + @Length(max= 255,message="编码长度不能超过255") + private String name; + /** + * 商品ID + */ + @NotNull(message="[商品ID]不能为空") + @ApiModelProperty("商品ID") + private Long productId; + /** + * 商品活动图 + */ + @NotBlank(message="[商品活动图]不能为空") + @Size(max= 128,message="编码长度不能超过128") + @ApiModelProperty("商品活动图") + @Length(max= 128,message="编码长度不能超过128") + private String productImage; + /** + * 活动简介 + */ + @Size(max= -1,message="编码长度不能超过-1") + @ApiModelProperty("活动简介") + @Length(max= -1,message="编码长度不能超过-1") + private String introduction; + /** + * 单位 + */ + @NotBlank(message="[单位]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("单位") + @Length(max= 255,message="编码长度不能超过255") + private String unit; + /** + * 轮播图 + */ + @NotBlank(message="[轮播图]不能为空") + @Size(max= -1,message="编码长度不能超过-1") + @ApiModelProperty("轮播图") + @Length(max= -1,message="编码长度不能超过-1") + private String imageList; + /** + * 活动结束时间 + */ + @NotNull(message="[活动结束时间]不能为空") + @ApiModelProperty("活动结束时间") + private Date endTime; + /** + * 活动排序 + */ + @NotNull(message="[活动排序]不能为空") + @ApiModelProperty("活动排序") + private Integer sort; + /** + * 活动详情 + */ + @Size(max= -1,message="编码长度不能超过-1") + @ApiModelProperty("活动详情") + @Length(max= -1,message="编码长度不能超过-1") + private String content; + /** + * 活动状态 + */ + @NotBlank(message="[活动状态]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("活动状态") + @Length(max= 32,message="编码长度不能超过32") + private String status; + /** + * 策略类型 + */ + @NotBlank(message="[策略类型]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("策略类型") + @Length(max= 32,message="编码长度不能超过32") + private String strategyType; + /** + * 策略ID + */ + @NotNull(message="[策略ID]不能为空") + @ApiModelProperty("策略ID") + private Long strategyId; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 拼团名称 + */ + private void setName(String name){ + this.name = name; + } + + /** + * 商品ID + */ + private void setProductId(Long productId){ + this.productId = productId; + } + + /** + * 商品活动图 + */ + private void setProductImage(String productImage){ + this.productImage = productImage; + } + + /** + * 活动简介 + */ + private void setIntroduction(String introduction){ + this.introduction = introduction; + } + + /** + * 单位 + */ + private void setUnit(String unit){ + this.unit = unit; + } + + /** + * 轮播图 + */ + private void setImageList(String imageList){ + this.imageList = imageList; + } + + /** + * 活动结束时间 + */ + private void setEndTime(Date endTime){ + this.endTime = endTime; + } + + /** + * 活动排序 + */ + private void setSort(Integer sort){ + this.sort = sort; + } + + /** + * 活动详情 + */ + private void setContent(String content){ + this.content = content; + } + + /** + * 活动状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 策略类型 + */ + private void setStrategyType(String strategyType){ + this.strategyType = strategyType; + } + + /** + * 策略ID + */ + private void setStrategyId(Long strategyId){ + this.strategyId = strategyId; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 拼团名称 + */ + private String getName(){ + return this.name; + } + + /** + * 商品ID + */ + private Long getProductId(){ + return this.productId; + } + + /** + * 商品活动图 + */ + private String getProductImage(){ + return this.productImage; + } + + /** + * 活动简介 + */ + private String getIntroduction(){ + return this.introduction; + } + + /** + * 单位 + */ + private String getUnit(){ + return this.unit; + } + + /** + * 轮播图 + */ + private String getImageList(){ + return this.imageList; + } + + /** + * 活动结束时间 + */ + private Date getEndTime(){ + return this.endTime; + } + + /** + * 活动排序 + */ + private Integer getSort(){ + return this.sort; + } + + /** + * 活动详情 + */ + private String getContent(){ + return this.content; + } + + /** + * 活动状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 策略类型 + */ + private String getStrategyType(){ + return this.strategyType; + } + + /** + * 策略ID + */ + private Long getStrategyId(){ + return this.strategyId; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + +} diff --git a/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java b/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java new file mode 100644 index 0000000..99d45b5 --- /dev/null +++ b/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java @@ -0,0 +1,379 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 团购活动执行表 +* @TableName activity_team_open_info +*/ +public class ActivityTeamOpenInfo implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 团购活动ID + */ + @NotNull(message="[团购活动ID]不能为空") + @ApiModelProperty("团购活动ID") + private Long teamId; + /** + * 团购类型 + */ + @NotBlank(message="[团购类型]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("团购类型") + @Length(max= 255,message="编码长度不能超过255") + private String teamType; + /** + * 团购策略 + */ + @NotBlank(message="[团购策略]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("团购策略") + @Length(max= 255,message="编码长度不能超过255") + private String teamStrategyId; + /** + * 参团类型 + */ + @NotBlank(message="[参团类型]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("参团类型") + @Length(max= 32,message="编码长度不能超过32") + private String executiveType; + /** + * 结束团购时间 + */ + @NotNull(message="[结束团购时间]不能为空") + @ApiModelProperty("结束团购时间") + private Date endTime; + /** + * 商品ID + */ + @NotBlank(message="[商品ID]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品ID") + @Length(max= 255,message="编码长度不能超过255") + private String productId; + /** + * 商品名称 + */ + @NotBlank(message="[商品名称]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品名称") + @Length(max= 255,message="编码长度不能超过255") + private String productName; + /** + * 商品规格 + */ + @NotBlank(message="[商品规格]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品规格") + @Length(max= 255,message="编码长度不能超过255") + private String productSku; + /** + * 开团标识 + */ + @NotBlank(message="[开团标识]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("开团标识") + @Length(max= 255,message="编码长度不能超过255") + private String key; + /** + * 订单ID + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("订单ID") + @Length(max= 255,message="编码长度不能超过255") + private String orderId; + /** + * 开团状态 + */ + @NotBlank(message="[开团状态]不能为空") + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("开团状态") + @Length(max= 255,message="编码长度不能超过255") + private String status; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 团购活动ID + */ + private void setTeamId(Long teamId){ + this.teamId = teamId; + } + + /** + * 团购类型 + */ + private void setTeamType(String teamType){ + this.teamType = teamType; + } + + /** + * 团购策略 + */ + private void setTeamStrategyId(String teamStrategyId){ + this.teamStrategyId = teamStrategyId; + } + + /** + * 参团类型 + */ + private void setExecutiveType(String executiveType){ + this.executiveType = executiveType; + } + + /** + * 结束团购时间 + */ + private void setEndTime(Date endTime){ + this.endTime = endTime; + } + + /** + * 商品ID + */ + private void setProductId(String productId){ + this.productId = productId; + } + + /** + * 商品名称 + */ + private void setProductName(String productName){ + this.productName = productName; + } + + /** + * 商品规格 + */ + private void setProductSku(String productSku){ + this.productSku = productSku; + } + + /** + * 开团标识 + */ + private void setKey(String key){ + this.key = key; + } + + /** + * 订单ID + */ + private void setOrderId(String orderId){ + this.orderId = orderId; + } + + /** + * 开团状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 团购活动ID + */ + private Long getTeamId(){ + return this.teamId; + } + + /** + * 团购类型 + */ + private String getTeamType(){ + return this.teamType; + } + + /** + * 团购策略 + */ + private String getTeamStrategyId(){ + return this.teamStrategyId; + } + + /** + * 参团类型 + */ + private String getExecutiveType(){ + return this.executiveType; + } + + /** + * 结束团购时间 + */ + private Date getEndTime(){ + return this.endTime; + } + + /** + * 商品ID + */ + private String getProductId(){ + return this.productId; + } + + /** + * 商品名称 + */ + private String getProductName(){ + return this.productName; + } + + /** + * 商品规格 + */ + private String getProductSku(){ + return this.productSku; + } + + /** + * 开团标识 + */ + private String getKey(){ + return this.key; + } + + /** + * 订单ID + */ + private String getOrderId(){ + return this.orderId; + } + + /** + * 开团状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java b/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java new file mode 100644 index 0000000..411b4ce --- /dev/null +++ b/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java @@ -0,0 +1,246 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 商品拼团规格信息表 +* @TableName activity_team_product_sku_info +*/ +public class ActivityTeamProductSkuInfo implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 活动ID + */ + @NotNull(message="[活动ID]不能为空") + @ApiModelProperty("活动ID") + private Long teamId; + /** + * 商品ID + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品ID") + @Length(max= 255,message="编码长度不能超过255") + private String productId; + /** + * 商品SKU + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("商品SKU") + @Length(max= 255,message="编码长度不能超过255") + private String productSku; + /** + * 拼团库存 + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("拼团库存") + @Length(max= 255,message="编码长度不能超过255") + private String teamStock; + /** + * 拼团价格 + */ + @Size(max= 255,message="编码长度不能超过255") + @ApiModelProperty("拼团价格") + @Length(max= 255,message="编码长度不能超过255") + private String teamPrice; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 活动ID + */ + private void setTeamId(Long teamId){ + this.teamId = teamId; + } + + /** + * 商品ID + */ + private void setProductId(String productId){ + this.productId = productId; + } + + /** + * 商品SKU + */ + private void setProductSku(String productSku){ + this.productSku = productSku; + } + + /** + * 拼团库存 + */ + private void setTeamStock(String teamStock){ + this.teamStock = teamStock; + } + + /** + * 拼团价格 + */ + private void setTeamPrice(String teamPrice){ + this.teamPrice = teamPrice; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 活动ID + */ + private Long getTeamId(){ + return this.teamId; + } + + /** + * 商品ID + */ + private String getProductId(){ + return this.productId; + } + + /** + * 商品SKU + */ + private String getProductSku(){ + return this.productSku; + } + + /** + * 拼团库存 + */ + private String getTeamStock(){ + return this.teamStock; + } + + /** + * 拼团价格 + */ + private String getTeamPrice(){ + return this.teamPrice; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java b/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java new file mode 100644 index 0000000..206b212 --- /dev/null +++ b/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java @@ -0,0 +1,307 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 拼团免单策略 +* @TableName team_strategy_exemption +*/ +public class TeamStrategyExemption implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 持续时间 + */ + @NotNull(message="[持续时间]不能为空") + @ApiModelProperty("持续时间") + private Integer duration; + /** + * 免单人数 + */ + @NotNull(message="[免单人数]不能为空") + @ApiModelProperty("免单人数") + private Integer exemptionNumber; + /** + * 最大购买量 + */ + @NotNull(message="[最大购买量]不能为空") + @ApiModelProperty("最大购买量") + private Integer maxBuy; + /** + * 单次购买量 + */ + @NotNull(message="[单次购买量]不能为空") + @ApiModelProperty("单次购买量") + private Integer oneBuy; + /** + * 虚拟人数 + */ + @NotNull(message="[虚拟人数]不能为空") + @ApiModelProperty("虚拟人数") + private Integer virtualNumber; + /** + * 面单类型 + */ + @NotBlank(message="[面单类型]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("面单类型") + @Length(max= 32,message="编码长度不能超过32") + private String type; + /** + * 返款阶梯 + */ + @Size(max= -1,message="编码长度不能超过-1") + @ApiModelProperty("返款阶梯") + @Length(max= -1,message="编码长度不能超过-1") + private String ruleInfo; + /** + * 策略状态 + */ + @NotBlank(message="[策略状态]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("策略状态") + @Length(max= 32,message="编码长度不能超过32") + private String status; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 持续时间 + */ + private void setDuration(Integer duration){ + this.duration = duration; + } + + /** + * 免单人数 + */ + private void setExemptionNumber(Integer exemptionNumber){ + this.exemptionNumber = exemptionNumber; + } + + /** + * 最大购买量 + */ + private void setMaxBuy(Integer maxBuy){ + this.maxBuy = maxBuy; + } + + /** + * 单次购买量 + */ + private void setOneBuy(Integer oneBuy){ + this.oneBuy = oneBuy; + } + + /** + * 虚拟人数 + */ + private void setVirtualNumber(Integer virtualNumber){ + this.virtualNumber = virtualNumber; + } + + /** + * 面单类型 + */ + private void setType(String type){ + this.type = type; + } + + /** + * 返款阶梯 + */ + private void setRuleInfo(String ruleInfo){ + this.ruleInfo = ruleInfo; + } + + /** + * 策略状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 持续时间 + */ + private Integer getDuration(){ + return this.duration; + } + + /** + * 免单人数 + */ + private Integer getExemptionNumber(){ + return this.exemptionNumber; + } + + /** + * 最大购买量 + */ + private Integer getMaxBuy(){ + return this.maxBuy; + } + + /** + * 单次购买量 + */ + private Integer getOneBuy(){ + return this.oneBuy; + } + + /** + * 虚拟人数 + */ + private Integer getVirtualNumber(){ + return this.virtualNumber; + } + + /** + * 面单类型 + */ + private String getType(){ + return this.type; + } + + /** + * 返款阶梯 + */ + private String getRuleInfo(){ + return this.ruleInfo; + } + + /** + * 策略状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java b/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java new file mode 100644 index 0000000..d0c9d11 --- /dev/null +++ b/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java @@ -0,0 +1,266 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 百人策略 +* @TableName team_strategy_exemption_hundred +*/ +public class TeamStrategyExemptionHundred implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 持续时间 + */ + @NotNull(message="[持续时间]不能为空") + @ApiModelProperty("持续时间") + private Integer duration; + /** + * 最大购买量 + */ + @NotNull(message="[最大购买量]不能为空") + @ApiModelProperty("最大购买量") + private Integer maxBuy; + /** + * 单次购买量 + */ + @NotNull(message="[单次购买量]不能为空") + @ApiModelProperty("单次购买量") + private Integer oneBuy; + /** + * 虚拟人数 + */ + @NotNull(message="[虚拟人数]不能为空") + @ApiModelProperty("虚拟人数") + private Integer virtualNumber; + /** + * 策略状态 + */ + @NotBlank(message="[策略状态]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("策略状态") + @Length(max= 32,message="编码长度不能超过32") + private String status; + /** + * 规则信息 + */ + @NotBlank(message="[规则信息]不能为空") + @Size(max= -1,message="编码长度不能超过-1") + @ApiModelProperty("规则信息") + @Length(max= -1,message="编码长度不能超过-1") + private String ruleInfo; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 持续时间 + */ + private void setDuration(Integer duration){ + this.duration = duration; + } + + /** + * 最大购买量 + */ + private void setMaxBuy(Integer maxBuy){ + this.maxBuy = maxBuy; + } + + /** + * 单次购买量 + */ + private void setOneBuy(Integer oneBuy){ + this.oneBuy = oneBuy; + } + + /** + * 虚拟人数 + */ + private void setVirtualNumber(Integer virtualNumber){ + this.virtualNumber = virtualNumber; + } + + /** + * 策略状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 规则信息 + */ + private void setRuleInfo(String ruleInfo){ + this.ruleInfo = ruleInfo; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 持续时间 + */ + private Integer getDuration(){ + return this.duration; + } + + /** + * 最大购买量 + */ + private Integer getMaxBuy(){ + return this.maxBuy; + } + + /** + * 单次购买量 + */ + private Integer getOneBuy(){ + return this.oneBuy; + } + + /** + * 虚拟人数 + */ + private Integer getVirtualNumber(){ + return this.virtualNumber; + } + + /** + * 策略状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 规则信息 + */ + private String getRuleInfo(){ + return this.ruleInfo; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +} diff --git a/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java b/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java new file mode 100644 index 0000000..da14375 --- /dev/null +++ b/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java @@ -0,0 +1,264 @@ +package com.muyu.marketing.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import javax.validation.constraints.NotNull; + +import java.io.Serializable; + +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.Length; + +/** +* 普通策略 +* @TableName team_strategy_exemption_ordinary +*/ +public class TeamStrategyExemptionOrdinary implements Serializable { + + /** + * 主键 + */ + @NotNull(message="[主键]不能为空") + @ApiModelProperty("主键") + private Integer id; + /** + * 持续时间 + */ + @NotNull(message="[持续时间]不能为空") + @ApiModelProperty("持续时间") + private Integer duration; + /** + * 成团人数 + */ + @NotNull(message="[成团人数]不能为空") + @ApiModelProperty("成团人数") + private Integer teamNumber; + /** + * 最大购买量 + */ + @NotNull(message="[最大购买量]不能为空") + @ApiModelProperty("最大购买量") + private Integer maxBuy; + /** + * 单次购买量 + */ + @NotNull(message="[单次购买量]不能为空") + @ApiModelProperty("单次购买量") + private Integer oneBuy; + /** + * 虚拟人数 + */ + @NotNull(message="[虚拟人数]不能为空") + @ApiModelProperty("虚拟人数") + private Integer virtualNumber; + /** + * 策略状态 + */ + @NotBlank(message="[策略状态]不能为空") + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("策略状态") + @Length(max= 32,message="编码长度不能超过32") + private String status; + /** + * 创建人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("创建人") + @Length(max= 32,message="编码长度不能超过32") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date createTime; + /** + * 修改人 + */ + @Size(max= 32,message="编码长度不能超过32") + @ApiModelProperty("修改人") + @Length(max= 32,message="编码长度不能超过32") + private String updateBy; + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date updateTime; + /** + * 备注 + */ + @Size(max= 900,message="编码长度不能超过900") + @ApiModelProperty("备注") + @Length(max= 900,message="编码长度不能超过900") + private String remark; + + /** + * 主键 + */ + private void setId(Integer id){ + this.id = id; + } + + /** + * 持续时间 + */ + private void setDuration(Integer duration){ + this.duration = duration; + } + + /** + * 成团人数 + */ + private void setTeamNumber(Integer teamNumber){ + this.teamNumber = teamNumber; + } + + /** + * 最大购买量 + */ + private void setMaxBuy(Integer maxBuy){ + this.maxBuy = maxBuy; + } + + /** + * 单次购买量 + */ + private void setOneBuy(Integer oneBuy){ + this.oneBuy = oneBuy; + } + + /** + * 虚拟人数 + */ + private void setVirtualNumber(Integer virtualNumber){ + this.virtualNumber = virtualNumber; + } + + /** + * 策略状态 + */ + private void setStatus(String status){ + this.status = status; + } + + /** + * 创建人 + */ + private void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + * 创建时间 + */ + private void setCreateTime(Date createTime){ + this.createTime = createTime; + } + + /** + * 修改人 + */ + private void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + * 修改时间 + */ + private void setUpdateTime(Date updateTime){ + this.updateTime = updateTime; + } + + /** + * 备注 + */ + private void setRemark(String remark){ + this.remark = remark; + } + + + /** + * 主键 + */ + private Integer getId(){ + return this.id; + } + + /** + * 持续时间 + */ + private Integer getDuration(){ + return this.duration; + } + + /** + * 成团人数 + */ + private Integer getTeamNumber(){ + return this.teamNumber; + } + + /** + * 最大购买量 + */ + private Integer getMaxBuy(){ + return this.maxBuy; + } + + /** + * 单次购买量 + */ + private Integer getOneBuy(){ + return this.oneBuy; + } + + /** + * 虚拟人数 + */ + private Integer getVirtualNumber(){ + return this.virtualNumber; + } + + /** + * 策略状态 + */ + private String getStatus(){ + return this.status; + } + + /** + * 创建人 + */ + private String getCreateBy(){ + return this.createBy; + } + + /** + * 创建时间 + */ + private Date getCreateTime(){ + return this.createTime; + } + + /** + * 修改人 + */ + private String getUpdateBy(){ + return this.updateBy; + } + + /** + * 修改时间 + */ + private Date getUpdateTime(){ + return this.updateTime; + } + + /** + * 备注 + */ + private String getRemark(){ + return this.remark; + } + +}