cui-fubo
/
2024-cloud-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fax():合并代码并补全功能

1127/cloud-server
cui-fubo 2024-12-04 21:54:02 +08:00
parent 178802e6cd
commit 77d901bd4d
60 changed files with 2354 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
muyu-gateway/src/main/java/com/muyu/gateway/config/properties/CorsConfig.java 100644
View File

@ -0,0 +1,60 @@
package com.muyu.gateway.config.properties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.web.cors.reactive.CorsUtils;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.WebFilterChain;
import reactor.core.publisher.Mono;
/**
* 跨域配置
*
* @author ruoyi
*/
@Configuration
public class CorsConfig
{
/**
* 这里为支持的请求头，如果有自定义的header字段请自己添加
*/
private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token";
private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD";
private static final String ALLOWED_ORIGIN = "*";
private static final String ALLOWED_EXPOSE = "*";
private static final String MAX_AGE = "18000L";
@Bean
public WebFilter corsFilter()
{
return (ServerWebExchange ctx, WebFilterChain chain) -> {
ServerHttpRequest request = ctx.getRequest();
if (CorsUtils.isCorsRequest(request))
{
ServerHttpResponse response = ctx.getResponse();
HttpHeaders headers = response.getHeaders();
headers.add("Access-Control-Allow-Headers", ALLOWED_HEADERS);
headers.add("Access-Control-Allow-Methods", ALLOWED_METHODS);
headers.add("Access-Control-Allow-Origin", ALLOWED_ORIGIN);
headers.add("Access-Control-Expose-Headers", ALLOWED_EXPOSE);
headers.add("Access-Control-Max-Age", MAX_AGE);
headers.add("Access-Control-Allow-Credentials", "true");
if (request.getMethod() == HttpMethod.OPTIONS)
{
response.setStatusCode(HttpStatus.OK);
return Mono.empty();
}
}
return chain.filter(ctx);
};
}
}

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

@ -1,6 +1,11 @@
package com.muyu.domain; package com.muyu.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.muyu.domain.model.ActivityTeamInfoAddModel; import com.muyu.domain.model.ActivityTeamInfoAddModel;
import com.muyu.domain.model.ActivityTeamInfoSaveModel;
import com.muyu.domain.model.ActivityTeamInfoUpdModel;
import com.muyu.domain.req.ActivityTeamInfoSaveReq;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -14,9 +19,12 @@ import java.util.Date;
@NoArgsConstructor @NoArgsConstructor
public class ActivityTeamInfo { public class ActivityTeamInfo {
/** /**
* 主键 * 主键
*/ */
@TableId(value = "id", type = IdType.AUTO)
private long id; private long id;
/** /**
* 拼团名称 * 拼团名称
@ -67,12 +75,74 @@ public class ActivityTeamInfo {
*/ */
private long strategyId; private long strategyId;
/**
* 公共添加模型，转换成添加对象
public ActivityTeamInfo buildList(){ * @param activityTeamInfoAddModel 添加模型
* @return 添加对象
*/
public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel){
return ActivityTeamInfo.builder() return ActivityTeamInfo.builder()
.status(this.status) .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();
}
public static ActivityTeamInfo buildModel(ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
String images = activityTeamInfoSaveReq.getImageList().toString();
return ActivityTeamInfo.builder()
.productId(activityTeamInfoSaveReq.getProjectId())
.productImage(activityTeamInfoSaveReq.getProjectImage())
.unit(activityTeamInfoSaveReq.getUnit())
.imageList(images)
.name(activityTeamInfoSaveReq.getName())
.introduction(activityTeamInfoSaveReq.getIntroduction())
.endTime(activityTeamInfoSaveReq.getEndTime())
.strategyId(activityTeamInfoSaveReq.getStrategyId())
.strategyType(activityTeamInfoSaveReq.getStrategyType())
.sort(activityTeamInfoSaveReq.getSort())
.build(); .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();
}
} }

26
muyu-modules/muyu-marketing/muyu-marketing-common/src/main/java/com/muyu/domain/ActivityTeamOpenInfo.java
View File

@ -1,6 +1,10 @@
package com.muyu.domain; package com.muyu.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.domain.model.ActivityTeamOpenInfoAddModel;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -16,11 +20,12 @@ public class ActivityTeamOpenInfo {
/** /**
* 主键 * 主键
*/ */
private long id; @TableId(value = "id",type = IdType.AUTO)
private Long id;
/** /**
* 团购活动ID * 团购活动ID
*/ */
private long teamId; private Long teamId;
/** /**
* 团购类型 * 团购类型
*/ */
@ -28,7 +33,7 @@ public class ActivityTeamOpenInfo {
/** /**
* 团购策略 * 团购策略
*/ */
private String teamStrategyId; private Long teamStrategyId;
/** /**
* 参团类型 * 参团类型
*/ */
@ -36,11 +41,12 @@ public class ActivityTeamOpenInfo {
/** /**
* 结束团购时间 * 结束团购时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime; private Date endTime;
/** /**
* 商品ID * 商品ID
*/ */
private String productId; private Long productId;
/** /**
* 商品名称 * 商品名称
*/ */
@ -52,15 +58,23 @@ public class ActivityTeamOpenInfo {
/** /**
* 开团标识 * 开团标识
*/ */
private String key; private String openkey;
/** /**
* 订单ID * 订单ID
*/ */
private String orderId; private Long orderId;
/** /**
* 开团状态 * 开团状态
*/ */
private String status; private String status;
public static ActivityTeamOpenInfo add(ActivityTeamOpenInfoAddModel addModel){
return ActivityTeamOpenInfo.builder()
.teamId(addModel.getTeamId())
.teamType(addModel.getTeamType())
.teamStrategyId(addModel.getTeamStrategyId())
.build();
}
} }

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

@ -1,5 +1,10 @@
package com.muyu.domain; package com.muyu.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.muyu.domain.model.ActivityTeamProductSkuAddModel;
import com.muyu.domain.model.ActivityTeamProductSkuReqModel;
import com.muyu.domain.model.ActivityTeamProductSkuUpdModel;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -15,6 +20,7 @@ public class ActivityTeamProductSkuInfo {
/** /**
* 主键 * 主键
*/ */
@TableId(value = "id", type = IdType.AUTO)
private long id; private long id;
/** /**
* 活动ID * 活动ID
@ -28,18 +34,51 @@ public class ActivityTeamProductSkuInfo {
* 商品SKU * 商品SKU
*/ */
private String productSku; private String productSku;
/**
* 商品库存
*/
private Long productStock;
/** /**
* 拼团库存 * 拼团库存
*/ */
private Long teamStock; private Long teamStock;
/**
* 剩余库存
*/
private Long remainStock;
/** /**
* 拼团价格 * 拼团价格
*/ */
private BigDecimal teamPrice; private BigDecimal teamPrice;
/**
* 通过模型钢构件对象
* @param activityTeamProductSkuAddModel 模型
* @return 对象
*/
public static ActivityTeamProductSkuInfo modelBuild(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) {
return ActivityTeamProductSkuInfo.builder()
.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();
}
public static ActivityTeamProductSkuInfo updModelBuild(ActivityTeamProductSkuUpdModel teamProductSkuUpdModel){
return ActivityTeamProductSkuInfo.builder()
.id(teamProductSkuUpdModel.getId())
.teamPrice(teamProductSkuUpdModel.getTeamPrice())
.teamStock(teamProductSkuUpdModel.getTeamStock())
.remainStock(teamProductSkuUpdModel.getTeamStock())
.build();
}
} }

5
muyu-modules/muyu-marketing/muyu-marketing-common/src/main/java/com/muyu/domain/model/ActivitySkuModel.java
View File

@ -1,7 +1,8 @@
package com.muyu.domain.model; package com.muyu.domain.model;
import com.muyu.domain.req.ActivitInfoSkuAddReq;
import com.muyu.domain.req.ActivityInfoAddReq; import com.muyu.domain.req.ActivityInfoAddReq;
import com.muyu.domain.req.ActivityInfoSkuAddReq;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -21,7 +22,7 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
public class ActivitySkuModel { public class ActivitySkuModel {
List<ActivitInfoSkuAddReq> activityInfoAdd; List<ActivityInfoSkuAddReq> activityInfoAdd;
public static ActivitySkuModel activitySkuModel(ActivityInfoAddReq req){ public static ActivitySkuModel activitySkuModel(ActivityInfoAddReq req){
return ActivitySkuModel.builder() return ActivitySkuModel.builder()

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

@ -0,0 +1,102 @@
package com.muyu.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.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<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())
);
}
}

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

@ -0,0 +1,106 @@
package com.muyu.domain.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.muyu.domain.ActivityTeamInfo;
import com.muyu.domain.resp.TeamInfoProductSkuIdByIdResp;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* 团购活动回显模板
*
* @author: CuiFu Bo
* @create: 2024-11-27 00:49
**/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ActivityTeamFindByIdModel {
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
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;
/**
* 商品SkU集合
*/
private List<TeamInfoProductSkuIdByIdResp> teamProjectSkuInfoAddReqList;
public static ActivityTeamFindByIdModel findByIdModel(ActivityTeamInfo activityTeamInfo, List<TeamInfoProductSkuIdByIdResp> teamProjectSkuInfoAddReqList){
return ActivityTeamFindByIdModel.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())
.teamProjectSkuInfoAddReqList(teamProjectSkuInfoAddReqList)
.build();
}
}

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

