teaching
/
2204a-cloud-server
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11.26

1127/sujunlong
sujunlong6 2024-11-27 10:39:48 +08:00
parent a04925eab4
commit 6424c0ac8e
14 changed files with 439 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java
View File

@ -93,4 +93,6 @@ public class ActivityTeamInfo extends BaseEntity {
.strategyId(activityTeamInfoAddModel.getStrategyId())
.build();
}
}

2
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java
View File

@ -60,6 +60,6 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
.teamStock(activityTeamProductSkuAddModel.getTeamStock())
.remainStock(activityTeamProductSkuAddModel.getTeamStock())
.teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
.build()
.build();
}
}

97
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoDetailModel.java 100644
View File

@ -0,0 +1,97 @@
package com.muyu.marketing.domain.model;
import com.muyu.marketing.domain.ActivityTeamInfo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* 团购活动详细模型
*
* @author DongZeLiang
* @date 2024-11-26 09:38
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamInfoDetailModel{
/**
* 主键
*/
private long id;
/**
* 拼团名称
*/
private String name;
/**
* 商品ID
*/
private long productId;
/**
* 商品活动图
*/
private String productImage;
/**
* 活动简介
*/
private String introduction;
/**
* 单位
*/
private String unit;
/**
* 轮播图
*/
private String imageList;
/**
* 活动结束时间
*/
private Date endTime;
/**
* 活动排序
*/
private long sort;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private long strategyId;
public static ActivityTeamInfoDetailModel DetailModelBuild(ActivityTeamInfo activityTeamInfo){
return ActivityTeamInfoDetailModel.builder()
.id(activityTeamInfo.getId())
.name(activityTeamInfo.getName())
.productId(activityTeamInfo.getProductId())
.productImage(activityTeamInfo.getProductImage())
.introduction(activityTeamInfo.getIntroduction())
.unit(activityTeamInfo.getUnit())
.imageList(activityTeamInfo.getImageList())
.endTime(activityTeamInfo.getEndTime())
.sort(activityTeamInfo.getSort())
.content(activityTeamInfo.getContent())
.status(activityTeamInfo.getStatus())
.strategyType(activityTeamInfo.getStrategyType())
.strategyId(activityTeamInfo.getStrategyId())
.build();
}
}

72
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDetailModel.java 100644
View File

@ -0,0 +1,72 @@
package com.muyu.marketing.domain.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
import java.util.function.Supplier;
/**
* 团购spu库存详细信息模型
*
* @author DongZeLiang
* @date 2024-11-26 09:36
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuDetailModel extends BaseEntity {
/**
* 主键
*/
private long id;
/**
* 活动ID
*/
private long teamId;
/**
* 商品ID
*/
private Long productId;
/**
* 商品SKU
*/
private String productSku;
/**
* 拼团库存
*/
private Long teamStock;
/**
* 剩余库存
*/
private Long remainStock;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
public static ActivityTeamProductSkuDetailModel getIdBuild(ActivityTeamProductSkuInfo activityTeamProductSkuInfo){
return ActivityTeamProductSkuDetailModel.builder()
.id(activityTeamProductSkuInfo.getId())
.teamId(activityTeamProductSkuInfo.getTeamId())
.productId(activityTeamProductSkuInfo.getProductId())
.productSku(activityTeamProductSkuInfo.getProductSku())
.teamStock(activityTeamProductSkuInfo.getTeamStock())
.remainStock(activityTeamProductSkuInfo.getRemainStock())
.teamPrice(activityTeamProductSkuInfo.getTeamPrice())
.build();
}
}

2
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java
View File

