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

Merge remote-tracking branch 'origin/master' into 1127/Fengmou 

# Conflicts:
#	muyu-auth/src/main/resources/bootstrap.yml
#	muyu-gateway/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-file/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-job/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-system/src/main/resources/bootstrap.yml
#	muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
1127/Fengmou
冯某 2024-11-27 15:10:14 +08:00
parent bba0551efa 02f640092a
commit c003b4f1c3
33 changed files with 902 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
doc/团购查询单条数据结构.java 100644
View File

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

32
doc/团购活动修改.java 100644
View File

@ -0,0 +1,32 @@
{
"活动ID": "Long",
"商品ID": "Long",
"活动名称": "String",
"商品名称": "String",
"商品图片": "String",
"活动简介": "String",
"商品单位": "String",
"商品的轮播图": [
"String", "String"
],
"活动时间": "date",
"策略类型": "String",
"商品规格": {
"修改商品规格List": [ // 修改
{
"团购规格ID": "Long",
"拼团价格": "BigDecimal",
"拼团库存": "Long"
}
],
"删除商品规格IdList" : ["Long", "Long"],
"添加商品规格List": [
"商品SKU": "String",
"商品价格": "BigDecimal",
"拼团价格": "BigDecimal",
"拼团库存": "Long"
]
},
"详情": "String"
}

4
muyu-auth/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置

8
muyu-gateway/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置
@ -28,12 +28,12 @@ spring:
eager: true
transport:
# 控制台地址
dashboard: 124.221.28.250:8718
dashboard: 127.0.0.1:8718
# nacos配置持久化
datasource:
ds1:
nacos:
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
dataId: sentinel-muyu-gateway
groupId: DEFAULT_GROUP
data-type: json

4
muyu-modules/muyu-file/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
muyu-modules/muyu-job/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置

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

@ -5,6 +5,8 @@ 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.ActivityTeamInfoAddModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoSaveModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
import lombok.*;
import lombok.experimental.SuperBuilder;
@ -93,4 +95,38 @@ public class ActivityTeamInfo extends BaseEntity {
.strategyId(activityTeamInfoAddModel.getStrategyId())
.build();
}
public static ActivityTeamInfo teamSaveBuild(ActivityTeamInfoSaveModel activityTeamInfoSaveModel) {
return ActivityTeamInfo.builder()
.name(activityTeamInfoSaveModel.getName())
.productId(activityTeamInfoSaveModel.getProductId())
.productImage(activityTeamInfoSaveModel.getProductImage())
.introduction(activityTeamInfoSaveModel.getIntroduction())
.unit(activityTeamInfoSaveModel.getUnit())
.imageList(activityTeamInfoSaveModel.getImageList())
.endTime(activityTeamInfoSaveModel.getEndTime())
.sort(activityTeamInfoSaveModel.getSort())
.content(activityTeamInfoSaveModel.getContent())
.status(activityTeamInfoSaveModel.getStatus())
.strategyType(activityTeamInfoSaveModel.getStrategyType())
.strategyId(activityTeamInfoSaveModel.getStrategyId())
.build();
}
public static ActivityTeamInfo TeamUpdateBuild (ActivityTeamInfoUpdModel activityTeamInfoUpdModel){
return ActivityTeamInfo.builder()
.id(activityTeamInfoUpdModel.getId())
.name(activityTeamInfoUpdModel.getName())
.productId(activityTeamInfoUpdModel.getProductId())
.productImage(activityTeamInfoUpdModel.getProductImage())
.introduction(activityTeamInfoUpdModel.getIntroduction())
.unit(activityTeamInfoUpdModel.getUnit())
.imageList(activityTeamInfoUpdModel.getImageList())
.endTime(activityTeamInfoUpdModel.getEndTime())
.sort(activityTeamInfoUpdModel.getSort())
.content(activityTeamInfoUpdModel.getContent())
.status(activityTeamInfoUpdModel.getStatus())
.strategyType(activityTeamInfoUpdModel.getStrategyType())
.strategyId(activityTeamInfoUpdModel.getStrategyId())
.build();
}
}

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