@ -24,10 +24,18 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class ActivityTeamInfoAddModel { public class ActivityTeamInfoAddModel {
/**
* 商品iD
*/
private Long productId;
/** /**
*商品图片 *商品图片
*/ */
private String productImage; private String productImage;
/**
* 商品轮播图
*/
private String imageList;
/** /**
*活动名称 *活动名称
*/ */
@ -60,11 +68,16 @@ public class ActivityTeamInfoAddModel {
*排序 *排序
*/ */
private long sort; private long sort;
/**
* 状态
*/
private String status;
/** /**
*详情 *详情
*/ */
private String content; private String content;
public static ActivityTeamInfoAddModel activityTeamInfoAddModel (ActivityInfoAddReq req){ public static ActivityTeamInfoAddModel activityTeamInfoAddModel (ActivityInfoAddReq req){
return ActivityTeamInfoAddModel.builder() return ActivityTeamInfoAddModel.builder()
.productImage(req.getProductImage()) .productImage(req.getProductImage())

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

@ -0,0 +1,90 @@
package com.muyu.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @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();
}
}

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

@ -0,0 +1,60 @@
package com.muyu.domain.model;
import com.muyu.domain.req.ActivityTeamInfoUpdReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @program: 2204a-cloud-server
* @description: 活动商品规格修改模型
* @author: AoCi Tian
* @create: 2024-11-26 19:25
**/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamInfoUpdModel {
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 ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
return ActivityTeamInfoUpdModel.builder()
.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())
.activityTeamProductSkuSettingModel(
ActivityTeamProductSkuSettingModel.settingReqModel(
activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
activityTeamInfoUpdReq::getProductId
)
)
.build();
}
}

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

@ -0,0 +1,69 @@
package com.muyu.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
/**
* @author CuiFu Bo
* @create 2024-12-04 19:05
**/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
public class ActivityTeamOpenInfoAddModel {
/**
* 团购活动ID
*/
private Long teamId;
/**
* 团购类型
*/
private String teamType;
/**
* 团购策略
*/
private Long teamStrategyId;
/**
* 参团类型
*/
private String executiveType;
/**
* 结束团购时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
* 商品ID
*/
private Long productId;
/**
* 商品名称
*/
private String productName;
/**
* 商品规格
*/
private String productSku;
/**
* 开团标识
*/
private String openkey;
/**
* 订单ID
*/
private Long orderId;
/**
* 开团状态
*/
private String status;
}

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

@ -0,0 +1,58 @@
package com.muyu.domain.model;
import com.muyu.domain.req.TeamProjectSkuInfoAddReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.function.Supplier;
/**
* 团购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;
public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
return ActivityTeamProductSkuAddModel.builder()
.productId(productId.get())
.sku(teamProjectSkuInfoAddReq.getSku())
.teamStock(teamProjectSkuInfoAddReq.getTeamStock())
.teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
.build();
}
}

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

@ -0,0 +1,55 @@
package com.muyu.domain.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 团购活动规格查询模型
*
* @author: CuiFu Bo
* @create: 2024-11-27 00:54
**/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ActivityTeamProductSkuIdModel {
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private long id;
/**
* 活动ID
*/
private long teamId;
/**
* 商品ID
*/
private Long productId;
/**
* 商品SKU
*/
private String productSku;
/**
* 拼团库存
*/
private Long teamStock;
/**
* 剩余库存
*/
private Long remainStock;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
}

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

@ -0,0 +1,51 @@
package com.muyu.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/muyu-marketing-common/src/main/java/com/muyu/domain/model/ActivityTeamProductSkuModel.java 100644
View File

@ -0,0 +1,50 @@
package com.muyu.domain.model;
import com.muyu.domain.ActivityTeamProductSkuInfo;
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/muyu-marketing-common/src/main/java/com/muyu/domain/model/ActivityTeamProductSkuReqModel.java 100644
View File

@ -0,0 +1,40 @@
package com.muyu.domain.model;
import com.muyu.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();
}
}

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

@ -0,0 +1,59 @@
package com.muyu.domain.model;
import com.muyu.domain.req.ActivityTeamProductSkuSettingReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
import java.util.function.Supplier;
/**
* 团购商品规格一键设置
*
* @author DongZeLiang
* @date 2024-11-28 11:15
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuSettingModel {
/**
* 活动ID
*/
private Long teamId;
/**
* 删除的ID集合
*/
private List<Long> removeIds;
/**
* 添加的规格集合
*/
private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
/**
* 修改的规格集合
*/
private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList;
public static ActivityTeamProductSkuSettingModel settingReqModel(ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq, Supplier<Long> productId) {
return ActivityTeamProductSkuSettingModel.builder()
.removeIds(activityTeamProductSkuSettingReq.getRemoveIds())
.activityTeamProductSkuAddModelList(
activityTeamProductSkuSettingReq.getTeamProjectSkuInfoAddReqList().stream()
.map(teamProjectSkuInfoAddReq -> ActivityTeamProductSkuAddModel.addReqBuild(teamProjectSkuInfoAddReq, productId))
.toList()
)
.activityTeamProductSkuUpdModelList(
activityTeamProductSkuSettingReq.getTeamProjectSkuInfoUpdReqList().stream()
.map(ActivityTeamProductSkuUpdModel::updReqBuild)
.toList()
).build();
}
}

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

@ -0,0 +1,46 @@
package com.muyu.domain.model;
import com.muyu.domain.req.TeamProjectSkuInfoUpdReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 拼团活动商品SKU
*
* @author DongZeLiang
* @date 2024-11-27 14:18
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuUpdModel {
/**
* 商品规格ID
*/
private Long id;
/**
* 团购价格
*/
private BigDecimal teamPrice;
/**
* 团购库存
*/
private Long teamStock;
public static ActivityTeamProductSkuUpdModel updReqBuild(TeamProjectSkuInfoUpdReq teamProjectSkuInfoUpdReq){
return ActivityTeamProductSkuUpdModel.builder()
.id(teamProjectSkuInfoUpdReq.getId())
.teamStock(teamProjectSkuInfoUpdReq.getTeamStock())
.teamPrice(teamProjectSkuInfoUpdReq.getTeamPrice())
.build();
}
}

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