@ -44,7 +44,7 @@ public class TeamProductDiscountPriceModel {
* @return 优惠力度
*/
public static TeamProductDiscountPriceModel of(BigDecimal productPrice, BigDecimal teamPrice) {
TeamProductDiscountPriceModel.builder()
return TeamProductDiscountPriceModel.builder()
.productPrice(productPrice)
.teamPrice(teamPrice)
.discount(

3
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java
View File

@ -3,9 +3,10 @@ package com.muyu.marketing.domain.req;
import com.muyu.common.core.web.page.PageDomain;
import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
import lombok.*;
import lombok.experimental.SuperBuilder;
@Data
@Builder
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)

104
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java 100644
View File

@ -0,0 +1,104 @@
package com.muyu.marketing.domain.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.marketing.domain.model.ActivityTeamInfoDetailModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
import java.util.List;
import java.util.function.Function;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class ActivityTeamDetailResp extends BaseEntity {
/**
* 活动ID
*/
private Long id;
/**
* 拼团名称
*/
private String name;
/**
* 商品ID
*/
private Long productId;
/**
* 商品活动图
*/
private String productImage;
/**
* 活动简介
*/
private String introduction;
/**
* 单位
*/
private String unit;
/**
* 轮播图
*/
private String imageList;
/**
* 活动结束时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
private Date endTime;
/**
* 活动排序
*/
private Long sort;
/**
* 商品SkU集合
*/
private List<ActivityTeamProjectSkuInfoResp> skuInfoRespList;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
public static ActivityTeamDetailResp findByid(ActivityTeamInfoDetailModel ActivityTeamDetailModel, Function<Long,List<ActivityTeamProjectSkuInfoResp>> skuInfoRespList) {
return ActivityTeamDetailResp.builder()
.id(ActivityTeamDetailModel.getId())
.name(ActivityTeamDetailModel.getName())
.productId(ActivityTeamDetailModel.getProductId())
.productImage(ActivityTeamDetailModel.getProductImage())
.introduction(ActivityTeamDetailModel.getIntroduction())
.unit(ActivityTeamDetailModel.getUnit())
.imageList(ActivityTeamDetailModel.getImageList())
.endTime(ActivityTeamDetailModel.getEndTime())
.sort(ActivityTeamDetailModel.getSort())
.content(ActivityTeamDetailModel.getContent())
.status(ActivityTeamDetailModel.getStatus())
.strategyType(ActivityTeamDetailModel.getStrategyType())
.strategyId(ActivityTeamDetailModel.getStrategyId())
.skuInfoRespList(skuInfoRespList.apply(ActivityTeamDetailModel.getId()))
.build();
}
}

62
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProjectSkuInfoResp.java 100644
View File

@ -0,0 +1,62 @@
package com.muyu.marketing.domain.resp;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuDetailModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
import java.util.List;
/**
* sku回显对象
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
public class ActivityTeamProjectSkuInfoResp {
/**
* 规格id
*/
public Long id;
/**
* 团购活动ID
*/
private Long teamId;
/**
* 商品ID
*/
private Long productId;
/**
* 规格SKU
*/
private String productSku;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
/**
* 拼团库存
*/
private Long teamStock;
public static List<ActivityTeamProjectSkuInfoResp> findSkuId(List<ActivityTeamProductSkuDetailModel> activityTeamProductSkuDetailModel) {
return activityTeamProductSkuDetailModel.stream().map(activityTeamProductSkuDetailModel1 -> {
ActivityTeamProjectSkuInfoResp teamProjectSkuInfoResp = ActivityTeamProjectSkuInfoResp.builder()
.teamId(activityTeamProductSkuDetailModel1.getTeamId())
.productSku(activityTeamProductSkuDetailModel1.getProductSku())
.productSku(activityTeamProductSkuDetailModel1.getProductSku())
.teamPrice(activityTeamProductSkuDetailModel1.getTeamPrice())
.build();
return teamProjectSkuInfoResp;
}).toList();
}
}

26
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
View File

@ -4,16 +4,17 @@ package com.muyu.marketing.team.controller;
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.ActivityTeamInfoDetailModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
import com.muyu.marketing.domain.req.TeamInfoListReq;
import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuInfoResp;
import com.muyu.marketing.domain.resp.TeamInfoListResp;
import com.muyu.marketing.team.service.ActivityTeamInfoService;
import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -29,6 +30,8 @@ public class ActivityTeamController {
@Autowired
private ActivityTeamInfoService activityTeamInfoService;;
@Autowired
private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
/**
* 查询营销团购活动列表
@ -58,4 +61,19 @@ public class ActivityTeamController {
activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
return Result.success();
}
/**
* 活动回显
* @param id 活动id
* @return
*/
@PostMapping("/findById/{id}")
public Result<ActivityTeamDetailResp> findById(@PathVariable("id") Long id) {
ActivityTeamInfoDetailModel detailModel = activityTeamInfoService.getByIds(id);
ActivityTeamDetailResp detailResp = ActivityTeamDetailResp.findByid(detailModel,
teamId -> ActivityTeamProjectSkuInfoResp.findSkuId(activityTeamProductSkuInfoService.getDetailModel(teamId))
);
return Result.success(detailResp);
}
}

17
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
View File

@ -3,11 +3,8 @@ package com.muyu.marketing.team.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.marketing.domain.ActivityTeamInfo;
import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
import java.util.List;
import com.muyu.marketing.domain.model.*;
import org.apache.ibatis.annotations.Param;
public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
@ -24,4 +21,14 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
* @param activityTeamInfoAddModel 团购添加模型
*/
public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
public void saves(ActivityTeamInfoAddModel activityTeamInfoAddModel);
/**
* 根据id 查询活动列表
* @param id
* @return
*/
ActivityTeamInfoDetailModel getByIds(@Param("id") Long id);
}