@ -5,6 +5,7 @@ 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.ActivityTeamProductSkuReqModel;
import lombok.*;
import lombok.experimental.SuperBuilder;
@ -58,8 +59,19 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
.productId(activityTeamProductSkuAddModel.getProductId())
.teamId(activityTeamProductSkuAddModel.getTeamId())
.teamStock(activityTeamProductSkuAddModel.getTeamStock())
.productSku(activityTeamProductSkuAddModel.getSku())
.remainStock(activityTeamProductSkuAddModel.getTeamStock())
.teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
.build();
}
public static ActivityTeamProductSkuInfo updateModelBuild(ActivityTeamProductSkuReqModel activityTeamProductSkuReqModel) {
return ActivityTeamProductSkuInfo.builder()
.id(activityTeamProductSkuReqModel.getId())
.productId(activityTeamProductSkuReqModel.getProductId())
.teamStock(activityTeamProductSkuReqModel.getTeamStock())
.productSku(activityTeamProductSkuReqModel.getProductSku())
.teamPrice(activityTeamProductSkuReqModel.getTeamPrice())
.build();
}
}

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

@ -0,0 +1,102 @@
package com.muyu.marketing.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.marketing.domain.ActivityTeamInfo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
import java.util.function.Function;
/**
* @program: 2204a-cloud-server
* @description: 活动回显总模型
* @author: AoCi Tian
* @create: 2024-11-26 16:00
**/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamDetailModel {
/**
* 拼团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<ActivityTeamProductSkuModel> projectSkuInfoAddReqList;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
public static ActivityTeamDetailModel findSkuSumList (ActivityTeamInfo activityTeamInfo,
Function<ActivityTeamDetailModel.ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
return function.apply(ActivityTeamDetailModel.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())
);
}
}

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

@ -0,0 +1,92 @@
package com.muyu.marketing.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
import java.util.List;
/**
* @program: 2204a-cloud-server
* @description: 添加活动模型
* @author: AoCi Tian
* @create: 2024-11-26 10:59
**/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamInfoSaveModel {
/**
* 拼团名称
*/
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;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
public static ActivityTeamInfoSaveModel activityTeamInfoSaveModelBuild (ActivityTeamInfoAddModel activityTeamInfoAddModel){
return ActivityTeamInfoSaveModel.builder()
.name(activityTeamInfoAddModel.getName())
.productId(activityTeamInfoAddModel.getProductId())
.productImage(activityTeamInfoAddModel.getProductImage())
.introduction(activityTeamInfoAddModel.getIntroduction())
.unit(activityTeamInfoAddModel.getUnit())
.imageList(activityTeamInfoAddModel.getImageList())
.endTime(activityTeamInfoAddModel.getEndTime())
.sort(activityTeamInfoAddModel.getSort())
.content(activityTeamInfoAddModel.getContent())
.status(activityTeamInfoAddModel.getStatus())
.strategyType(activityTeamInfoAddModel.getStrategyType())
.strategyId(activityTeamInfoAddModel.getStrategyId())
.build();
}
}

101
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
View File

@ -1,8 +1,6 @@
package com.muyu.marketing.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -12,92 +10,47 @@ import java.util.Date;
import java.util.List;
/**
* 团购活动添加模型
*
* @author DongZeLiang
* @date 2024-11-26 09:38
*/
* @program: 2204a-cloud-server
* @description: 活动商品规格修改模型
* @author: AoCi Tian
* @create: 2024-11-26 19:25
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamInfoUpdModel {
/**
* 拼团名称
*/
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 Integer sort;
/**
* 商品SkU集合
*/
private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
/**
* 活动详情
*/
private Long sort;
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
private List<ActivityTeamProductSkuReqModel> activityTeamProductSkuModelList;
public static ActivityTeamInfoUpdModel addReqBuild (ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
return ActivityTeamInfoUpdModel.builder()
.name(activityTeamInfoSaveReq.getName())
.productId(activityTeamInfoSaveReq.getProductId())
.productImage(activityTeamInfoSaveReq.getProductImage())
.introduction(activityTeamInfoSaveReq.getIntroduction())
.unit(activityTeamInfoSaveReq.getUnit())
.imageList(activityTeamInfoSaveReq.getImageList())
.endTime(activityTeamInfoSaveReq.getEndTime())
.sort(activityTeamInfoSaveReq.getSort())
.content(activityTeamInfoSaveReq.getContent())
.status(activityTeamInfoSaveReq.getStatus())
.strategyType(activityTeamInfoSaveReq.getStrategyType())
.strategyId(activityTeamInfoSaveReq.getStrategyId())
.activityTeamProductSkuAddModelList(
activityTeamInfoSaveReq.getTeamProjectSkuInfoAddReqList()
.stream()
.map(addReq -> ActivityTeamProductSkuAddModel.addReqBuild(addReq, activityTeamInfoSaveReq::getProductId))
.toList()
).build();
.id(activityTeamInfoUpdReq.getId())
.name(activityTeamInfoUpdReq.getName())
.productId(activityTeamInfoUpdReq.getProductId())
.productImage(activityTeamInfoUpdReq.getProductImage())
.introduction(activityTeamInfoUpdReq.getIntroduction())
.unit(activityTeamInfoUpdReq.getUnit())
.imageList(activityTeamInfoUpdReq.getImageList())
.endTime(activityTeamInfoUpdReq.getEndTime())
.sort(activityTeamInfoUpdReq.getSort())
.content(activityTeamInfoUpdReq.getContent())
.status(activityTeamInfoUpdReq.getStatus())
.strategyType(activityTeamInfoUpdReq.getStrategyType())
.strategyId(activityTeamInfoUpdReq.getStrategyId())
.activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList())
.build();
}
}

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

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

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