@ -69,5 +69,5 @@ public class ActivityInfoAddReq {
/** /**
* 商品规格 * 商品规格
*/ */
private List<ActivitInfoSkuAddReq> skuList; private List<ActivityInfoSkuAddReq> skuList;
} }

2
muyu-modules/muyu-marketing/muyu-marketing-common/src/main/java/com/muyu/domain/req/ActivitInfoSkuAddReq.java → muyu-modules/muyu-marketing/muyu-marketing-common/src/main/java/com/muyu/domain/req/ActivityInfoSkuAddReq.java
View File

@ -18,7 +18,7 @@ import java.math.BigDecimal;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class ActivitInfoSkuAddReq { public class ActivityInfoSkuAddReq {
/** /**
* 商品规格 * 商品规格
*/ */

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

@ -0,0 +1,74 @@
package com.muyu.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 projectId;
/**
* 商品活动图
*/
private String projectImage;
/**
* 活动简介
*/
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<ActivityInfoSkuAddReq> teamProjectSkuInfoAddReqList;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
}

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

@ -0,0 +1,35 @@
package com.muyu.domain.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @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 ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
}

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

@ -0,0 +1,28 @@
package com.muyu.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;
}

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

@ -0,0 +1,36 @@
package com.muyu.domain.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 团购商品规格设置
*
* @author DongZeLiang
* @date 2024-11-28 11:27
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuSettingReq {
/**
* 删除的ID集合
*/
private List<Long> removeIds;
/**
* 添加的规格集合
*/
private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
/**
* 添加的规格集合
*/
private List<TeamProjectSkuInfoUpdReq> teamProjectSkuInfoUpdReqList;
}

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

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

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

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

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

@ -0,0 +1,80 @@
package com.muyu.domain.resp;
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 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/muyu-marketing-common/src/main/java/com/muyu/domain/resp/ActivityTeamProjectSkuResp.java 100644
View File

@ -0,0 +1,38 @@
package com.muyu.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;
}

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

@ -0,0 +1,46 @@
package com.muyu.domain.resp;
import com.muyu.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/muyu-marketing-common/src/main/java/com/muyu/domain/resp/TeamInfoFindByIdResp.java 100644
View File

@ -0,0 +1,107 @@
package com.muyu.domain.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.domain.model.ActivityTeamDetailModel;
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();
}
}

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

@ -0,0 +1,102 @@
package com.muyu.domain.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.domain.model.ActivityTeamFindByIdModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* 团购活动回显
*
* @author: CuiFu Bo
* @create: 2024-11-27 01:02
**/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class TeamInfoListByIdResp {
/**
* 拼团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<TeamInfoProductSkuIdByIdResp> teamProjectSkuInfoAddReqList;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private Long strategyId;
public static TeamInfoListByIdResp teamInfoProductSkuIdByIdResp(ActivityTeamFindByIdModel activityTeamFindByIdModel){
return TeamInfoListByIdResp.builder()
.id(activityTeamFindByIdModel.getId())
.name(activityTeamFindByIdModel.getName())
.productId(activityTeamFindByIdModel.getProductId())
.productImage(activityTeamFindByIdModel.getProductImage())
.introduction(activityTeamFindByIdModel.getIntroduction())
.unit(activityTeamFindByIdModel.getUnit())
.imageList(activityTeamFindByIdModel.getImageList())
.endTime(activityTeamFindByIdModel.getEndTime())
.sort(activityTeamFindByIdModel.getSort())
.teamProjectSkuInfoAddReqList(activityTeamFindByIdModel.getTeamProjectSkuInfoAddReqList())
.content(activityTeamFindByIdModel.getContent())
.status(activityTeamFindByIdModel.getStatus())
.strategyType(activityTeamFindByIdModel.getStrategyType())
.strategyId(activityTeamFindByIdModel.getStrategyId())
.build();
}
}

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

@ -0,0 +1,67 @@
package com.muyu.domain.resp;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.muyu.domain.model.ActivityTeamProductSkuIdModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 团购活动规格回显
*
* @author: CuiFu Bo
* @create: 2024-11-27 00:57
**/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class TeamInfoProductSkuIdByIdResp {
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
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 TeamInfoProductSkuIdByIdResp buildModel(ActivityTeamProductSkuIdModel activityTeamProductSkuIdModel) {
return TeamInfoProductSkuIdByIdResp.builder()
.id(activityTeamProductSkuIdModel.getId())
.teamId(activityTeamProductSkuIdModel.getTeamId())
.productId(activityTeamProductSkuIdModel.getProductId())
.productSku(activityTeamProductSkuIdModel.getProductSku())
.teamPrice(activityTeamProductSkuIdModel.getTeamPrice())
.remainStock(activityTeamProductSkuIdModel.getRemainStock())
.teamStock(activityTeamProductSkuIdModel.getTeamStock())
.build();
}
}

5
muyu-modules/muyu-marketing/muyu-marketing-server/pom.xml
View File

@ -92,6 +92,11 @@
<groupId>com.dtflys.forest</groupId> <groupId>com.dtflys.forest</groupId>
<artifactId>forest-spring-boot-starter</artifactId> <artifactId>forest-spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.3</version>
</dependency>
</dependencies> </dependencies>

38
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java
View File

@ -10,13 +10,18 @@ import com.muyu.domain.ActivityTeamInfo;
import com.muyu.domain.model.ActivitySkuModel; import com.muyu.domain.model.ActivitySkuModel;
import com.muyu.domain.model.ActivityTeamInfoAddModel; import com.muyu.domain.model.ActivityTeamInfoAddModel;
import com.muyu.domain.model.ActivityTeamInfoListModel; import com.muyu.domain.model.ActivityTeamInfoListModel;
import com.muyu.domain.model.ActivityTeamInfoUpdModel;
import com.muyu.domain.req.ActivityInfoAddReq; import com.muyu.domain.req.ActivityInfoAddReq;
import com.muyu.domain.req.ActivityTeamInfoSaveReq;
import com.muyu.domain.req.ActivityTeamInfoUpdReq;
import com.muyu.domain.req.TeamInfoListReq; import com.muyu.domain.req.TeamInfoListReq;
import com.muyu.domain.resp.TeamInfoFindByIdResp;
import com.muyu.domain.resp.TeamInfoListResp; import com.muyu.domain.resp.TeamInfoListResp;
import com.muyu.system.team.service.ActivityTeamInfoService; import com.muyu.system.team.service.ActivityTeamInfoService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.ParseException;
import java.util.List; import java.util.List;
/** /**
@ -53,16 +58,35 @@ public class ActivityTeamInfoController {
} }
/** /**
* 拼团活动添加 * 新增团购活动
* @param activityInfoAddReq 拼团活动 * @param activityTeamInfoSaveReq 团购参数
* @return 拼团活动 * @return
*/ */
@RequiresPermissions("marketing:marketing:save") @RequiresPermissions("marketing:marketing:save")
@PostMapping("/activityInfoAdd") @PostMapping("/save")
public Result<ActivityTeamInfoAddModel> activityInfoAdd(@RequestBody ActivityInfoAddReq activityInfoAddReq){ public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq ) throws ParseException {
activityTeamInfoService.activityAndProductList(ActivityTeamInfoAddModel.activityTeamInfoAddModel(activityInfoAddReq) return activityTeamInfoService.save(activityTeamInfoSaveReq);
, ActivitySkuModel.activitySkuModel(activityInfoAddReq)); }
@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(); return Result.success();
} }
/**
* 根据ID查询详情
* @param id 活动I D
* @return 活动详情
*/
@GetMapping("/teamList/{id}")
public Result<List<ActivityTeamInfo>> teamList(@PathVariable("id") Long id){
List<ActivityTeamInfo> activityTeamInfoList= activityTeamInfoService.teamList(id);
return Result.success(activityTeamInfoList);
}
} }

12
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamOpenInfoController.java
View File

@ -1,12 +1,22 @@
package com.muyu.system.team.controller; package com.muyu.system.team.controller;
import com.muyu.system.team.service.ActivityTeamOpenInfoService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/** /**
* 团购活动执行表 * 团购活动执行表
* @program: cloud-server * @program: cloud-server
* @author: CuiFu Bo * @author: CuiFu Bo
* @create: 2024-11-20 21:50 * @create: 2024-11-20 21:50
**/ **/
@Api(tags = "团购活动执行")
@RestController
@RequestMapping("/open")
public class ActivityTeamOpenInfoController { public class ActivityTeamOpenInfoController {
@Autowired(required=true)
private ActivityTeamOpenInfoService activityTeamOpenInfoService;
} }

1
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamProductSkuInfoController.java
View File

@ -8,4 +8,5 @@ package com.muyu.system.team.controller;
public class ActivityTeamProductSkuInfoController { public class ActivityTeamProductSkuInfoController {
} }

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

@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.core.domain.Result; import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.domain.ActivityTeamInfo; import com.muyu.domain.ActivityTeamInfo;
import com.muyu.domain.model.ActivitySkuModel; import com.muyu.domain.model.*;
import com.muyu.domain.model.ActivityTeamInfoAddModel; import com.muyu.domain.req.ActivityTeamInfoSaveReq;
import com.muyu.domain.model.ActivityTeamInfoListModel;
import com.muyu.domain.model.ActivityTeamInfoListQueryModel;
import com.muyu.product.domain.req.ProjectInfoSaveReq; import com.muyu.product.domain.req.ProjectInfoSaveReq;
import java.util.List; import java.util.List;
@ -26,9 +24,28 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel); public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel);
void activityAndProductList(ActivityTeamInfoAddModel activityTeamInfoAddModel, ActivitySkuModel activitySkuModel); Result<String> save(ActivityTeamInfoSaveReq activityTeamInfoSaveReq);
/**
* 根据ID查询商品的详情
* @param id 团购活动ID
* @return 团购详情
*/
ActivityTeamDetailModel findDetailById(Long id);
/**
* 修改团购活动信息
* @param activityTeamInfoUpdModel 团购活动信息
* @return 是否成功
*/
boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
/**
* 根据活动ID查询详情
* @param id id
* @return 查询详情
*/
List<ActivityTeamInfo> teamList(Long id);
} }

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

@ -3,8 +3,7 @@ package com.muyu.system.team.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.domain.ActivityTeamProductSkuInfo; import com.muyu.domain.ActivityTeamProductSkuInfo;
import com.muyu.domain.model.TeamDiscountPriceModel; import com.muyu.domain.model.*;
import com.muyu.domain.model.TeamProductStockModel;
import java.util.List; import java.util.List;
@ -15,12 +14,13 @@ import java.util.List;
**/ **/
public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeamProductSkuInfo> { public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeamProductSkuInfo> {
public default List<ActivityTeamProductSkuInfo> getActivityTeamProductSkuInfoByActivity(Long teamId) { public default List<ActivityTeamProductSkuInfo> getActivityTeamProductSkuInfoByTeamId(Long teamId){
LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ActivityTeamProductSkuInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId, teamId); lambdaQueryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId, teamId);
return (this.list(queryWrapper)); return this.list(lambdaQueryWrapper);
} }
/** /**
* 通过活动ID获取商品最优惠的价格 * 通过活动ID获取商品最优惠的价格
* @param teamId 活动Id * @param teamId 活动Id
@ -33,7 +33,46 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
* @param teamId 活动Id * @param teamId 活动Id
* @return 剩余库存 * @return 剩余库存
*/ */
public TeamProductStockModel getProductStockModer(Long teamId); public TeamProductStockModel getStock(Long teamId);
/**
* 添加团购商品SKU
* @param activityTeamProductSkuAddModelList 团购商品SKU添加模型集合
*/
public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
/**
* 通过拼团活动ID获取拼团下商品SKU集合
* @param teamId 活动ID
* @return 拼团商品SKU集合
*/
public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
/**
* 根据 业务模型 进行 团购商品修改
* @param activityTeamProductSkuUpdModel 修改业务模型
* @return 修改结果
*/
public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel);
/**
* 根据 业务模型 进行 团购商品批量修改
* @param activityTeamProductSkuUpdModelList 修改业务模型
* @return 修改结果
*/
public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
/**
* 一键设置
* @param activityTeamProductSkuSettingModel 整体修改模型
*/
public default void setting(ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel){
this.batchSave(activityTeamProductSkuSettingModel.getActivityTeamProductSkuAddModelList());
this.batchUpdate(activityTeamProductSkuSettingModel.getActivityTeamProductSkuUpdModelList());
this.removeByIds(activityTeamProductSkuSettingModel.getRemoveIds());
}
} }

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

@ -1,15 +0,0 @@
package com.muyu.system.team.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.domain.TeamStrategyExemptionHundred;
/**
* 百人策略
* @author: CuiFu Bo
* @create: 2024-11-20 21:38
**/
public interface TeamStrategyExemptionHundredService extends IService<TeamStrategyExemptionHundred> {
}

3
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/TeamStrategyExemptionService.java
View File

@ -2,13 +2,14 @@ package com.muyu.system.team.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.domain.TeamStrategyExemption; import com.muyu.domain.TeamStrategyExemption;
import com.muyu.system.team.strategy.ActivityTeamStrategy;
/** /**
* 拼团免单策略 * 拼团免单策略
* @author: CuiFu Bo * @author: CuiFu Bo
* @create: 2024-11-20 21:38 * @create: 2024-11-20 21:38
**/ **/
public interface TeamStrategyExemptionService extends IService<TeamStrategyExemption> { public interface TeamStrategyExemptionService extends ActivityTeamStrategy, IService<TeamStrategyExemption> {
} }

23
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/TeamStrategyHundredService.java 100644
View File

@ -0,0 +1,23 @@
package com.muyu.system.team.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.domain.TeamStrategyExemptionHundred;
import com.muyu.system.team.strategy.ActivityTeamStrategy;
/**
* 百人策略
* @author: CuiFu Bo
* @create: 2024-11-20 21:38
**/
public interface TeamStrategyHundredService extends ActivityTeamStrategy, IService<TeamStrategyExemptionHundred> {
/**
* 开团
*/
public void openTeam(Long activityTeamId,String orderNumber);
/**
* 参团
*/
public void addTeam(Long teamId,String orderNumber);
}

3
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/TeamStrategyExemptionOrdinaryService.java → muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/TeamStrategyOrdinaryService.java
View File

@ -2,13 +2,14 @@ package com.muyu.system.team.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.domain.TeamStrategyExemptionOrdinary; import com.muyu.domain.TeamStrategyExemptionOrdinary;
import com.muyu.system.team.strategy.ActivityTeamStrategy;
/** /**
* 普通策略 * 普通策略
* @author: CuiFu Bo * @author: CuiFu Bo
* @create: 2024-11-20 21:39 * @create: 2024-11-20 21:39
**/ **/
public interface TeamStrategyExemptionOrdinaryService extends IService<TeamStrategyExemptionOrdinary> { public interface TeamStrategyOrdinaryService extends ActivityTeamStrategy, IService<TeamStrategyExemptionOrdinary> {
} }

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

