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 5bed602..e94e0db 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 @@ -3,18 +3,12 @@ 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.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoModel; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel; import lombok.*; import lombok.experimental.SuperBuilder; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import java.util.List; @Data @SuperBuilder @@ -28,7 +22,7 @@ public class ActivityTeamInfo extends BaseEntity { * 主键 */ @TableId(value = "id", type = IdType.AUTO) - private Long id; + private long id; /** * 拼团名称 */ @@ -56,13 +50,11 @@ public class ActivityTeamInfo extends BaseEntity { /** * 活动结束时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** * 活动排序 */ - private Long sort; + private long sort; /** * 活动详情 */ @@ -78,8 +70,7 @@ public class ActivityTeamInfo extends BaseEntity { /** * 策略ID */ - private Long strategyId; - + private long strategyId; /** * 公共添加模型，转换成添加对象 @@ -102,21 +93,4 @@ public class ActivityTeamInfo extends BaseEntity { .strategyId(activityTeamInfoAddModel.getStrategyId()) .build(); } - - public static ActivityTeamInfo addTeamInfoModelBuild(ActivityTeamInfoModel activityTeamInfoModel) { - return ActivityTeamInfo.builder() - .name(activityTeamInfoModel.getName()) - .productId(activityTeamInfoModel.getProductId()) - .productImage(activityTeamInfoModel.getProductImage()) - .introduction(activityTeamInfoModel.getIntroduction()) - .unit(activityTeamInfoModel.getUnit()) - .imageList(activityTeamInfoModel.getImageList()) - .endTime(activityTeamInfoModel.getEndTime()) - .sort(activityTeamInfoModel.getSort()) - .content(activityTeamInfoModel.getContent()) - .status(activityTeamInfoModel.getStatus()) - .strategyType(activityTeamInfoModel.getStrategyType()) - .strategyId(activityTeamInfoModel.getStrategyId()) - .build(); - } } 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 index 2c2275c..43521d0 100644 --- 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 @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel; import lombok.*; import lombok.experimental.SuperBuilder; @@ -49,7 +48,6 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { */ private BigDecimal teamPrice; - /** * 通过模型钢构件对象 * @param activityTeamProductSkuAddModel 模型 @@ -62,14 +60,6 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .teamStock(activityTeamProductSkuAddModel.getTeamStock()) .remainStock(activityTeamProductSkuAddModel.getTeamStock()) .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) - .build(); - } - - public static ActivityTeamProductSkuInfo skuUpdModel(ActivityTeamProductSkuModel activityTeamProductSkuModel) { - return ActivityTeamProductSkuInfo.builder() - .id(activityTeamProductSkuModel.getId()) - .teamStock(activityTeamProductSkuModel.getTeamStock()) - .teamPrice(activityTeamProductSkuModel.getTeamPrice()) - .build(); + .build() } } 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/ActivityTeamProductSkuModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java index 09e6617..1e5b3e1 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java @@ -1,14 +1,23 @@ package com.muyu.marketing.domain.model; +<<<<<<< HEAD +======= +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; +import com.muyu.marketing.domain.resp.ProjectFindSkuInfoResp; +>>>>>>> master import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +<<<<<<< HEAD import lombok.experimental.SuperBuilder; +======= +>>>>>>> master import java.math.BigDecimal; /** +<<<<<<< HEAD * 团购活动规格模型 */ @Data @@ -32,6 +41,24 @@ public class ActivityTeamProductSkuModel { /** * 商品SKU +======= + * @program: 2204a-cloud-server + * @description: 回显sku模型 + * @author: AoCi Tian + * @create: 2024-11-26 16:03 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ActivityTeamProductSkuModel { + /** + * 规格id + */ + private Long id; + /** + * 规格SKU +>>>>>>> master */ private String sku; @@ -44,4 +71,16 @@ public class ActivityTeamProductSkuModel { * 拼团库存 */ private Long teamStock; +<<<<<<< HEAD +======= + + public static ActivityTeamProductSkuModel FindBuild(ActivityTeamProductSkuInfo activityTeamProductSkuInfo) { + return ActivityTeamProductSkuModel.builder() + .id(activityTeamProductSkuInfo.getId()) + .sku(activityTeamProductSkuInfo.getProductSku()) + .teamStock(activityTeamProductSkuInfo.getTeamStock()) + .teamPrice(activityTeamProductSkuInfo.getTeamPrice()) + .build(); + } +>>>>>>> master } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java index f5c3f75..61f9d08 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java @@ -12,7 +12,7 @@ import java.math.RoundingMode; /** * 团购商品优惠力度模型 * - * @author + * @author DongZeLiang * @date 2024-11-21 11:57 */ @Data @@ -44,7 +44,7 @@ public class TeamProductDiscountPriceModel { * @return 优惠力度 */ public static TeamProductDiscountPriceModel of(BigDecimal productPrice, BigDecimal teamPrice) { - return TeamProductDiscountPriceModel.builder() + TeamProductDiscountPriceModel.builder() .productPrice(productPrice) .teamPrice(teamPrice) .discount( diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index dbf1d83..342b35d 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -5,22 +5,22 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoModel; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; -import com.muyu.marketing.domain.req.ActivityTeamProductReq; import com.muyu.marketing.domain.req.TeamInfoListReq; -import com.muyu.marketing.domain.resp.ActivityTeamInfoDatailResp; import com.muyu.marketing.domain.resp.TeamInfoListResp; import com.muyu.marketing.team.service.ActivityTeamInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +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; import java.util.List; /** * 营销团购活动控制层 * - * @author + * @author DongZeLiang * @date 2024-11-20 14:25 */ @RestController @@ -28,7 +28,7 @@ import java.util.List; public class ActivityTeamController { @Autowired - private ActivityTeamInfoService activityTeamInfoService; + private ActivityTeamInfoService activityTeamInfoService;; /** * 查询营销团购活动列表 @@ -58,26 +58,4 @@ public class ActivityTeamController { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); return Result.success(); } - - /** - * 根据活动Id查询信息 - * @param - * @return 结果集 - */ - @GetMapping("/{id}") - public Result findById(@PathVariable Long id) { - ActivityTeamInfoDatailResp activityById = activityTeamInfoService.findActivityById(id); - return Result.success(activityById); - } - - /** - * 根据修改 - */ - @PostMapping("/update") - public Result updDate(@RequestBody ActivityTeamProductReq activityTeamProductReq){ - ActivityTeamInfoModel activityTeamInfoModel = ActivityTeamInfoModel.activityTeamBuilder(activityTeamProductReq); - activityTeamInfoService.bateUpdate(activityTeamInfoModel); - return Result.success(); - } - } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java index 0d3baa9..85e3f4d 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java @@ -2,8 +2,6 @@ package com.muyu.marketing.team.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.marketing.domain.ActivityTeamInfo; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; -import com.muyu.marketing.domain.TeamStrategyExemptionHundred; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java deleted file mode 100644 index 10c7b87..0000000 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.muyu.marketing.team.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.marketing.domain.TeamStrategyExemption; -import com.muyu.marketing.domain.TeamStrategyExemptionHundred; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -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 deleted file mode 100644 index b66e04b..0000000 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -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 org.apache.ibatis.annotations.Mapper; - -@Mapper -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 e000c1a..21d9f00 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 @@ -6,9 +6,8 @@ import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoModel; -import com.muyu.marketing.domain.req.ActivityTeamProductReq; -import com.muyu.marketing.domain.resp.ActivityTeamInfoDatailResp; + +import java.util.List; public interface ActivityTeamInfoService extends IService { @@ -25,8 +24,4 @@ public interface ActivityTeamInfoService extends IService { * @param activityTeamInfoAddModel 团购添加模型 */ public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel); - - public ActivityTeamInfoDatailResp findActivityById(Long id); - - public void bateUpdate(ActivityTeamInfoModel activityTeamInfoModel); } 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 6d02bcf..6a5d6dd 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 @@ -4,7 +4,9 @@ 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 com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; +import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel; +import com.muyu.marketing.domain.model.TeamProductStockModel; import java.util.List; @@ -39,25 +41,4 @@ public interface ActivityTeamProductSkuInfoService extends IService activityTeamProductSkuAddModelList); - /** - * 通过活动Id查询规格集合数据 - */ - public List findById(Long id); - - /** - * 根据 业务模型 对团购商品修改 - */ - public boolean update(ActivityTeamProductSkuModel activityTeamProductSkuModel); - - - /** - * 根据 业务模型 对商品批量修改 - */ - public boolean bathUpdate(List activityTeamProductSkuModels); - - /** - * 根据业务模型 对商品批量删除 - */ - public void bathDelete(List id); - } 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..ea9c08e 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,10 @@ 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/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java index 29ffa48..c65d649 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 @@ -1,15 +1,14 @@ package com.muyu.marketing.team.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.model.*; -import com.muyu.marketing.domain.req.ActivityTeamProductReq; -import com.muyu.marketing.domain.resp.ActivityTeamInfoDatailResp; -import com.muyu.marketing.domain.resp.ActivityTeamProductSkuResp; import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper; import com.muyu.marketing.team.service.ActivityTeamInfoService; import com.muyu.marketing.team.service.ActivityTeamOpenInfoService; @@ -20,6 +19,7 @@ import org.springframework.util.Assert; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; @Service @@ -82,50 +82,4 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId())); this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList); } - - - /** - * 查询活动信息 - * @param id - * @return - */ - @Override - public ActivityTeamInfoDatailResp findActivityById(Long id) { - //查找根据活动Id规格信息 - List teamInfoSkuListModelList = activityTeamProductSkuInfoService.findById(id); - ActivityTeamInfo activityTeamInfo = this.getById(id); - ActivityTeamInfoDatailModel datailModel = ActivityTeamInfoDatailModel.DatailModel(activityTeamInfo, teamInfoSkuListModelList); - List activityTeamProductSkuList = datailModel.getActivityTeamProductSkuList(); - List activityTeamProductSkuResps = new ArrayList<>(); - activityTeamProductSkuList.stream().map(ActivityTeamInfoSkuListModel->{ - return activityTeamProductSkuResps.add(ActivityTeamProductSkuResp.skuRespbuilder(ActivityTeamInfoSkuListModel)); - }).toList(); - return ActivityTeamInfoDatailResp.datailRespBuilder(datailModel,activityTeamProductSkuResps); - } - - /** - * 商品信息修改 - * @param - */ - @Override - public void bateUpdate(ActivityTeamInfoModel activityTeamInfoModel) { - //添加 - List teamProductSkuAddModelList = activityTeamInfoModel.getActivityTeamProductUpdModel().getActivityTeamProductSkuAddModelList(); - - //根据 Sku的Id删除 - activityTeamOpenInfoService.removeBatchByIds(activityTeamInfoModel.getActivityTeamProductUpdModel().getIds()); - - teamProductSkuAddModelList.forEach( - activityTeamProductSkuAddModel -> { - activityTeamProductSkuAddModel.setTeamId(activityTeamInfoModel.getId()); - } - ); - - activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList); - - //活动修改 - this.updateById(ActivityTeamInfo.addTeamInfoModelBuild(activityTeamInfoModel)); - activityTeamProductSkuInfoService.bathUpdate(activityTeamInfoModel.getActivityTeamProductUpdModel().getActivityTeamProductSkuUpdModelList()); - - } } 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 06811ff..6e87518 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 @@ -1,12 +1,12 @@ package com.muyu.marketing.team.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.exception.ServiceException; -import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; -import com.muyu.marketing.domain.model.*; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; +import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel; +import com.muyu.marketing.domain.model.TeamProductStockModel; import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper; import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService; import com.muyu.product.cache.ProjectSkuCache; @@ -80,64 +80,4 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl findById(Long id) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,id); - List list = this.list(lambdaQueryWrapper); - - List teamInfoSkuListModelList = list.stream().map(ActivityTeamProductSkuInfo -> { - ActivityTeamProductSkuModel activityTeamInfoSkuListModel = ActivityTeamInfoSkuListModel.skuByIdModel(ActivityTeamProductSkuInfo); - return activityTeamInfoSkuListModel; - }).toList(); - - return teamInfoSkuListModelList; - } - - /** - * 根据 业务模型 对团购商品修改 - * @param activityTeamProductSkuUpdModel - */ - @Override - public boolean update(ActivityTeamProductSkuModel activityTeamProductSkuUpdModel) { - - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamProductSkuUpdModel.getTeamStock()); - updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamProductSkuUpdModel.getTeamPrice()); - - updateWrapper.eq(ActivityTeamProductSkuInfo::getId,activityTeamProductSkuUpdModel.getId()); - - return this.update(updateWrapper); - } - - /** - * 根据 业务模型 批量修改商品 - * @param activityTeamProductSkuUpdModelList - */ - @Override - public boolean bathUpdate(List activityTeamProductSkuUpdModelList) { - List teamProductSkuInfoList = activityTeamProductSkuUpdModelList - .stream() - .map(ActivityTeamProductSkuInfo::skuUpdModel) - .toList(); - return this.updateBatchById(teamProductSkuInfoList); - } - - /** - * 根据业务模型 批量删除商品规格 - * @param id - */ - @Override - public void bathDelete(List id) { - this.bathDelete(id); - } - - - } 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..01eed14 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,62 @@ 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 +@Log4j2 +@Service("team-strategy-exemption") public class TeamStrategyExemptionServiceImpl extends ServiceImpl implements TeamStrategyExemptionService { - + + /** + * 开团 + * + * @param activityTeamId 团购活动ID + */ + @Override + public void openTeam(Long activityTeamId) { + log.info("参加 - 免单团 - [{}]", activityTeamId); + } + + /** + * 申请加团 + * + * @param teamId 团ID + */ + @Override + public void applyTeam(Long teamId) { + + } + + /** + * 参团 + * + * @param teamId 加团ID + * @param orderNumber 订单编号 + */ + @Override + public void addTeam(Long teamId, String orderNumber) { + + } + + /** + * 退团 + * + * @param teamId 团购ID + */ + @Override + public void backTeam(Long teamId) { + + } + + /** + * 结算团 + * + * @param teamId 团购ID + */ + @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 7e45ecb..156f4b3 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-marketing + name: muyu-buy profiles: # 环境配置 active: dev