Compare commits

...

8 Commits

Author SHA1 Message Date
万文静 f67ba1f1a7 feat():团购商品-团购添加完成了 2024-11-27 15:20:11 +08:00
万文静 2ebe6221c4 Merge remote-tracking branch 'origin/master' into 1127/wanwenjing
# Conflicts:
#	doc/团购查询单条数据结构.java
#	muyu-auth/src/main/resources/bootstrap.yml
#	muyu-gateway/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-file/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-job/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-system/src/main/resources/bootstrap.yml
#	muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
2024-11-27 15:17:06 +08:00
万文静 dd88dad4f2 feat():团购商品-团购添加完成了 2024-11-27 15:12:30 +08:00
小万的gitee 30b6a2bf67 Merge remote-tracking branch 'origin/master' into 1125/wanwenjing
# Conflicts:
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
2024-11-27 00:26:23 +08:00
小万的gitee 49be23d2b6 feat():团购商品-团购添加完成了 2024-11-27 00:02:25 +08:00
小万的gitee e8a433bacd feat():团购商品-团购添加完成了 2024-11-26 20:07:57 +08:00
小万的gitee e0f9840709 Merge remote-tracking branch 'origin/1125/wanwenjing' into 1125/wanwenjing
# Conflicts:
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
2024-11-26 19:55:58 +08:00
DongZeLiang 090cf65bbe feat():团购商品-团购添加完成 2024-11-26 19:53:47 +08:00
22 changed files with 375 additions and 69 deletions

View File

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

View File

@ -45,3 +45,30 @@ activity_team_product_sku_info.product_sku(商品SKU) <- ActivityTeamProductSkuI
activity_team_product_sku_info.team_stock() <- ActivityTeamProductSkuInfo.teamStock <- @.
activity_team_product_sku_info.remain_stock() <- ActivityTeamProductSkuInfo.remainStock <- @.
activity_team_product_sku_info.team_price() <- ActivityTeamProductSkuInfo.teamPrice <- @.
{
"code": 0,
"msg": "string",
"data": {
"rows": [
{
"id": 0,
"name": "string",
"productImage": "string",
"productPrice": "string",
"teamPrice": "string",
"attendNumber": "string",
"openTeamNumber": "string",
"teamStock": "string",
"remainStock": "string",
"endTime": "string",
"status": "string"
}
],
"total": "string"
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -74,11 +74,6 @@ public class ActivityTeamInfo extends BaseEntity {
*/
private long strategyId;
/**
*
* @param activityTeamInfoAddModel
* @return
*/
public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel){
return ActivityTeamInfo.builder()
.name(activityTeamInfoAddModel.getName())

View File

@ -50,7 +50,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
private BigDecimal teamPrice;
/**
*
* taskkill /t /f /im
* @param activityTeamProductSkuAddModel
* @return
*/

View File

@ -10,7 +10,6 @@ import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
import java.util.function.Supplier;
/**
*
@ -80,25 +79,29 @@ public class ActivityTeamInfoAddModel {
*/
private Long strategyId;
public static ActivityTeamInfoAddModel addReqBuild (ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
return ActivityTeamInfoAddModel.builder()
.name(activityTeamInfoSaveReq.getName())
.productId(activityTeamInfoSaveReq.getProductId())
.productImage(activityTeamInfoSaveReq.getProductImage())
.introduction(activityTeamInfoSaveReq.getIntroduction())
.unit(activityTeamInfoSaveReq.getUnit())
.imageList(activityTeamInfoSaveReq.getImageList())
.endTime(activityTeamInfoSaveReq.getEndTime())
.sort(activityTeamInfoSaveReq.getSort())
.content(activityTeamInfoSaveReq.getContent())
.status(activityTeamInfoSaveReq.getStatus())
.strategyType(activityTeamInfoSaveReq.getStrategyType())
.strategyId(activityTeamInfoSaveReq.getStrategyId())
.activityTeamProductSkuAddModelList(
activityTeamInfoSaveReq.getTeamProjectSkuInfoAddReqList()
.stream()
.map(addReq -> ActivityTeamProductSkuAddModel.addReqBuild(addReq, activityTeamInfoSaveReq::getProductId))
.toList()
).build();
}
public static ActivityTeamInfoAddModel saveTeamInfoBuild(ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
return ActivityTeamInfoAddModel.builder()
.name(activityTeamInfoSaveReq.getName())
.productId(activityTeamInfoSaveReq.getProductId())
.productImage(activityTeamInfoSaveReq.getProductImage())
.introduction(activityTeamInfoSaveReq.getIntroduction())
.unit(activityTeamInfoSaveReq.getUnit())
.imageList(activityTeamInfoSaveReq.getImageList())
.endTime(activityTeamInfoSaveReq.getEndTime())
.sort(activityTeamInfoSaveReq.getSort())
.content(activityTeamInfoSaveReq.getContent())
.status(activityTeamInfoSaveReq.getStatus())
.strategyType(activityTeamInfoSaveReq.getStrategyType())
.strategyId(activityTeamInfoSaveReq.getStrategyId())
.activityTeamProductSkuAddModelList(
activityTeamInfoSaveReq.getProjectSkuInfoAddReqList()
.stream()
.map(projectSkuInfoAddReq ->ActivityTeamProductSkuAddModel.addReqBulid(projectSkuInfoAddReq, activityTeamInfoSaveReq::getProductId)).toList()
).build();
}
}

View File

@ -0,0 +1,101 @@
package com.muyu.marketing.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.marketing.domain.ActivityTeamInfo;
import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
import com.muyu.marketing.domain.resp.ActivityTeamInfoDaitlResp;
import com.muyu.marketing.domain.resp.TeamProjectSkuInfoResp;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamInfoDaitlRespModel extends BaseEntity {
/**
* id
*/
private Long id;
/**
*
*/
private String name;
/**
* ID
*/
private Long productId;
/**
*
*/
private String productImage;
/**
*
*/
private String introduction;
/**
*
*/
private String unit;
/**
*
*/
private String imageList;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
private Date endTime;
/**
*
*/
private Long sort;
/**
* SkU
*/
private List<TeamProjectSkuInfoResp> projectSkuInfoAddReqList;
/**
*
*/
private String content;
/**
*
*/
private String status;
/**
*
*/
private String strategyType;
/**
* ID
*/
private Long strategyId;
//
// public static ActivityTeamInfoDaitlRespModel findById(ActivityTeamInfo activityTeamInfo, List<ActivityTeamProductSkuInfoModel> teamProductSkuInfoModelList){
// return ActivityTeamInfoDaitlRespModel.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())
// .projectSkuInfoAddReqList(teamProductSkuInfoModelList)
// .content(activityTeamInfo.getContent())
// .status(activityTeamInfo.getStatus())
// .strategyType(activityTeamInfo.getStrategyType())
// .strategyId(activityTeamInfo.getStrategyId())
// .build();
// }
}

View File

@ -8,7 +8,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.function.Function;
import java.util.function.Supplier;
/**
@ -48,12 +47,12 @@ public class ActivityTeamProductSkuAddModel {
*/
private Long teamStock;
public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
return ActivityTeamProductSkuAddModel.builder()
public static ActivityTeamProductSkuAddModel addReqBulid(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
return ActivityTeamProductSkuAddModel.builder()
.productId(productId.get())
.sku(teamProjectSkuInfoAddReq.getSku())
.teamStock(teamProjectSkuInfoAddReq.getTeamStock())
.teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
.teamStock(teamProjectSkuInfoAddReq.getTeamStock())
.build();
}
}

View File

@ -55,7 +55,7 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
/**
* SkU
*/
private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
private List<TeamProjectSkuInfoAddReq> projectSkuInfoAddReqList;
/**
*
*/
@ -72,4 +72,11 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
* ID
*/
private Long strategyId;
public static ActivityTeamInfoSaveReq saveSkuInfosBuild(ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
return ActivityTeamInfoSaveReq.builder()
.projectSkuInfoAddReqList(activityTeamInfoSaveReq.getProjectSkuInfoAddReqList())
.build();
}
}