@ -0,0 +1,50 @@
package com.muyu.marketing.domain.model;
import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
import com.muyu.marketing.domain.resp.ProjectFindSkuInfoResp;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* @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
*/
private String sku;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
/**
* 拼团库存
*/
private Long teamStock;
public static ActivityTeamProductSkuModel FindBuild(ActivityTeamProductSkuInfo activityTeamProductSkuInfo) {
return ActivityTeamProductSkuModel.builder()
.id(activityTeamProductSkuInfo.getId())
.sku(activityTeamProductSkuInfo.getProductSku())
.teamStock(activityTeamProductSkuInfo.getTeamStock())
.teamPrice(activityTeamProductSkuInfo.getTeamPrice())
.build();
}
}

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

@ -0,0 +1,40 @@
package com.muyu.marketing.domain.model;
import com.muyu.marketing.domain.req.ActivityTeamProductSkuReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* @program: 2204a-cloud-server
* @description: sku修改模型
* @author: AoCi Tian
* @create: 2024-11-26 19:45
**/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamProductSkuReqModel {
private Long id;
private Long teamId;
private Long productId;
private String productSku;
private Long teamStock;
private Long remainStock;
private BigDecimal teamPrice;
public static ActivityTeamProductSkuReqModel activityTeamProductSkuReqModelBuild(ActivityTeamProductSkuReq activityTeamProductSkuReq){
return ActivityTeamProductSkuReqModel.builder()
.id(activityTeamProductSkuReq.getId())
.productId(activityTeamProductSkuReq.getProductId())
.teamId(activityTeamProductSkuReq.getTeamId())
.productSku(activityTeamProductSkuReq.getProductSku())
.remainStock(activityTeamProductSkuReq.getRemainStock())
.teamStock(activityTeamProductSkuReq.getTeamStock())
.teamPrice(activityTeamProductSkuReq.getTeamPrice())
.build();
}
}

25
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java
View File