12
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
View File

@ -4,9 +4,7 @@ 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.ActivityTeamProductSkuAddModel;
import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
import com.muyu.marketing.domain.model.TeamProductStockModel;
import com.muyu.marketing.domain.model.*;
import java.util.List;
@ -41,4 +39,12 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
*/
public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
// public void batchSaves(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
public void batchUpd(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
/**
* 回显团购商品SKU
*/
public List<ActivityTeamProductSkuDetailModel> getDetailModel(Long teamId);
}

27
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
View File

@ -8,6 +8,7 @@ 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.ActivityTeamProductSkuInfo;
import com.muyu.marketing.domain.model.*;
import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
import com.muyu.marketing.team.service.ActivityTeamInfoService;
@ -82,4 +83,30 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
}
@Override
public void saves(ActivityTeamInfoAddModel activityTeamInfoAddModel) {
// 团购活动模型添加
ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.addModelBuild(activityTeamInfoAddModel);
//断言 判断条件是否为真
Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("团购活动添加失败:{[]}", activityTeamInfoAddModel));
// 团购SKU模型集合
List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList = activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList();
activityTeamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
}
@Override
public ActivityTeamInfoDetailModel getByIds(Long id) {
return ActivityTeamInfoDetailModel.DetailModelBuild(this.getById(id));
}
}

29
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
View File

@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.exception.ServiceException;
import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
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.domain.model.*;
import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
import com.muyu.product.cache.ProjectSkuCache;
@ -14,10 +12,6 @@ import com.muyu.product.domain.ProjectSkuInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
@ -80,4 +74,25 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::modelBuild).toList()
);
}
@Override
public void batchUpd(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
}
@Override
public List<ActivityTeamProductSkuDetailModel> getDetailModel(Long teamId) {
LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ActivityTeamProductSkuInfo::getProductId, teamId);
List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = this.list(queryWrapper);
List<ActivityTeamProductSkuDetailModel> list = activityTeamProductSkuInfoList.stream().map(ActivityTeamProductSkuDetailModel::getIdBuild).toList();
return list;
}
}

10
muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
View File

@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
name: muyu-marketing
name: muyu-marketings
profiles:
# 环境配置
active: dev
@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 1.94.33.190:8848
namespace: 3e693a9e-cf1c-46f1-b42a-d4419204abd0
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 1.94.33.190:8848
namespace: 3e693a9e-cf1c-46f1-b42a-d4419204abd0
# 配置文件格式
file-extension: yml
# 共享配置
@ -25,4 +27,4 @@ spring:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
logging:
level:
com.muyu.marketing.mapper: DEBUG
com.muyu.marketings.mapper: DEBUG