@ -3,22 +3,28 @@ package com.muyu.system.team.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.domain.ActivityTeamInfo; import com.muyu.domain.ActivityTeamInfo;
import com.muyu.domain.ActivityTeamProductSkuInfo; import com.muyu.domain.ActivityTeamProductSkuInfo;
import com.muyu.domain.model.*; import com.muyu.domain.model.*;
import com.muyu.domain.req.ActivitInfoSkuAddReq; import com.muyu.domain.req.ActivityInfoSkuAddReq;
import com.muyu.domain.req.ActivityTeamInfoSaveReq;
import com.muyu.system.team.mapper.ActivityTeamInfoMapper; import com.muyu.system.team.mapper.ActivityTeamInfoMapper;
import com.muyu.system.team.service.ActivityTeamInfoService; import com.muyu.system.team.service.ActivityTeamInfoService;
import com.muyu.system.team.service.ActivityTeamOpenInfoService; import com.muyu.system.team.service.ActivityTeamOpenInfoService;
import com.muyu.system.team.service.ActivityTeamProductSkuInfoService; import com.muyu.system.team.service.ActivityTeamProductSkuInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/** /**
商品拼团信息 商品拼团信息
@ -47,7 +53,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
activityTeamInfo -> ActivityTeamInfoListModel.infoBuild(activityTeamInfo, activityTeamInfo -> ActivityTeamInfoListModel.infoBuild(activityTeamInfo,
(activityTeamInfoListModelBuilder) -> { (activityTeamInfoListModelBuilder) -> {
TeamDiscountPriceModel discountPrice = activityTeamProductSkuInfoService.getDiscountPrice(activityTeamInfo.getId()); TeamDiscountPriceModel discountPrice = activityTeamProductSkuInfoService.getDiscountPrice(activityTeamInfo.getId());
TeamProductStockModel productStockModer = activityTeamProductSkuInfoService.getProductStockModer(activityTeamInfo.getId()); TeamProductStockModel productStockModer = activityTeamProductSkuInfoService.getStock(activityTeamInfo.getId());
Long teamOpenTypeByOpenTeam = activityTeamOpenInfoService.getTeamOpenTypeByOpenAndTypeTeam(activityTeamInfo.getId()); Long teamOpenTypeByOpenTeam = activityTeamOpenInfoService.getTeamOpenTypeByOpenAndTypeTeam(activityTeamInfo.getId());
Long teamOpenTypeByInTeam = activityTeamOpenInfoService.getTeamOpenTypeByInAndTypeTeam(activityTeamInfo.getId()); Long teamOpenTypeByInTeam = activityTeamOpenInfoService.getTeamOpenTypeByInAndTypeTeam(activityTeamInfo.getId());
return activityTeamInfoListModelBuilder return activityTeamInfoListModelBuilder
@ -66,33 +72,75 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
} }
/** /**
* 添加拼团活动 * 添加拼团活动
* @param activityTeamInfoAddModel 拼团活动列表 * @param
* @param activitySkuModel 商品规格 * @param
*/ */
@Override @Override
public void activityAndProductList(ActivityTeamInfoAddModel activityTeamInfoAddModel, ActivitySkuModel activitySkuModel) { @Transactional
//添加品谈活动列表、 public Result<String> save(ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
ActivityTeamInfo activityTeamInfo = activityTeamInfoAddModel.activityTeamInfoAdd(); ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.buildModel(activityTeamInfoSaveReq);
this.save(activityTeamInfo); //添加返回主键ID
Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("添加商品拼团错误",activityTeamInfoSaveReq));
List<ActivityInfoSkuAddReq> projectSkuList = activityTeamInfoSaveReq.getTeamProjectSkuInfoAddReqList();
//添加商品规格表 List<ActivityTeamProductSkuInfo> teamProductSkuInfoList = projectSkuList.stream().map(projectSkuModel -> {
List<ActivitInfoSkuAddReq> activitInfoSkuAdd = activitySkuModel.getActivityInfoAdd(); return ActivityTeamProductSkuInfo.builder()
ArrayList<ActivityTeamProductSkuInfo> skuModelsList = new ArrayList<>(); .teamId(activityTeamInfo.getId())
.productId(activityTeamInfo.getProductId())
.productSku(projectSkuModel.getProductSku())
.teamStock(Long.valueOf(projectSkuModel.getTeamStock()))
.remainStock(Long.valueOf(projectSkuModel.getTeamStock()))
.teamPrice(projectSkuModel.getTeamPrice())
.build();
})
.filter(Objects::nonNull) // 过滤掉null值
.collect(Collectors.toList());
activityTeamProductSkuInfoService.saveBatch(teamProductSkuInfoList);
ActivityTeamProductSkuInfo activityTeamProductSkuInfo = new ActivityTeamProductSkuInfo(); return Result.success();
activitInfoSkuAdd.stream().forEach(activityAndProductId ->{ }
activityTeamProductSkuInfo.setTeamId(activityTeamInfo.getId()); /**
activityTeamProductSkuInfo.setProductSku(activityAndProductId.getProductSku()); * 根据ID查询商品的详情
activityTeamProductSkuInfo.setTeamPrice(activityAndProductId.getTeamPrice()); * @param id 团购活动ID
activityTeamProductSkuInfo.setTeamStock(activityAndProductId.getTeamStock()); * @return 团购详情
skuModelsList.add(activityTeamProductSkuInfo); */
}); @Override
activityTeamProductSkuInfoService.saveBatch(skuModelsList); 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 boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
Assert.isTrue(update,"修改失败");
activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
return update;
}
/**
* 根据ID查询详情
* @param id 活动ID
* @return 查询详情
*/
@Override
public List<ActivityTeamInfo> teamList(Long id) {
LambdaQueryWrapper<ActivityTeamInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ActivityTeamInfo::getId,id);
List<ActivityTeamInfo> list = this.list(queryWrapper);
return list;
}
} }

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

@ -1,16 +1,18 @@
package com.muyu.system.team.service.impl; package com.muyu.system.team.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.exception.ServiceException;
import com.muyu.domain.ActivityTeamProductSkuInfo; import com.muyu.domain.ActivityTeamProductSkuInfo;
import com.muyu.domain.model.TeamDiscountPriceModel; import com.muyu.domain.model.*;
import com.muyu.domain.model.TeamProductStockModel;
import com.muyu.product.cache.ProjectSkuCache; import com.muyu.product.cache.ProjectSkuCache;
import com.muyu.product.domain.ProjectSkuInfo; import com.muyu.product.domain.ProjectSkuInfo;
import com.muyu.system.team.mapper.ActivityTeamProductSkuInfoMapper; import com.muyu.system.team.mapper.ActivityTeamProductSkuInfoMapper;
import com.muyu.system.team.service.ActivityTeamProductSkuInfoService; import com.muyu.system.team.service.ActivityTeamProductSkuInfoService;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -36,7 +38,7 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
@SneakyThrows @SneakyThrows
@Override @Override
public TeamDiscountPriceModel getDiscountPrice(Long teamId) { public TeamDiscountPriceModel getDiscountPrice(Long teamId) {
List<ActivityTeamProductSkuInfo> productSkuInfoList = this.getActivityTeamProductSkuInfoByActivity(teamId); List<ActivityTeamProductSkuInfo> productSkuInfoList = this.getActivityTeamProductSkuInfoByTeamId(teamId);
if(productSkuInfoList.size()>0){ if(productSkuInfoList.size()>0){
@ -58,12 +60,80 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
} }
@Override @Override
public TeamProductStockModel getProductStockModer(Long teamId) { public TeamProductStockModel getStock(Long teamId) {
List<ActivityTeamProductSkuInfo> productSkuInfoList = this.getActivityTeamProductSkuInfoByActivity(teamId); List<ActivityTeamProductSkuInfo> teamProductSkuInfoList = this.getActivityTeamProductSkuInfoByTeamId(teamId);
return TeamProductStockModel.builder() return TeamProductStockModel.builder()
.teamStock(productSkuInfoList.stream().map(ActivityTeamProductSkuInfo::getTeamStock).reduce(0L,Long::sum)) .teamStock(teamProductSkuInfoList.stream().map(ActivityTeamProductSkuInfo::getTeamStock).reduce(0L, Long::sum))
.remainStock(productSkuInfoList.stream().map(ActivityTeamProductSkuInfo::getProductStock).reduce(0L,Long::sum)) .remainStock(teamProductSkuInfoList.stream().map(ActivityTeamProductSkuInfo::getRemainStock).reduce(0L, Long::sum))
.build(); .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()
);
}
/**
* 通过拼团活动ID获取拼团下商品SKU集合
*
* @param teamId 活动ID
* @return 拼团商品SKU集合
*/
@Override
public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
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());
}
/**
* 根据 业务模型 进行 团购商品修改
*
* @param activityTeamProductSkuUpdModel 修改业务模型
* @return 修改结果
*/
@Override
public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) {
// update set where
LambdaUpdateWrapper<ActivityTeamProductSkuInfo> updateWrapper = new LambdaUpdateWrapper<>();
// 字段=值
updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamProductSkuUpdModel.getTeamStock());
updateWrapper.set(ActivityTeamProductSkuInfo::getRemainStock,activityTeamProductSkuUpdModel.getTeamStock());
updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamProductSkuUpdModel.getTeamPrice());
// id=？
updateWrapper.eq(ActivityTeamProductSkuInfo::getId,activityTeamProductSkuUpdModel.getId());
return this.update(updateWrapper);
}
/**
* 根据 业务模型 进行 团购商品批量修改
*
* @param activityTeamProductSkuUpdModelList 修改业务模型
* @return 修改结果
*/
@Override
public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
return this.updateBatchById(
activityTeamProductSkuUpdModelList.stream()
.map(ActivityTeamProductSkuInfo::updModelBuild)
.toList()
);
} }
} }

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

@ -1,17 +0,0 @@
package com.muyu.system.team.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.domain.TeamStrategyExemptionHundred;
import com.muyu.system.team.mapper.TeamStrategyExemptionHundredMapper;
import com.muyu.system.team.service.TeamStrategyExemptionHundredService;
import org.springframework.stereotype.Service;
/**
百人策略
* @author: CuiFu Bo
* @create: 2024-11-20 21:44
**/
@Service
public class TeamStrategyExemptionHundredServiceImpl extends ServiceImpl<TeamStrategyExemptionHundredMapper, TeamStrategyExemptionHundred> implements TeamStrategyExemptionHundredService {
}

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

@ -1,17 +0,0 @@
package com.muyu.system.team.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.domain.TeamStrategyExemptionOrdinary;
import com.muyu.system.team.mapper.TeamStrategyExemptionOrdinaryMapper;
import com.muyu.system.team.service.TeamStrategyExemptionOrdinaryService;
import org.springframework.stereotype.Service;
/**
普通策略
* @author: CuiFu Bo
* @create: 2024-11-20 21:48
**/
@Service
public class TeamStrategyExemptionOrdinaryServiceImpl extends ServiceImpl<TeamStrategyExemptionOrdinaryMapper, TeamStrategyExemptionOrdinary> implements TeamStrategyExemptionOrdinaryService {
}

86
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/TeamStrategyExemptionServiceImpl.java
View File

@ -1,21 +1,101 @@
package com.muyu.system.team.service.impl; package com.muyu.system.team.service.impl;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.domain.Result;
import com.muyu.domain.ActivityTeamInfo;
import com.muyu.domain.ActivityTeamOpenInfo;
import com.muyu.domain.TeamStrategyExemption; import com.muyu.domain.TeamStrategyExemption;
import com.muyu.domain.TeamStrategyExemptionHundred; import com.muyu.domain.TeamStrategyExemptionHundred;
import com.muyu.product.domain.ProjectInfo;
import com.muyu.product.domain.ProjectSkuInfo;
import com.muyu.product.remote.RemoteProjectInfoService;
import com.muyu.product.remote.RemoteProjectSkuService;
import com.muyu.system.team.mapper.TeamStrategyExemptionHundredMapper; import com.muyu.system.team.mapper.TeamStrategyExemptionHundredMapper;
import com.muyu.system.team.mapper.TeamStrategyExemptionMapper; import com.muyu.system.team.mapper.TeamStrategyExemptionMapper;
import com.muyu.system.team.service.TeamStrategyExemptionHundredService; import com.muyu.system.team.service.ActivityTeamInfoService;
import com.muyu.system.team.service.ActivityTeamOpenInfoService;
import com.muyu.system.team.service.ActivityTeamProductSkuInfoService;
import com.muyu.system.team.service.TeamStrategyExemptionService; import com.muyu.system.team.service.TeamStrategyExemptionService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.UUID;
/** /**
拼团免单策略 拼团免单策略
* @author: CuiFu Bo * @author: CuiFu Bo
* @create: 2024-11-20 21:43 * @create: 2024-11-20 21:43
**/ **/
@Service @Log4j2
public class TeamStrategyExemptionServiceImpl extends ServiceImpl<TeamStrategyExemptionMapper, TeamStrategyExemption> implements TeamStrategyExemptionService { @Service("team_strategy_exemption")
public class TeamStrategyExemptionServiceImpl extends ServiceImpl<TeamStrategyExemptionMapper, TeamStrategyExemption>
implements TeamStrategyExemptionService {
@Autowired
private ActivityTeamInfoService activityTeamInfoService;
@Autowired
private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
@Autowired
private ActivityTeamOpenInfoService activityTeamOpenInfoService;
@Resource
private RemoteProjectInfoService remoteProjectInfoService;
@Resource
private RemoteProjectSkuService remoteProjectSkuService;
@Override
public void openTeam(Long activityTeamId) {
log.info("参加 免拼团{}",activityTeamId);
TeamStrategyExemption teamStrategyExemption = this.getById(activityTeamId);
ActivityTeamInfo activityTeamInfo = activityTeamInfoService.getById(activityTeamId);
//获取商品ID
Long productId = activityTeamInfo.getProductId();
//通过商品ID从商品缓存里获取到商品信息
Result<ProjectInfo> projectInfoResult = remoteProjectInfoService.getInfo(productId);
ProjectInfo projectInfo = projectInfoResult.getData();
Result<ProjectSkuInfo> projectSkuInfoResult = remoteProjectSkuService.getInfoByProjectIdAndSku(productId, "骁龙888-8G-128G");
ProjectSkuInfo projectSkuInfo = projectSkuInfoResult.getData();
ActivityTeamOpenInfo activityTeamOpenInfo = new ActivityTeamOpenInfo();
activityTeamOpenInfo.setTeamId(activityTeamId);
activityTeamOpenInfo.setTeamType(activityTeamInfo.getStrategyType());
activityTeamOpenInfo.setTeamStrategyId(activityTeamInfo.getStrategyId());
activityTeamOpenInfo.setExecutiveType(activityTeamInfo.getStrategyType());
activityTeamOpenInfo.setEndTime(activityTeamInfo.getEndTime());
activityTeamOpenInfo.setProductId(projectInfo.getId());
activityTeamOpenInfo.setProductName(projectInfo.getName());
activityTeamOpenInfo.setProductSku(projectSkuInfo.getSku());
String openKey = UUID.randomUUID().toString();
activityTeamOpenInfo.setOpenkey(openKey);
Long numbers = Long.valueOf(RandomUtil.randomNumbers(8));
activityTeamOpenInfo.setOrderId(numbers);
activityTeamOpenInfo.setStatus("Y");
activityTeamOpenInfoService.save(activityTeamOpenInfo);
}
@Override
public String applyTeam(Long teamId) {
ActivityTeamOpenInfo teamOpenInfo = activityTeamOpenInfoService.getById(teamId);
return null;
}
@Override
public void addTeam(Long teamId, String orderNumber) {
}
@Override
public void backTeam(Long teamId) {
}
@Override
public void settle(Long teamId) {
}
} }

51
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/TeamStrategyHundredServiceImpl.java 100644
View File