@ -1,6 +1,6 @@
package com.muyu.marketing.domain.model;
import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -9,34 +9,29 @@ import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* @ClassName ActivityTeamProductSkuUpdModel
* @Description 描述
* @Author zhen_xiong_feng
* @Date 2024/11/27 8:17
* 拼团活动商品SKU
*
* @author DongZeLiang
* @date 2024-11-27 14:18
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuUpdModel extends ActivityTeamProductSkuInfo {
public class ActivityTeamProductSkuUpdModel {
/**
* 团购活动ID
* 商品规格ID
*/
private Long teamId;
private Long id;
/**
* 删除商品规格ID
*/
private Long productId;
/**
* 拼团价格
* 团购价格
*/
private BigDecimal teamPrice;
/**
* 拼团库存
* 团购库存
*/
private Long teamStock;
}

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) {
return TeamProductDiscountPriceModel.builder()
return TeamProductDiscountPriceModel.builder()
.productPrice(productPrice)
.teamPrice(teamPrice)
.discount(

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

@ -0,0 +1,36 @@
package com.muyu.marketing.domain.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* @program: 2204a-cloud-server
* @description: 活动商品规格修改入参
* @author: AoCi Tian
* @create: 2024-11-26 19:25
**/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamInfoUpdReq {
private Long id;
private String name;
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;
private Long strategyId;
private List<ActivityTeamProductSkuReq> activityTeamProductSkuList;
}

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

@ -0,0 +1,28 @@
package com.muyu.marketing.domain.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* @program: 2204a-cloud-server
* @description: sku修改入参
* @author: AoCi Tian
* @create: 2024-11-26 19:45
**/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamProductSkuReq {
private Long id;
private Long teamId;
private Long productId;
private String productSku;
private Long teamStock;
private Long remainStock;
private BigDecimal teamPrice;
}

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

@ -0,0 +1,81 @@
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.req.TeamProjectSkuInfoAddReq;
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 ActivityTeamDetailResp extends BaseEntity {
/**
* 团购ID
*/
private Long teamId;
/**
* 拼团名称
*/
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<ActivityTeamProjectSkuResp> activityTeamProjectSkuList;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
}

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

@ -0,0 +1,38 @@
package com.muyu.marketing.domain.resp;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/**
* 添加的
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
public class ActivityTeamProjectSkuResp {
/**
* 团购商品SKU的ID
*/
private Long productSkuId;
/**
* 规格SKU
*/
private String sku;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
/**
* 拼团库存
*/
private Long teamStock;
}

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

@ -0,0 +1,48 @@
package com.muyu.marketing.domain.resp;
import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
/**
* 回显resp
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
public class ProjectFindSkuInfoResp {
/**
* 规格id
*/
private Long id;
/**
* 规格SKU
*/
private String sku;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
/**
* 拼团库存
*/
private Long teamStock;
public static ProjectFindSkuInfoResp projectFindSkuInfoBuild (ActivityTeamProductSkuModel activityTeamProductSkuModel) {
return ProjectFindSkuInfoResp.builder()
.teamStock(activityTeamProductSkuModel.getTeamStock())
.teamPrice(activityTeamProductSkuModel.getTeamPrice())
.id(activityTeamProductSkuModel.getId())
.sku(activityTeamProductSkuModel.getSku())
.build();
}
}

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

@ -0,0 +1,107 @@
package com.muyu.marketing.domain.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.marketing.domain.model.ActivityTeamDetailModel;
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;
/**
* @program: 2204a-cloud-server
* @description: 团购活动回显响应
* @author: AoCi Tian
* @create: 2024-11-26 15:19
**/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class TeamInfoFindByIdResp {
/**
* 拼团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<ProjectFindSkuInfoResp> projectSkuInfoAddList;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
public static TeamInfoFindByIdResp teamInfoFindByIdBuild (ActivityTeamDetailModel activityTeamDetailModel){
return TeamInfoFindByIdResp.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())
.projectSkuInfoAddList(activityTeamDetailModel.getProjectSkuInfoAddReqList().stream().map(ProjectFindSkuInfoResp::projectFindSkuInfoBuild).toList())
// .projectSkuInfoAddList(
// teamInfoFindByIdRespModel.getProjectSkuInfoAddReqList().stream().map(activityTeamProductSkuModel ->
// ProjectFindSkuInfoResp.projectFindSkuInfoBuild(activityTeamProductSkuModel)).toList()
// )
.content(activityTeamDetailModel.getContent())
.status(activityTeamDetailModel.getStatus())
.strategyType(activityTeamDetailModel.getStrategyType())
.strategyId(activityTeamDetailModel.getStrategyId())
.build();
}
}

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

@ -5,12 +5,13 @@ 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.ActivityTeamInfoUpdModel;
import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
import com.muyu.marketing.domain.req.TeamInfoListReq;
import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
import com.muyu.marketing.domain.resp.TeamInfoListResp;
import com.muyu.marketing.team.service.ActivityTeamInfoService;
import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -28,14 +29,12 @@ public class ActivityTeamController {
@Autowired
private ActivityTeamInfoService activityTeamInfoService;;
@Autowired
private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
/**
* 查询营销团购活动列表
* @param teamInfoListReq 活动查询入参
* @return 活动响应结果
*/
@ApiOperation("查询团购活动列表")
@PostMapping("/list")
public Result<TableDataInfo<TeamInfoListResp>> list(@RequestBody TeamInfoListReq teamInfoListReq) {
TableDataInfo<ActivityTeamInfoListModel> tableDataInfo = activityTeamInfoService.query(teamInfoListReq.buildQueryModel());
@ -54,15 +53,19 @@ public class ActivityTeamController {
* @param activityTeamInfoSaveReq 添加请求对象
* @return 结果集
*/
@ApiOperation("添加团购活动")
@PostMapping
public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
return Result.success();
}
@ApiOperation("活动回显")
@GetMapping("/echo/{teamId}")
public Result echo(@PathVariable("teamId") Long teamId) {
return Result.success(activityTeamProductSkuInfoService.echo(teamId));
@PostMapping("/findById/{id}")
public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
}
@PutMapping("/updateByTeamId")
public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
return Result.success();
}
}

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

