From c40c0bc0cfa4db5dd6bad327d77ec31b6d6787d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=A8=E8=9B=8B?= <14958938+qianqiao5-6-7@user.noreply.gitee.com> Date: Thu, 21 Nov 2024 22:38:46 +0800 Subject: [PATCH] 2204-11-20 (11.21) --- .../enums/market/team/TeamOpenTypeEnum.java | 28 ++++ .../muyu-gen/marketing-service/pom.xml | 126 ++++++++++++++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 28 ++++ .../marketing/domain/ActivityTeamInfo.java | 57 ++++++++ .../domain/ActivityTeamOpenInfo.java | 51 +++++++ .../domain/ActivityTeamProductSkuInfo.java | 41 ++++++ .../domain/TeamStrategyExemption.java | 51 +++++++ .../domain/TeamStrategyExemptionHundred.java | 44 ++++++ .../domain/TeamStrategyExemptionOrdinary.java | 43 ++++++ .../model/ActivityTeamInfoListModel.java | 56 ++++---- .../domain/model/TeamDiscountModel.java | 17 +++ .../ActivityTeamInfoController.java | 3 - .../service/ActivityTeamOpenInfoService.java | 18 ++- .../impl/ActivityTeamInfoServiceImpl.java | 28 ++-- .../impl/ActivityTeamOpenInfoServiceImpl.java | 37 +++++ 16 files changed, 591 insertions(+), 39 deletions(-) create mode 100644 muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/market/team/TeamOpenTypeEnum.java create mode 100644 muyu-modules/muyu-gen/marketing-service/pom.xml create mode 100644 muyu-modules/muyu-gen/marketing-service/src/main/resources/banner.txt create mode 100644 muyu-modules/muyu-gen/marketing-service/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamDiscountModel.java diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/market/team/TeamOpenTypeEnum.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/market/team/TeamOpenTypeEnum.java new file mode 100644 index 0000000..f8b7d60 --- /dev/null +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/market/team/TeamOpenTypeEnum.java @@ -0,0 +1,28 @@ +package com.muyu.common.core.enums.market.team; + +/** + * 参团类型枚举类 + */ + +public enum TeamOpenTypeEnum { + + TEAM_ADD("team_add","参团"), + TEAT_OPEN("team_open","开团"); + + private final String code; + private final String label; + + + public String code() { + return code; + } + + public String label() { + return label; + } + + TeamOpenTypeEnum(String code, String label) { + this.code = code; + this.label = label; + } +} diff --git a/muyu-modules/muyu-gen/marketing-service/pom.xml b/muyu-modules/muyu-gen/marketing-service/pom.xml new file mode 100644 index 0000000..a1185ef --- /dev/null +++ b/muyu-modules/muyu-gen/marketing-service/pom.xml @@ -0,0 +1,126 @@ + + + + com.muyu + muyu-marketing + 3.6.3 + + pom + + + + 4.0.0 + + marketing-service + + + + + + + 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 + + + + com.muyu + marketing-common + 3.6.3 + + + + com.muyu + marketing-remote + 3.6.3 + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + diff --git a/muyu-modules/muyu-gen/marketing-service/src/main/resources/banner.txt b/muyu-modules/muyu-gen/marketing-service/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-gen/marketing-service/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-gen/marketing-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/marketing-service/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..6a12b4c --- /dev/null +++ b/muyu-modules/muyu-gen/marketing-service/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9204 + +# Spring +spring: + application: + # 应用名称 + name: muyu-marketing + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 60.204.150.30:8848 + config: + # 配置中心地址 + server-addr: 60.204.150.30:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.marketing.mapper: DEBUG 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..73552d9 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java @@ -0,0 +1,57 @@ +package com.muyu.marketing.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.sql.Timestamp; +import java.sql.Date; +import java.sql.Time; + +/** 商品拼团*/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "activity_team_info",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ActivityTeamInfo", description = "商品拼团") +public class ActivityTeamInfo extends BaseEntity { + @TableId(type = IdType.AUTO) + /** 主键*/ + private long id; + /** 拼团名称*/ + private String name; + /** 商品ID*/ + private long productId; + /** 商品活动图*/ + private String productImage; + /** 活动简介*/ + private String introduction; + /** 单位*/ + private String unit; + /** 轮播图*/ + private String imageList; + /** 活动结束时间*/ + private Timestamp endTime; + /** 活动排序*/ + private long sort; + /** 活动详情*/ + private String content; + /** 活动状态*/ + private String status; + /** 策略类型*/ + private String strategyType; + /** 策略ID*/ + private long strategyId; + + + +} 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..ef5f4d2 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java @@ -0,0 +1,51 @@ +package com.muyu.marketing.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.sql.Timestamp; +/** 团购活动执行*/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "activity_team_open_info",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ActivityTeamOpenInfo", description = "团购活动执行") +public class ActivityTeamOpenInfo extends BaseEntity { + @TableId(type = IdType.AUTO) + /** 主键*/ + private long id; + /** 团购活动ID*/ + private long teamId; + /** 团购类型*/ + private String teamType; + /** 团购策略*/ + private String teamStrategyId; + /** 参团类型*/ + private String executiveType; + /** 结束团购时间*/ + private Timestamp endTime; + /** 商品ID*/ + private String productId; + /** 商品名称*/ + private String productName; + /** 商品规格*/ + private String productSku; + /** 开团标识*/ + private String key; + /** 订单ID*/ + private String orderId; + /** 开团状态*/ + private String status; + + +} 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..76d179a --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java @@ -0,0 +1,41 @@ +package com.muyu.marketing.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.sql.Timestamp; +import java.sql.Date; +import java.sql.Time; +/** 商品拼团规格信息*/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "activity_team_open_info",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ActivityTeamProductSkuInfo", description = "商品拼团规格信息") +public class ActivityTeamProductSkuInfo extends BaseEntity { + @TableId(type = IdType.AUTO) + /** 主键*/ + private long id; + /** 活动ID*/ + private long teamId; + /** 商品ID*/ + private String productId; + /** 商品SKU*/ + private String productSku; + /** 拼团库存*/ + private String teamStock; + /** 拼团价格*/ + private String teamPrice; + + +} 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..d8ca72c --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java @@ -0,0 +1,51 @@ +package com.muyu.marketing.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.sql.Timestamp; +import java.sql.Date; +import java.sql.Time; +/** 拼团免单策略*/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "team_strategy_exemption",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "TeamStrategyExemption", description = "拼团免单策略") +public class TeamStrategyExemption extends BaseEntity { + + @TableId(type = IdType.AUTO) + /** 主键*/ + private long id; + /** 持续时间*/ + private long duration; + /** 免单人数*/ + private long exemptionNumber; + /** 最大购买量*/ + private long maxBuy; + /** 单次购买量*/ + private long oneBuy; + /** 虚拟人数*/ + private long virtualNumber; + /** 面单类型*/ + private String type; + /** 返款阶梯*/ + private String ruleInfo; + /** 策略状态*/ + private String status; + + + + + +} 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..4c7be36 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java @@ -0,0 +1,44 @@ +package com.muyu.marketing.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.sql.Timestamp; +import java.sql.Date; +import java.sql.Time; +/** 百人策略*/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "team_strategy_exemption_hundred",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "TeamStrategyExemptionHundred", description = "百人策略") +public class TeamStrategyExemptionHundred extends BaseEntity { + + @TableId(type = IdType.AUTO) + /** 主键*/ + private long id; + /** 持续时间*/ + private long duration; + /** 最大购买量*/ + private long maxBuy; + /** 单次购买量*/ + private long oneBuy; + /** 虚拟人数*/ + private long virtualNumber; + /** 策略状态*/ + private String status; + /** 规则信息*/ + private String ruleInfo; + + +} 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..fecdd27 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java @@ -0,0 +1,43 @@ +package com.muyu.marketing.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.sql.Timestamp; +import java.sql.Date; +import java.sql.Time; +/** 普通策略*/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "team_strategy_exemption_ordinary",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "TeamStrategyExemptionOrdinary", description = "普通策略") +public class TeamStrategyExemptionOrdinary extends BaseEntity { + + /** 主键*/ + @TableId(value = "id",type = IdType.AUTO) + private long id; + /** 持续时间*/ + private long duration; + /** 成团人数*/ + private long teamNumber; + /** 最大购买量*/ + private long maxBuy; + /** 单次购买量*/ + private long oneBuy; + /** 虚拟人数*/ + private long virtualNumber; + /** 策略状态*/ + private String status; + +} 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 index a890460..f675828 100644 --- 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 @@ -7,7 +7,7 @@ import lombok.*; import lombok.experimental.SuperBuilder; -import java.sql.Timestamp; +import java.util.Date; /** * 团购活动 列表查询 结果模型 @@ -20,31 +20,41 @@ import java.sql.Timestamp; public class ActivityTeamInfoListModel extends QueryModel { @TableId(type = IdType.AUTO) - /** 主键*/ + /** 拼团活动id*/ private long id; /** 拼团名称*/ private String name; - /** 商品ID*/ - private long productId; - /** 商品活动图*/ - private String productImage; - /** 活动简介*/ - private String introduction; - /** 单位*/ - private String unit; - /** 轮播图*/ - private String imageList; + /** 参团人数*/ + private Long addTeamNumber; + /** 拼团人数*/ + private Long attendNumber; /** 活动结束时间*/ - private Timestamp endTime; - /** 活动排序*/ - private long sort; - /** 活动详情*/ - private String content; - /** 活动状态*/ - private String status; - /** 策略类型*/ - private String strategyType; - /** 策略ID*/ - private long strategyId; + private Date endTime; + /** 开团人数*/ + private Long openTeamNumber; + /** 拼团商品图片*/ + private String productImage; + /** + * 商品价格 + */ + private Double productPrice; + /** + * 商品库存 + */ + private Long remainStock; + /** + * 团购状态 + */ + private String status; + + /** + * 拼团价格 + */ + private Double teamPrice; + + /** + * 拼团库存 + */ + private Long teamStock; } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamDiscountModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamDiscountModel.java new file mode 100644 index 0000000..c6bd680 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamDiscountModel.java @@ -0,0 +1,17 @@ +package com.muyu.marketing.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** 团购活动 优惠模型*/ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TeamDiscountModel { + + + +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java index ef27c33..cbf7ea0 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java @@ -36,10 +36,7 @@ public class ActivityTeamInfoController { .name(teamInfoListReq.getName()) .status(teamInfoListReq.getStatus()) .build(); - TableDataInfo tableDataInfo = activityTeamInfoService.tabDateInfo(queryModel); - - return Result.success(tableDataInfo); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamOpenInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamOpenInfoService.java index 7ccc842..f526e8b 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamOpenInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamOpenInfoService.java @@ -1,4 +1,20 @@ package com.muyu.marketing.service; -public interface ActivityTeamOpenInfoService { +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.enums.market.team.TeamOpenTypeEnum; +import com.muyu.marketing.domain.ActivityTeamOpenInfo; + +public interface ActivityTeamOpenInfoService extends IService { + /** + * 开团类型 + * @param teamId + * @param teamOpenTypeEnum + * @return + */ + public Long getTeamTeamOpenInfoByTeamIdAndType(Long teamId, TeamOpenTypeEnum teamOpenTypeEnum); + + /** 根据Id获取开团数量*/ + public Long getTeamTypeNumberByTeamId(Long teamId); + /** 跟Id获取参团数量*/ + public Long getAddTeamTypeNumberByTeamId(Long teamId); } 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 index 935eb78..68f13bc 100644 --- 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 @@ -10,6 +10,7 @@ import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; import com.muyu.marketing.mapper.ActivityTeamInfoMapper; import com.muyu.marketing.service.ActivityTeamInfoService; +import com.muyu.marketing.service.ActivityTeamOpenInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +28,8 @@ implements ActivityTeamInfoService { @Autowired private ActivityTeamInfoMapper activityTeamInfoMapper; + @Autowired + private ActivityTeamOpenInfoService activityTeamOpenInfoService; /** * 团购活动列表 */ @@ -44,19 +47,20 @@ implements ActivityTeamInfoService { for (ActivityTeamInfo activityTeamInfo : activityTeamInfoList) { ActivityTeamInfoListModel activityTeamInfoListModel = new ActivityTeamInfoListModel(); - activityTeamInfoListModel.setId(activityTeamInfo.getId()); - activityTeamInfoListModel.setName(activityTeamInfo.getName()); - activityTeamInfoListModel.setProductImage(activityTeamInfo.getProductImage()); - activityTeamInfoListModel.setIntroduction(activityTeamInfo.getIntroduction()); - activityTeamInfoListModel.setUnit(activityTeamInfo.getUnit()); - activityTeamInfoListModel.setImageList(activityTeamInfo.getImageList()); - activityTeamInfoListModel.setEndTime(activityTeamInfo.getEndTime()); - activityTeamInfoListModel.setSort(activityTeamInfo.getSort()); - activityTeamInfoListModel.setContent(activityTeamInfo.getContent()); - activityTeamInfoListModel.setStatus(activityTeamInfo.getStatus()); - activityTeamInfoListModel.setStrategyType(activityTeamInfo.getStrategyType()); - activityTeamInfoListModel.setStrategyId(activityTeamInfo.getStrategyId()); + activityTeamInfoListModel.setId(activityTeamInfo.getId());//拼团活动id + activityTeamInfoListModel.setName(activityTeamInfo.getName());//拼团名称 + activityTeamInfoListModel.setAddTeamNumber(activityTeamOpenInfoService.getAddTeamTypeNumberByTeamId(activityTeamInfo.getId()));//参团人数 + activityTeamInfoListModel.setOpenTeamNumber(activityTeamOpenInfoService.getTeamTypeNumberByTeamId(activityTeamInfoListModel.getId()));//开团人数 + activityTeamInfoListModel.setAttendNumber(activityTeamInfoListModel.getAttendNumber());//拼团人数 + activityTeamInfoListModel.setEndTime(activityTeamInfo.getEndTime());//活动结束时间 + + activityTeamInfoListModel.setProductImage(activityTeamInfo.getProductImage());//拼团商品图片 + activityTeamInfoListModel.setProductPrice(0.00);//商品价格 + activityTeamInfoListModel.setRemainStock(0L);//商品库存 + activityTeamInfoListModel.setStatus(activityTeamInfo.getStatus());//团购状态 + activityTeamInfoListModel.setTeamPrice(0.00);//拼团价格 + activityTeamInfoListModel.setTeamStock(0L);//拼团库存 activityTeamInfoListModels.add(activityTeamInfoListModel); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamOpenInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamOpenInfoServiceImpl.java index f7dd95b..9228320 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamOpenInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamOpenInfoServiceImpl.java @@ -1,13 +1,50 @@ 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.enums.market.team.TeamOpenTypeEnum; import com.muyu.marketing.domain.ActivityTeamOpenInfo; import com.muyu.marketing.mapper.ActivityTeamOpenInfoMapper; import com.muyu.marketing.service.ActivityTeamOpenInfoService; import org.springframework.stereotype.Service; + + @Service public class ActivityTeamOpenInfoServiceImpl extends ServiceImpl implements ActivityTeamOpenInfoService { + /** + * 通过活动Id 和活动类型查询开团数量 + * @param teamId + * @param teamOpenTypeEnum + * @return + */ + @Override + public Long getTeamTeamOpenInfoByTeamIdAndType(Long teamId, TeamOpenTypeEnum teamOpenTypeEnum) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ActivityTeamOpenInfo::getTeamId,teamId); + queryWrapper.eq(ActivityTeamOpenInfo::getTeamType,teamOpenTypeEnum.code()); + return this.count(queryWrapper); + } + + /** + * 根据Id获取开团数量 + * @param teamId + * @return + */ + @Override + public Long getTeamTypeNumberByTeamId(Long teamId) { + return this.getTeamTeamOpenInfoByTeamIdAndType(teamId,TeamOpenTypeEnum.TEAT_OPEN); + } + + /** + * 跟Id获取参团数量 + */ + @Override + public Long getAddTeamTypeNumberByTeamId(Long teamId) { + return this.getTeamTeamOpenInfoByTeamIdAndType(teamId,TeamOpenTypeEnum.TEAM_ADD); + } + }