@ -0,0 +1,51 @@
package com.muyu.system.team.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.domain.TeamStrategyExemptionHundred;
import com.muyu.system.team.mapper.TeamStrategyExemptionHundredMapper;
import com.muyu.system.team.service.TeamStrategyHundredService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
/**
百人策略
* @author: CuiFu Bo
* @create: 2024-11-20 21:44
**/
@Log4j2
@Service("team-strategy-hundred")
public class TeamStrategyHundredServiceImpl extends ServiceImpl<TeamStrategyExemptionHundredMapper,
TeamStrategyExemptionHundred> implements TeamStrategyHundredService {
@Override
public void openTeam(Long activityTeamId, String orderNumber) {
log.info("参团 百人团{}",activityTeamId);
}
@Override
public void openTeam(Long activityTeamId) {
}
@Override
public String applyTeam(Long teamId) {
return null;
}
@Override
public void addTeam(Long teamId, String orderNumber) {
}
@Override
public void backTeam(Long teamId) {
}
@Override
public void settle(Long teamId) {
}
}

42
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/TeamStrategyOrdinaryServiceImpl.java 100644
View File

@ -0,0 +1,42 @@
package com.muyu.system.team.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.domain.TeamStrategyExemptionOrdinary;
import com.muyu.system.team.mapper.TeamStrategyExemptionOrdinaryMapper;
import com.muyu.system.team.service.TeamStrategyOrdinaryService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
/**
普通策略
* @author: CuiFu Bo
* @create: 2024-11-20 21:48
**/
@Log4j2
@Service("team_strategy_ordinary")
public class TeamStrategyOrdinaryServiceImpl extends ServiceImpl<TeamStrategyExemptionOrdinaryMapper, TeamStrategyExemptionOrdinary> implements TeamStrategyOrdinaryService {
@Override
public void openTeam(Long activityTeamId) {
log.info("参团 普通团{}",activityTeamId);
}
@Override
public String applyTeam(Long teamId) {
return null;
}
@Override
public void addTeam(Long teamId, String orderNumber) {
}
@Override
public void backTeam(Long teamId) {
}
@Override
public void settle(Long teamId) {
}
}

45
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/strategy/ActivityTeamStrategy.java 100644
View File

@ -0,0 +1,45 @@
package com.muyu.system.team.strategy;
/**
* 团活动策略
*/
public interface ActivityTeamStrategy {
/**
* 开团
* @param activityTeamId 团购活动ID
*/
public void openTeam(Long activityTeamId);
/**
* 申请加团
* @param teamId 团ID
* @return 申请成功code
*/
public String applyTeam(Long teamId);
/**
* 参团
* @param teamId 加团ID
* @param orderNumber 订单编号
*/
public void addTeam(Long teamId,String orderNumber);
/**
* 退团
* @param teamId 团购ID
*/
public void backTeam(Long teamId);
/**
* 结算团
* @param teamId 团购ID
*/
public void settle(Long teamId);
}

48
muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/strategy/impl/ActivityTeamStrategyImpl.java 100644
View File

@ -0,0 +1,48 @@
package com.muyu.system.team.strategy.impl;
import com.muyu.common.core.exception.ServiceException;
import com.muyu.common.core.utils.SpringUtils;
import com.muyu.system.team.strategy.ActivityTeamStrategy;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
@Service
@Primary
public class ActivityTeamStrategyImpl implements ActivityTeamStrategy {
@Override
public void openTeam(Long activityTeamId) {
String activityTeamType =null;
if (activityTeamId==null){
throw new ServiceException("activityTeamId is null");
} else if (activityTeamId==0) {
activityTeamType="team_strategy_exemption";
}else if (activityTeamId==1){
activityTeamType="team-strategy-hundred";
}else if (activityTeamId==2){
activityTeamType="team_strategy_ordinary";
}
ActivityTeamStrategy activityTeamStrategy = SpringUtils.getBean(activityTeamType);
activityTeamStrategy.openTeam(activityTeamId);
}
@Override
public String applyTeam(Long teamId) {
return null;
}
@Override
public void addTeam(Long teamId, String orderNumber) {
}
@Override
public void backTeam(Long teamId) {
}
@Override
public void settle(Long teamId) {
}
}

1
muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java
View File