@ -5,8 +5,6 @@ import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.marketing.domain.ActivityTeamInfo;
import com.muyu.marketing.domain.model.*;
import java.util.List;
public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
@ -24,15 +22,18 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
/**
* 通过upd模型，去进行商品拼团活动的操作
* @param activityTeamInfoUpdModel 团购添加模型
* 根据ID查询商品的详情
* @param id 团购活动ID
* @return 团购详情
*/
public void upd(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
ActivityTeamDetailModel findDetailById(Long id);
/**
* 活动回显
* @param id
* @return
* 修改团购活动信息
* @param activityTeamInfoUpdModel 团购活动信息
* @return 是否成功
*/
public TeamEchoModel echo(Long id);
boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
}

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

@ -40,17 +40,12 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
/**
* 修改
* @param activityTeamProductSkuUpdModels
* 通过拼团活动ID获取拼团下商品SKU集合
* @param teamId 活动ID
* @return 拼团商品SKU集合
*/
public void batchUpd(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModels);
public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
/**
* 回显团购商品SKU信息
* @param teamId
* @return
*/
public List<ActivityTeamProductSkuEchoModel> echo(Long teamId);
}

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

@ -1,10 +1,8 @@
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;
@ -17,9 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
@Service
@ -83,15 +79,30 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
}
/**
* 根据ID查询商品的详情
* @param id 团购活动ID
* @return 团购详情
*/
@Override
public void upd(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
public ActivityTeamDetailModel findDetailById(Long id) {
ActivityTeamInfo activityTeamInfo = this.getById(id);
List<ActivityTeamProductSkuModel> activityTeamProductSkuModelList = activityTeamProductSkuInfoService.findListByTeamId(id);
return ActivityTeamDetailModel.findSkuSumList(activityTeamInfo,
(teamInfoFindByIdRespModelBuilder) -> teamInfoFindByIdRespModelBuilder.projectSkuInfoAddReqList(activityTeamProductSkuModelList).build()
);
}
/**
* 修改团购活动信息
* @param activityTeamInfoUpdModel 团购活动信息
* @return 是否成功
*/
@Override
public TeamEchoModel echo(Long id) {
ActivityTeamInfo byId = this.getById(id);
TeamEchoModel teamEchoModel = TeamEchoModel.echoModelBuild(byId);
return teamEchoModel;
public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
io.jsonwebtoken.lang.Assert.isTrue(update,"修改失败");
activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdModel.getActivityTeamProductSkuModelList());
return update;
}
}

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

@ -3,17 +3,15 @@ package com.muyu.marketing.team.service.impl;
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.ActivityTeamInfo;
import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
import com.muyu.marketing.domain.model.*;
import com.muyu.marketing.domain.resp.TeamInfoEcho;
import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
import com.muyu.product.cache.ProjectSkuCache;
import com.muyu.product.domain.ProjectSkuInfo;
import org.springframework.beans.BeanUtils;
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;
@ -82,26 +80,24 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
);
}
@Override
public void batchUpd(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModels) {
}
/**
* 团购商品SKU回显
* @param teamId
* @return
* 通过拼团活动ID获取拼团下商品SKU集合
*
* @param teamId 活动ID
* @return 拼团商品SKU集合
*/
@Override
public List<ActivityTeamProductSkuEchoModel> echo(Long teamId) {
// 查询团购商品SKU回显集合
public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
// 团购ID
queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId, teamId);
List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfo = this.list(queryWrapper);
return activityTeamProductSkuInfo.stream().map(
ActivityTeamProductSkuEchoModel::modelBuild
).toList();
queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
// return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
}
@Transactional
@Override
public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
}
}

6
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-buy
profiles:
# 环境配置
active: dev
@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
View File

@ -16,10 +16,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
muyu-modules/muyu-system/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置

4
muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
config:
# 配置中心地址
server-addr: 124.221.28.250:8848
server-addr: 120.46.147.226:8848
# 配置文件格式
file-extension: yml
# 共享配置