From a40991aec4570dfe537ab0343ee0a5f00f52f5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E6=9F=90?= <3086801962@qq.com> Date: Wed, 4 Dec 2024 15:13:15 +0800 Subject: [PATCH] =?UTF-8?q?12.4,=E7=AC=AC=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-auth/src/main/resources/bootstrap.yml | 4 +- .../com/muyu/gateway/config/CorsConfig.java | 58 +++++++++++++++++++ muyu-gateway/src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 4 +- .../muyu-gen/src/main/resources/bootstrap.yml | 4 +- .../muyu-job/src/main/resources/bootstrap.yml | 4 +- .../marketing/domain/ActivityTeamInfo.java | 1 + ...nHundred.java => TeamStrategyHundred.java} | 2 +- ...rdinary.java => TeamStrategyOrdinary.java} | 2 +- .../model/ActivityTeamInfoAddModel.java | 13 +++-- .../model/ActivityTeamInfoListModel.java | 23 ++++---- .../model/ActivityTeamInfoListQueryModel.java | 5 ++ .../model/ActivityTeamProductListMode.java | 35 +++++++++++ .../marketing/domain/req/TeamInfoListReq.java | 6 +- .../domain/resp/TeamInfoListResp.java | 6 +- .../remote/product/ProductInfoRemote.java | 20 +++++++ .../team/mapper/ActivityTeamInfoMapper.java | 2 - .../TeamStrategyExemptionHundredMapper.java | 7 +-- .../TeamStrategyExemptionOrdinaryMapper.java | 7 +-- .../team/service/ActivityTeamInfoService.java | 7 ++- .../ActivityTeamProductSkuInfoService.java | 1 - .../TeamStrategyExemptionHundredService.java | 8 --- .../TeamStrategyExemptionOrdinaryService.java | 7 --- .../service/TeamStrategyExemptionService.java | 4 +- .../service/TeamStrategyHundredService.java | 8 +++ .../service/TeamStrategyOrdinaryService.java | 8 +++ .../impl/ActivityTeamInfoServiceImpl.java | 8 +++ ...ActivityTeamProductSkuInfoServiceImpl.java | 4 -- ...amStrategyExemptionHundredServiceImpl.java | 16 ----- ...mStrategyExemptionOrdinaryServiceImpl.java | 13 ----- .../TeamStrategyExemptionServiceImpl.java | 31 +++++++++- .../impl/TeamStrategyHundredServiceImpl.java | 39 +++++++++++++ .../impl/TeamStrategyOrdinaryServiceImpl.java | 40 +++++++++++++ .../team/strategy/ActivityTeamStrategy.java | 40 +++++++++++++ .../impl/ActivityTeamStrategyImpl.java | 52 +++++++++++++++++ .../src/main/resources/bootstrap.yml | 6 +- .../com/muyu/product/domain/ProjectInfo.java | 4 ++ .../product/service/ProjectInfoService.java | 1 + .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 42 files changed, 415 insertions(+), 107 deletions(-) create mode 100644 muyu-gateway/src/main/java/com/muyu/gateway/config/CorsConfig.java rename muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/{TeamStrategyExemptionHundred.java => TeamStrategyHundred.java} (93%) rename muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/{TeamStrategyExemptionOrdinary.java => TeamStrategyOrdinary.java} (93%) create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductListMode.java create mode 100644 muyu-modules/muyu-marketing/marketing-remote/src/main/java/com/muyu/marketing/remote/product/ProductInfoRemote.java delete mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java delete mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java create mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java create mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java delete mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java delete mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java create mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java create mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java create mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java create mode 100644 muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 26bb01c..e514e6b 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/CorsConfig.java b/muyu-gateway/src/main/java/com/muyu/gateway/config/CorsConfig.java new file mode 100644 index 0000000..1dd71ed --- /dev/null +++ b/muyu-gateway/src/main/java/com/muyu/gateway/config/CorsConfig.java @@ -0,0 +1,58 @@ +package com.muyu.gateway.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.cors.reactive.CorsUtils; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; +import reactor.core.publisher.Mono; + +/** + * 跨域配置 + * + * @author ruoyi + */ +@Configuration +public class CorsConfig +{ + /** + * 这里为支持的请求头，如果有自定义的header字段请自己添加 + */ + private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token"; + private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD"; + private static final String ALLOWED_ORIGIN = "*"; + private static final String ALLOWED_EXPOSE = "*"; + private static final String MAX_AGE = "18000L"; + + @Bean + public WebFilter corsFilter() + { + return (ServerWebExchange ctx, WebFilterChain chain) -> { + ServerHttpRequest request = ctx.getRequest(); + if (CorsUtils.isCorsRequest(request)) + { + ServerHttpResponse response = ctx.getResponse(); + HttpHeaders headers = response.getHeaders(); + headers.add("Access-Control-Allow-Headers", ALLOWED_HEADERS); + headers.add("Access-Control-Allow-Methods", ALLOWED_METHODS); + headers.add("Access-Control-Allow-Origin", ALLOWED_ORIGIN); + headers.add("Access-Control-Expose-Headers", ALLOWED_EXPOSE); + headers.add("Access-Control-Max-Age", MAX_AGE); + headers.add("Access-Control-Allow-Credentials", "true"); + if (request.getMethod() == HttpMethod.OPTIONS) + { + response.setStatusCode(HttpStatus.OK); + return Mono.empty(); + } + } + return chain.filter(ctx); + }; + } +} + diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index b15f786..a1dbbbb 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +33,7 @@ spring: datasource: ds1: nacos: - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 dataId: sentinel-muyu-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index 956f52b..282736d 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index 3ec7c15..d579dd1 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index 364dc05..8f3823e 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 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 index 323ad45..0a774e1 100644 --- 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 @@ -88,6 +88,7 @@ public class ActivityTeamInfo extends BaseEntity { .unit(activityTeamInfoAddModel.getUnit()) .imageList(activityTeamInfoAddModel.getImageList()) .endTime(activityTeamInfoAddModel.getEndTime()) + .remark(activityTeamInfoAddModel.getRemark()) .sort(activityTeamInfoAddModel.getSort()) .content(activityTeamInfoAddModel.getContent()) .status(activityTeamInfoAddModel.getStatus()) 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/TeamStrategyHundred.java similarity index 93% rename from muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java rename to muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyHundred.java index 0225603..781dc25 100644 --- 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/TeamStrategyHundred.java @@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "team_strategy_exemption_hundred", autoResultMap = true) -public class TeamStrategyExemptionHundred extends BaseEntity { +public class TeamStrategyHundred extends BaseEntity { /** * 主键 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/TeamStrategyOrdinary.java similarity index 93% rename from muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java rename to muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyOrdinary.java index 796af1c..e015e86 100644 --- 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/TeamStrategyOrdinary.java @@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "team_strategy_exemption_ordinary", autoResultMap = true) -public class TeamStrategyExemptionOrdinary extends BaseEntity { +public class TeamStrategyOrdinary extends BaseEntity { /** * 主键 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java index 8dcbfe4..6ffc690 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java @@ -2,11 +2,10 @@ package com.muyu.marketing.domain.model; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; +import lombok.experimental.SuperBuilder; import java.util.Date; import java.util.List; @@ -18,11 +17,12 @@ import java.util.function.Supplier; * @author DongZeLiang * @date 2024-11-26 09:38 */ +@EqualsAndHashCode(callSuper = true) @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor -public class ActivityTeamInfoAddModel { +public class ActivityTeamInfoAddModel extends BaseEntity { /** * 拼团名称 @@ -90,6 +90,7 @@ public class ActivityTeamInfoAddModel { .imageList(activityTeamInfoSaveReq.getImageList()) .endTime(activityTeamInfoSaveReq.getEndTime()) .sort(activityTeamInfoSaveReq.getSort()) + .remark(activityTeamInfoSaveReq.getRemark()) .content(activityTeamInfoSaveReq.getContent()) .status(activityTeamInfoSaveReq.getStatus()) .strategyType(activityTeamInfoSaveReq.getStrategyType()) 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 e38fadf..a0def95 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 @@ -1,5 +1,6 @@ package com.muyu.marketing.domain.model; +import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.web.model.QueryModel; import com.muyu.marketing.domain.ActivityTeamInfo; import lombok.*; @@ -16,10 +17,10 @@ import java.util.function.Function; * @date 2024-11-20 14:18:10 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor -public class ActivityTeamInfoListModel { +public class ActivityTeamInfoListModel extends BaseEntity { /** * 拼团活动ID @@ -33,6 +34,10 @@ public class ActivityTeamInfoListModel { * 参团人数 */ private Long addTeamNumber; + /** + * 商品简介 + */ + private String introduction; /** * 拼团人数 */ @@ -69,21 +74,15 @@ public class ActivityTeamInfoListModel { * 团购库存 */ private Long teamStock; - + private String remark; public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function function) { ActivityTeamInfoListModel activityTeamInfoListModel = ActivityTeamInfoListModel.builder() .id(activityTeamInfo.getId()) .name(activityTeamInfo.getName()) -// .openTeamNumber(teamOpenTypeNumber) -// .addTeamNumber(teamInTypeNumber) -// .attendNumber(teamOpenTypeNumber + teamInTypeNumber) - .endTime(activityTeamInfo.getEndTime()) + .remark(activityTeamInfo.getRemark()) .productImage(activityTeamInfo.getProductImage()) -// .teamPrice(discountPrice.getTeamPrice()) -// .productPrice(discountPrice.getProductPrice()) -// .teamStock(teamProductStockModel.getTeamStock()) -// .remainStock(teamProductStockModel.getRemainStock()) + .introduction(activityTeamInfo.getIntroduction()) .status(activityTeamInfo.getStatus()) .build(); return function.apply( @@ -93,6 +92,8 @@ public class ActivityTeamInfoListModel { .endTime(activityTeamInfo.getEndTime()) .productImage(activityTeamInfo.getProductImage()) .status(activityTeamInfo.getStatus()) + .introduction(activityTeamInfo.getIntroduction()) + ); } 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 index d1d0129..f3b8168 100644 --- 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 @@ -1,5 +1,6 @@ package com.muyu.marketing.domain.model; +import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.web.model.QueryModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -28,5 +29,9 @@ public class ActivityTeamInfoListQueryModel extends QueryModel { - +public interface TeamStrategyExemptionHundredMapper extends BaseMapper { + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java index b66e04b..6e01493 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java @@ -1,11 +1,10 @@ package com.muyu.marketing.team.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.marketing.domain.TeamStrategyExemptionHundred; -import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary; +import com.muyu.marketing.domain.TeamStrategyOrdinary; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface TeamStrategyExemptionOrdinaryMapper extends BaseMapper { - +public interface TeamStrategyExemptionOrdinaryMapper extends BaseMapper { + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java index f1409d4..da36329 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java @@ -35,5 +35,10 @@ public interface ActivityTeamInfoService extends IService { */ boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); - + /** + * 根据商品ID查询团购活动信息 + * @param productId + * @return + */ + public ActivityTeamProductListMode findProductList(Long productId); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java index 3bf453a..b8970df 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java @@ -3,7 +3,6 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; -import com.muyu.marketing.domain.TeamStrategyExemptionHundred; import com.muyu.marketing.domain.model.*; import java.util.List; diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java deleted file mode 100644 index e8f4444..0000000 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.muyu.marketing.team.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.marketing.domain.TeamStrategyExemptionHundred; -import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary; - -public interface TeamStrategyExemptionHundredService extends IService { -} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java deleted file mode 100644 index 307cf36..0000000 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.muyu.marketing.team.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary; - -public interface TeamStrategyExemptionOrdinaryService extends IService { -} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java index 2176bc8..c81a401 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java @@ -2,7 +2,7 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.marketing.domain.TeamStrategyExemption; -import com.muyu.marketing.domain.TeamStrategyExemptionHundred; +import com.muyu.marketing.team.strategy.ActivityTeamStrategy; -public interface TeamStrategyExemptionService extends IService { +public interface TeamStrategyExemptionService extends ActivityTeamStrategy, IService { } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java new file mode 100644 index 0000000..ebf37fc --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java @@ -0,0 +1,8 @@ +package com.muyu.marketing.team.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.marketing.domain.TeamStrategyHundred; +import com.muyu.marketing.team.strategy.ActivityTeamStrategy; + +public interface TeamStrategyHundredService extends ActivityTeamStrategy, IService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java new file mode 100644 index 0000000..794c483 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java @@ -0,0 +1,8 @@ +package com.muyu.marketing.team.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.marketing.domain.TeamStrategyOrdinary; +import com.muyu.marketing.team.strategy.ActivityTeamStrategy; + +public interface TeamStrategyOrdinaryService extends ActivityTeamStrategy, IService { +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java index a75f0e0..70a9c6e 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java @@ -34,6 +34,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getKeyWord()), ActivityTeamInfo::getName, activityTeamInfoListQueryModel.getKeyWord()); queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getStatus()), ActivityTeamInfo::getStatus, activityTeamInfoListQueryModel.getStatus()); + queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getIntroduction()),ActivityTeamInfo::getIntroduction,activityTeamInfoListQueryModel.getIntroduction()); /** * Object -> 创建对象的时候进行的占用 @@ -105,4 +106,11 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ActivityTeamInfo::getProductId,productId); + return null; + } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java index f1c3369..271baf7 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java @@ -13,10 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.Optional; diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java deleted file mode 100644 index 0091d59..0000000 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.marketing.team.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.marketing.domain.TeamStrategyExemption; -import com.muyu.marketing.domain.TeamStrategyExemptionHundred; -import com.muyu.marketing.team.mapper.TeamStrategyExemptionHundredMapper; -import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper; -import com.muyu.marketing.team.service.TeamStrategyExemptionHundredService; -import com.muyu.marketing.team.service.TeamStrategyExemptionService; -import org.springframework.stereotype.Service; - -@Service -public class TeamStrategyExemptionHundredServiceImpl extends ServiceImpl - implements TeamStrategyExemptionHundredService { - -} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java deleted file mode 100644 index 5125ec4..0000000 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.muyu.marketing.team.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary; -import com.muyu.marketing.team.mapper.TeamStrategyExemptionOrdinaryMapper; -import com.muyu.marketing.team.service.TeamStrategyExemptionOrdinaryService; -import org.springframework.stereotype.Service; - -@Service -public class TeamStrategyExemptionOrdinaryServiceImpl extends ServiceImpl - implements TeamStrategyExemptionOrdinaryService { - -} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java index 829f618..f08a1e2 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java @@ -4,10 +4,37 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.marketing.domain.TeamStrategyExemption; import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper; import com.muyu.marketing.team.service.TeamStrategyExemptionService; +import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; -@Service +@Service("team-strategy-exemption") +@Log4j2 public class TeamStrategyExemptionServiceImpl extends ServiceImpl implements TeamStrategyExemptionService { - + + @Override + public void openTeam(Long activityTeamId) { + log.info("参加-免单团-[{}]",activityTeamId); + + } + + @Override + public void applyFor(Long teamId) { + + } + + @Override + public void addTeam(Long teamId, String orderNumber) { + + } + + @Override + public void backTeam(Long teamId) { + + } + + @Override + public void settle(Long teamId) { + + } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java new file mode 100644 index 0000000..11ccf15 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java @@ -0,0 +1,39 @@ +package com.muyu.marketing.team.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.marketing.domain.TeamStrategyHundred; +import com.muyu.marketing.team.mapper.TeamStrategyExemptionHundredMapper; +import com.muyu.marketing.team.service.TeamStrategyHundredService; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +@Service("team--strategy-hundred") +@Log4j2 +public class TeamStrategyHundredServiceImpl extends ServiceImpl + implements TeamStrategyHundredService { + + @Override + public void openTeam(Long activityTeamId) { + log.info("参加-百人团-[{}]",activityTeamId); + } + + @Override + public void applyFor(Long teamId) { + + } + + @Override + public void addTeam(Long teamId, String orderNumber) { + + } + + @Override + public void backTeam(Long teamId) { + + } + + @Override + public void settle(Long teamId) { + + } +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java new file mode 100644 index 0000000..a31a7c9 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java @@ -0,0 +1,40 @@ +package com.muyu.marketing.team.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.marketing.domain.TeamStrategyOrdinary; +import com.muyu.marketing.team.mapper.TeamStrategyExemptionOrdinaryMapper; +import com.muyu.marketing.team.service.TeamStrategyOrdinaryService; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +@Service("team-strategy-ordinary") +@Log4j2 +public class TeamStrategyOrdinaryServiceImpl extends ServiceImpl + implements TeamStrategyOrdinaryService { + + @Override + public void openTeam(Long activityTeamId) { + log.info("参加-普通团-[{}]",activityTeamId); + + } + + @Override + public void applyFor(Long teamId) { + + } + + @Override + public void addTeam(Long teamId, String orderNumber) { + + } + + @Override + public void backTeam(Long teamId) { + + } + + @Override + public void settle(Long teamId) { + + } +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java new file mode 100644 index 0000000..889caf5 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java @@ -0,0 +1,40 @@ +package com.muyu.marketing.team.strategy; + +/** + * @ClassName ActivityTeamStrategy + * @Description 描述 + * @Author zhen_xiong_feng + * @Date 2024/11/29 17:11 + */ +public interface ActivityTeamStrategy { + /** + * 开团 + * @param activityTeamId 活动团id + */ + public void openTeam(Long activityTeamId); + + /** + * 申请参团 + * @param teamId 团id + */ + public void applyFor(Long teamId); + + /** + * 参团 + * @param teamId 团id + * @param orderNumber 订单号 + */ + public void addTeam(Long teamId,String orderNumber); + + /** + * 退团 + * @param teamId 团购ID + */ + public void backTeam(Long teamId); + + /** + * 结算团 + * @param teamId + */ + public void settle(Long teamId); +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java new file mode 100644 index 0000000..d918ad5 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java @@ -0,0 +1,52 @@ +package com.muyu.marketing.team.strategy.impl; + +import com.muyu.marketing.team.strategy.ActivityTeamStrategy; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; + +/** + * @ClassName ActivityTeamStrategyImpl + * @Description 描述 + * @Author zhen_xiong_feng + * @Date 2024/11/29 17:22 + */ +@Service +@Primary +public class ActivityTeamStrategyImpl implements ActivityTeamStrategy { + @Override + public void openTeam(Long activityTeamId) { + String activityTeamType=null; + if (activityTeamId==null){ + throw new RuntimeException("activityTeamId is null"); + } else if (activityTeamId==0) { + //团长免单 + activityTeamType = "team-strategy-exemption"; + } else if (activityTeamId == 1) { + //普通团 + activityTeamType = "team-strategy-ordinary"; + } else if (activityTeamId == 2) { + //百人团 + activityTeamType = "team--strategy-hundred"; + } + } + + @Override + public void applyFor(Long teamId) { + + } + + @Override + public void addTeam(Long teamId, String orderNumber) { + + } + + @Override + public void backTeam(Long teamId) { + + } + + @Override + public void settle(Long teamId) { + + } +} 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 index 699e778..77c3122 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-buy + name: muyu-activity profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 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..c16db37 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 @@ -90,6 +90,10 @@ public class ProjectInfo extends BaseEntity { @Excel(name = "品牌") @ApiModelProperty(name = "品牌", value = "品牌") private Long brandId; + /** 拼团id */ + @Excel(name = "拼团id") + @ApiModelProperty(name = "拼团id", value = "拼团id") + private Long teamId; /** * 查询构造器 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..fe4e82f 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 @@ -34,4 +34,5 @@ public interface ProjectInfoService extends IService { * @return 商品详情 */ ProjectDetailResp getDetailInfo (Long id); + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml index 8ece81d..0d50570 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml index 9467547..66e5588 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml @@ -16,10 +16,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index ee5ca7f..3cec115 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml index c730a55..9d86410 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 124.221.28.250:8848 # 配置文件格式 file-extension: yml # 共享配置