@ -35,6 +35,7 @@ public class TemplateAttributeModel extends BaseEntity {
*/ */
private String code; private String code;
private String value;
public static TemplateAttributeModel attributeInfoBuild(AttributeInfo attributeInfo){ public static TemplateAttributeModel attributeInfoBuild(AttributeInfo attributeInfo){
return TemplateAttributeModel.builder() return TemplateAttributeModel.builder()
.id(attributeInfo.getId()) .id(attributeInfo.getId())

35
muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectInfoResp.java
View File

@ -22,80 +22,57 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
public class ProjectInfoResp { public class ProjectInfoResp {
/** 主键 */ /** 主键 */
@TableId(value = "id",type = IdType.AUTO)
@ApiModelProperty(name = "主键", value = "主键")
private Long id; private Long id;
/** 商品名称 */ /** 商品名称 */
@Excel(name = "商品名称")
@ApiModelProperty(name = "商品名称", value = "商品名称")
private String name; private String name;
/** 商品描述 */ /** 商品描述 */
@Excel(name = "商品描述")
@ApiModelProperty(name = "商品描述", value = "商品描述")
private String introduction; private String introduction;
/** 主类型 */ /** 主类型 */
@Excel(name = "主类型")
@ApiModelProperty(name = "主类型", value = "主类型")
private Long mianType; private Long mianType;
/** 父类型 */ /** 父类型 */
@Excel(name = "父类型")
@ApiModelProperty(name = "父类型", value = "父类型")
private Long parentType; private Long parentType;
/** 商品类型 */ /** 商品类型 */
@Excel(name = "商品类型")
@ApiModelProperty(name = "商品类型", value = "商品类型")
private Long type; private Long type;
/** 商品图片 */ /** 商品图片 */
@Excel(name = "商品图片")
@ApiModelProperty(name = "商品图片", value = "商品图片")
private String image; private String image;
/** 商品轮播图 */ /** 商品轮播图 */
@Excel(name = "商品轮播图")
@ApiModelProperty(name = "商品轮播图", value = "商品轮播图")
private String carouselImages; private String carouselImages;
/** 商品状态 */ /** 商品状态 */
@Excel(name = "商品状态")
@ApiModelProperty(name = "商品状态", value = "商品状态")
private String status; private String status;
/** 规格 */ /** 规格 */
@Excel(name = "规格")
@ApiModelProperty(name = "规格", value = "规格")
private Long ruleId; private Long ruleId;
/** 品牌 */ /** 品牌 */
@Excel(name = "品牌")
@ApiModelProperty(name = "品牌", value = "品牌")
private Long brandId; private Long brandId;
/** /**
* 主类型名称 * 主类型名称
*/ */
private String mianTypeName; public String mianTypeName;
/** /**
* 父类型名称 * 父类型名称
*/ */
private String parentTypeName; public String parentTypeName;
/** /**
* 商品类型名称 * 商品类型名称
*/ */
private String typeName; public String typeName;
/** /**
* 规格名称 * 规格名称
*/ */
private String ruleName; public String ruleName;
/** /**
* 品牌名称 * 品牌名称
*/ */
private String brandName; public String brandName;
} }

12
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java
View File

@ -51,6 +51,18 @@ public class CommentInfoController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
/**
* 查询商品评论列表
*/
@ApiOperation("获取商品评论列表")
@RequiresPermissions("product:comment:list")
@GetMapping("/reviewList/{id}")
public Result<TableDataInfo<CommentInfo>> review(@PathVariable("id")Long id) {
startPage();
List<CommentInfo> list = commentInfoService.review(id);
return getDataTable(list);
}
/** /**
* 导出商品评论列表 * 导出商品评论列表
*/ */

5
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java
View File

@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
import com.muyu.product.cache.ProjectInfoCache; import com.muyu.product.cache.ProjectInfoCache;
import com.muyu.product.domain.resp.ProjectDetailResp; import com.muyu.product.domain.resp.ProjectDetailResp;
import com.muyu.product.domain.resp.ProjectInfoResp;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -50,9 +51,9 @@ public class ProjectInfoController extends BaseController {
@ApiOperation("获取商品信息列表") @ApiOperation("获取商品信息列表")
@RequiresPermissions("product:info:list") @RequiresPermissions("product:info:list")
@GetMapping("/list") @GetMapping("/list")
public Result<TableDataInfo<ProjectInfo>> list(ProjectInfoQueryReq projectInfoQueryReq) { public Result<TableDataInfo<ProjectInfoResp>> list(ProjectInfoQueryReq projectInfoQueryReq) {
startPage(); startPage();
List<ProjectInfo> list = projectInfoService.list(ProjectInfo.queryBuild(projectInfoQueryReq)); List<ProjectInfoResp> list = projectInfoService.ProjectInfo(ProjectInfo.queryBuild(projectInfoQueryReq));
return getDataTable(list); return getDataTable(list);
} }

2
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java
View File

@ -19,4 +19,6 @@ public interface CommentInfoService extends IService<CommentInfo> {
*/ */
public List<CommentInfo> list(CommentInfo commentInfo); public List<CommentInfo> list(CommentInfo commentInfo);
List<CommentInfo> review(Long id);
} }

3
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java
View File

@ -7,6 +7,7 @@ import com.muyu.product.domain.ProjectInfo;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.product.domain.req.ProjectInfoSaveReq; import com.muyu.product.domain.req.ProjectInfoSaveReq;
import com.muyu.product.domain.resp.ProjectDetailResp; import com.muyu.product.domain.resp.ProjectDetailResp;
import com.muyu.product.domain.resp.ProjectInfoResp;
/** /**
* 商品信息Service接口 * 商品信息Service接口
@ -36,4 +37,6 @@ public interface ProjectInfoService extends IService<ProjectInfo> {
* @return 商品详情 * @return 商品详情
*/ */
ProjectDetailResp getDetailInfo (Long id); ProjectDetailResp getDetailInfo (Long id);
List<ProjectInfoResp> ProjectInfo(ProjectInfo projectInfo);
} }

28
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java
View File

@ -65,6 +65,9 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
@Resource @Resource
private CategoryInfoMapper categoryInfoMapper; private CategoryInfoMapper categoryInfoMapper;
@Autowired
private AsProductAttributeInfoService asProductAttributeInfoService;
/** /**
* 查询品类信息列表 * 查询品类信息列表
* *
@ -470,6 +473,31 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, Cat
attributeInfoLambdaQueryWrapper.notIn(!attributeIdSet.isEmpty(), AttributeInfo::getId, attributeIdSet); attributeInfoLambdaQueryWrapper.notIn(!attributeIdSet.isEmpty(), AttributeInfo::getId, attributeIdSet);
attributeModelList = attributeInfoService.list(attributeInfoLambdaQueryWrapper).stream().map(AttributeInfo::buildTemplateModel).toList(); attributeModelList = attributeInfoService.list(attributeInfoLambdaQueryWrapper).stream().map(AttributeInfo::buildTemplateModel).toList();
attributeModelList.forEach(templateAttributeModel -> {
List<AsProductAttributeInfo> list = asProductAttributeInfoService.list(new LambdaQueryWrapper<AsProductAttributeInfo>().eq(AsProductAttributeInfo::getAttributeId, templateAttributeModel.getId()));
list.forEach(attributeInfo ->{
templateAttributeModel.setValue(attributeInfo.getValue());
});
});
attributeGroupModelList.forEach(templateAttributeGroupModel -> {
templateAttributeGroupModel.getAttributeList().forEach(templateAttributeModel -> {
List<AsProductAttributeInfo> list = asProductAttributeInfoService.list(
new LambdaQueryWrapper<AsProductAttributeInfo>().eq(AsProductAttributeInfo::getAttributeId, templateAttributeModel.getId()));
list.forEach(attributeInfo -> {
templateAttributeModel.setValue(attributeInfo.getValue());
});
});
});
templateAttributeModelList.forEach(templateAttributeModel -> {
List<AsProductAttributeInfo> list = asProductAttributeInfoService.list(new LambdaQueryWrapper<AsProductAttributeInfo>().eq(AsProductAttributeInfo::getAttributeId, templateAttributeModel.getId()));
list.forEach(attributeInfo -> {
templateAttributeModel.setValue(attributeInfo.getValue());
});
});
return CategoryCommonElementResp.builder() return CategoryCommonElementResp.builder()
.templateAttributeGroupList(attributeGroupModelList) .templateAttributeGroupList(attributeGroupModelList)
.templateAttributeList(templateAttributeModelList) .templateAttributeList(templateAttributeModelList)

8
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java
View File

@ -54,4 +54,12 @@ public class CommentInfoServiceImpl extends ServiceImpl<CommentInfoMapper, Comme
return list(queryWrapper); return list(queryWrapper);
} }
@Override
public List<CommentInfo> review(Long id) {
LambdaQueryWrapper<CommentInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CommentInfo::getProjectId,id);
List<CommentInfo> list = this.list(queryWrapper);
return list;
}
} }

51
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.muyu.product.domain.req.ProjectInfoSaveReq;
import com.muyu.product.domain.resp.CategoryCommonElementResp; import com.muyu.product.domain.resp.CategoryCommonElementResp;
import com.muyu.product.domain.resp.ProjectDetailResp; import com.muyu.product.domain.resp.ProjectDetailResp;
import com.muyu.product.domain.resp.ProjectInfoResp; import com.muyu.product.domain.resp.ProjectInfoResp;
import com.muyu.product.mapper.RuleInfoMapper;
import com.muyu.product.service.*; import com.muyu.product.service.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -21,6 +22,8 @@ import com.muyu.product.mapper.ProjectInfoMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import javax.annotation.Resource;
/** /**
* 商品信息Service业务层处理 * 商品信息Service业务层处理
* *
@ -50,6 +53,9 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
@Autowired @Autowired
private AttributeInfoService attributeInfoService; private AttributeInfoService attributeInfoService;
@Resource
private RuleInfoMapper ruleInfoMapper;
/** /**
* 查询商品信息列表 * 查询商品信息列表
* *
@ -244,4 +250,49 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
.attributeGroupList(templateAttributeGroupList) .attributeGroupList(templateAttributeGroupList)
.build(); .build();
} }
@Override
public List<ProjectInfoResp> ProjectInfo(ProjectInfo projectInfo) {
List<ProjectInfo> list = list(projectInfo);
List<ProjectInfoResp> projectInfoListResps = new LinkedList<>();
list.forEach(p -> {
// 获取类别信息
CategoryInfo mianTypeName = categoryInfoService.getById(p.getMianType());
CategoryInfo parentTypeName = categoryInfoService.getById(p.getParentType());
CategoryInfo typeName = p.getType() != null ? categoryInfoService.getById(p.getType()) : null;
// 获取规则信息
RuleInfo ruleName = ruleInfoMapper.selectById(p.getRuleId());
// 获取品牌信息
BrandInfo brandName = brandInfoService.getById(p.getBrandId());
// 构建响应对象
ProjectInfoResp resp = ProjectInfoResp.builder()
.id(p.getId())
.name(p.getName())
.introduction(p.getIntroduction())
.mianType(p.getMianType())
.parentType(p.getParentType())
.type(p.getType())
.image(p.getImage())
.carouselImages(p.getCarouselImages())
.status(p.getStatus())
.mianTypeName(mianTypeName != null ? mianTypeName.getName() : "")
.parentTypeName(parentTypeName != null ? parentTypeName.getName() : "")
.typeName(typeName != null ? typeName.getName() : "")
.ruleName(ruleName != null ? ruleName.getName() : "")
.brandName(brandName != null ? brandName.getNam() : "")
.build();
// 添加到结果列表
projectInfoListResps.add(resp);
});
return projectInfoListResps;
}
} }