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

Merge branch 'master' into 1125/chengyingjie

1125/chengyingjie
笨蛋 2024-11-26 10:53:47 +08:00
parent f9384d3b16 49ea16c908
commit d3a93de52b
9 changed files with 324 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
doc/团购添加数据结构.java 100644
View File

@ -0,0 +1,47 @@
$.{
"商品ID": "Long", //activity_team_info.product_id
"商品图片": "String",
"活动名称": "String",
"活动简介": "String",
"商品单位": "String",
"商品的轮播图": [
"String", "String"
],
"活动时间": "date",
"策略类型": "String",
"策略ID": "Long",
"商品规格List": [ // activity_team_product_sku_info
{
"规格SKU": "String", // activity_team_product_sku_info.product_sku
"拼团价格": "BigDecimal",
"拼团库存": "Long"
}
],
"排序": "Integer",
"详情": "String"
}
activity_team_info 团购活动表 -> ActivityTeamInfo(实体类)
activity_team_info.id(主键) -> 自增 -> 回填 -> ActivityTeamInfo.id
activity_team_info.name(拼团名称) <- ActivityTeamInfo.name <- $.活动名称
activity_team_info.product_id(商品ID) <- ActivityTeamInfo.productId <- $.商品ID
activity_team_info.product_image(商品活动图) <- ActivityTeamInfo.productImage <- $.商品图片
activity_team_info.introduction(活动简介) <- ActivityTeamInfo.introduction <- $.活动简介
activity_team_info.unit(单位) <- ActivityTeamInfo.unit <- $.商品单位
activity_team_info.image_list(轮播图) <- ActivityTeamInfo.imageList <- 商品的轮播图.toString(","拼接) <- $.商品的轮播图
activity_team_info.end_time(活动结束时间) <- ActivityTeamInfo.endTime <- $.活动时间
activity_team_info.sort(活动排序) <- ActivityTeamInfo.sort <- $.排序
activity_team_info.content(活动详情) <- ActivityTeamInfo.content <- $.详情
activity_team_info.status(活动状态) <- _sys_normal_disable.1(停用)
activity_team_info.strategy_type(策略类型) <- ActivityTeamInfo.strategy_type <- $.策略类型
activity_team_info.strategy_id(策略ID) <- ActivityTeamInfo.strategy_id <- $.策略ID
for(@商品规格 in 商品规格List)
activity_team_product_sku_info 商品拼团规格信息表 -> ActivityTeamProductSkuInfo(实体类)
activity_team_product_sku_info.id(主键) -> 自增 -> 回填 -> ActivityTeamProductSkuInfo.id
activity_team_product_sku_info.team_id(活动ID) <- ActivityTeamProductSkuInfo.teamId <- ActivityTeamInfo.id
activity_team_product_sku_info.product_id(商品ID) <- ActivityTeamProductSkuInfo.productId < $.商品ID
activity_team_product_sku_info.product_sku(商品SKU) <- ActivityTeamProductSkuInfo.productSku <- @商品规格.规格SKU
activity_team_product_sku_info.team_stock(拼团库存) <- ActivityTeamProductSkuInfo.teamStock <- @商品规格.拼团库存
activity_team_product_sku_info.remain_stock(剩余库存) <- ActivityTeamProductSkuInfo.remainStock <- @商品规格.拼团库存
activity_team_product_sku_info.team_price(拼团价格) <- ActivityTeamProductSkuInfo.teamPrice <- @商品规格.拼团价格

22
doc/团购添加数据结构.json
View File

@ -1,22 +0,0 @@
{
"商品ID": "Long",
"商品图片": "String",
"活动名称": "String",
"活动简介": "String",
"商品单位": "String",
"商品的轮播图": [
"String", "String"
],
"活动时间": "date",
"策略类型": "String",
"策略ID": "Long",
"商品规格List": [
{
"规格SKU": "String",
"拼团价格": "BigDecimal",
"拼团库存": "Long"
}
],
"排序": "Integer",
"详情": "String"
}

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

@ -4,6 +4,7 @@ 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 com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
import lombok.*;
import lombok.experimental.SuperBuilder;
@ -46,4 +47,19 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
* 拼团价格
*/
private BigDecimal teamPrice;
/**
* 通过模型钢构件对象
* @param activityTeamProductSkuAddModel 模型
* @return 对象
*/
public static ActivityTeamProductSkuInfo modelBuild(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) {
return ActivityTeamProductSkuInfo.builder()
.productId(activityTeamProductSkuAddModel.getProductId())
.teamId(activityTeamProductSkuAddModel.getTeamId())
.teamStock(activityTeamProductSkuAddModel.getTeamStock())
.remainStock(activityTeamProductSkuAddModel.getTeamStock())
.teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
.build()
}
}

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

@ -0,0 +1,81 @@
package com.muyu.marketing.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* 团购活动添加模型
*
* @author DongZeLiang
* @date 2024-11-26 09:38
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamInfoAddModel {
/**
* 拼团名称
*/
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 Integer sort;
/**
* 商品SkU集合
*/
private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
}

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

@ -0,0 +1,47 @@
package com.muyu.marketing.domain.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 团购spu库存添加模型
*
* @author DongZeLiang
* @date 2024-11-26 09:36
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuAddModel {
/**
* 团购活动ID
*/
private Long teamId;
/**
* 商品ID
*/
private Long productId;
/**
* 规格SKU
*/
private String sku;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
/**
* 拼团库存
*/
private Long teamStock;
}

75
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java 100644
View File

@ -0,0 +1,75 @@
package com.muyu.marketing.domain.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
import java.util.List;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class ActivityTeamInfoSaveReq extends BaseEntity {
/**
* 拼团名称
*/
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 Integer sort;
/**
* 商品SkU集合
*/
private List<ProjectSkuInfoAddReq> projectSkuInfoAddReqList;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
}

34
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ProjectSkuInfoAddReq.java 100644
View File

@ -0,0 +1,34 @@
package com.muyu.marketing.domain.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/**
* 添加的
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
public class ProjectSkuInfoAddReq {
/**
* 规格SKU
*/
private String sku;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
/**
* 拼团库存
*/
private Long teamStock;
}

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

@ -4,6 +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;
@ -33,4 +34,11 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
*/
public TeamProductStockModel getStock(Long teamId);
/**
* 添加团购商品SKU
* @param activityTeamProductSkuAddModelList 团购商品SKU添加模型集合
*/
public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
}

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

@ -4,6 +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.team.mapper.ActivityTeamProductSkuInfoMapper;
@ -64,4 +65,19 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
.remainStock(teamProductSkuInfoList.stream().map(ActivityTeamProductSkuInfo::getRemainStock).reduce(0L, Long::sum))
.build();
}
/**
* 添加团购商品SKU
*
* @param activityTeamProductSkuAddModelList 团购商品SKU添加模型集合
*/
@Override
public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList) {
if (activityTeamProductSkuAddModelList == null || activityTeamProductSkuAddModelList.isEmpty()) {
throw new ServiceException("入参添加商品规格模型，不可为空");
}
this.saveBatch(
activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::modelBuild).toList()
);
}
}