View File

@ -3,15 +3,10 @@ package com.muyu.marketing.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 {
@ -21,6 +16,7 @@ public class TeamProjectSkuInfoAddReq {
*/
private String sku;
/**
*
*/

View File

@ -0,0 +1,89 @@
package com.muyu.marketing.domain.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
import java.util.List;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class ActivityTeamInfoDaitlResp 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<TeamProjectSkuInfoAddReq> projectSkuInfoAddReqList;
/**
*
*/
private String content;
/**
*
*/
private String status;
/**
*
*/
private String strategyType;
/**
* ID
*/
private Long strategyId;
public static ActivityTeamInfoDaitlResp saveSkuInfosBuild(ActivityTeamInfoDaitlResp activityTeamInfoSaveReq){
return ActivityTeamInfoDaitlResp.builder()
.projectSkuInfoAddReqList(activityTeamInfoSaveReq.getProjectSkuInfoAddReqList())
.build();
}
}

View File

@ -0,0 +1,44 @@
package com.muyu.marketing.domain.resp;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class TeamProjectSkuInfoResp {
/**
*
*/
private Integer id;
/**
* id
*/
private Long teamId;
/**
* id
*/
private Long productId;
/**
* SKU
*/
private String sku;
/**
*
*/
private BigDecimal teamPrice;
/**
*
*/
private Long teamStock;
}

View File

@ -12,6 +12,7 @@ import com.muyu.marketing.domain.req.TeamInfoListReq;
import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
import com.muyu.marketing.domain.resp.TeamInfoListResp;
import com.muyu.marketing.team.service.ActivityTeamInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -23,6 +24,7 @@ import java.util.List;
* @author DongZeLiang
* @date 2024-11-20 14:25
*/
@Slf4j
@RestController
@RequestMapping("/team")
public class ActivityTeamController {
@ -47,16 +49,10 @@ public class ActivityTeamController {
);
}
/**
*
* @param activityTeamInfoSaveReq
* @return
*/
@PostMapping
public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
return Result.success();
@PostMapping("/save")
public Result save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
activityTeamInfoService.save(ActivityTeamInfoAddModel.saveTeamInfoBuild(activityTeamInfoSaveReq));
return Result.success();
}
@PostMapping("/findById/{id}")

View File

@ -65,6 +65,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
return tableDataInfo;
}
/**
*
*

View File

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

View File

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

View File

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

View File

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