diff --git a/doc/团购修改数据结构.java b/doc/团购修改数据结构.java new file mode 100644 index 0000000..1ef27f5 --- /dev/null +++ b/doc/团购修改数据结构.java @@ -0,0 +1,35 @@ +$.{ + "活动ID":"Long", + "商品ID":"Long", //activity_team_info.product_id + "商品图片":"String", + "活动名称":"String", + "活动简介":"String", + "商品单位":"String", + "商品的轮播图":[ + "String", + "String" + ], + "活动时间":"date", + "策略类型":"String", + "策略ID":"Long", + "商品规格":{ + "商品规格List":[ // activity_team_product_sku_info + { + "规格Id":"Long", + "商品价格":"BigDecimal", // activity_team_product_sku_info.product_sku + "拼团价格":"BigDecimal", + "拼团库存":"Long" // 若是只修改库存可以直接写一个单独的修改库存接口 + } + ], + "删除商品规格IdList":["Long","Long"], + "删除商品规格IdList":[ + "商品SKU": "String", + "商品价格":"BigDecimal", + "拼团价格":"BigDecimal", + "拼团库存":"Long" // 若是只修改库存可以直接写一个单独的修改库存接口 + ] + }, + "状态":"String" //需要判断该商品是否已开启秒杀状态 若开启禁止修改 未开启则可以修改 + "排序":"Integer", + "详情":"String" +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java index 9f883db..8d983f7 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java @@ -74,10 +74,7 @@ public class ActivityTeamInfo extends BaseEntity { * 策略ID */ private Long strategyId; - /** - * 商品SkU集合 - */ -// private List teamProductSkuModelList; + /** * 公共添加模型,转换成添加对象 diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index 14abb2b..888ff58 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -63,7 +63,7 @@ public class ActivityTeamController { * @param * @return 结果集 */ - @PostMapping("/byId/{id}") + @GetMapping("/{id}") public Result findById(@PathVariable Long id) { ActivityTeamInfoDatailResp activityById = activityTeamInfoService.findActivityById(id); return Result.success(activityById); diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java index f781d71..7c7b282 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java @@ -87,6 +87,11 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl