diff --git a/doc/团购修改的数据结构.java b/doc/团购修改的数据结构.java new file mode 100644 index 0000000..5ac22ec --- /dev/null +++ b/doc/团购修改的数据结构.java @@ -0,0 +1,25 @@ +{ + "团购活动id":"Long" + "商品ID":"Long", + "活动名称":"String", + "活动简介":"String", + "商品图片":"String", + "商品单位":"String", + "商品的轮播图":[ + "String","String" + ], + "活动时间":"date", + "策略类型":"String", + "策略ID":"Long", + "商品规格List":[ + { + "规格id":"Long", + "规格SKU":"String", + "拼团价格":"BigDecimal", + "拼团库存":"Long" + } + ], + "状态":"String", + "排序":"Integer", + "详情":"String" +} \ No newline at end of file diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuResp.java index 83892fd..1681f18 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuResp.java @@ -14,7 +14,7 @@ public class ActivityTeamProductSkuResp { /** * 规格id */ - private Long id; + private Long ProductId; /** * 规格SKU diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamProductSkuController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamProductSkuController.java index ebc917e..ef87840 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamProductSkuController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamProductSkuController.java @@ -18,11 +18,5 @@ public class ActivityTeamProductSkuController { @Autowired private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService; - /** - * 回显 - */ - @GetMapping("getById/{teamId}") - public Result> getById(@PathVariable Long teamId){ - return Result.success(activityTeamProductSkuInfoService.getTeamProductSkuInfoListByTeamId(teamId)); - } + } 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 383c874..5b4df78 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 @@ -106,7 +106,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl activityTeamProductSkuList = activityTeamInfoDetailResp.getActivityTeamProductSkuList(); //根据活动id查询活动商品SKU集合 List teamProductSkuInfoList = activityTeamProductSkuInfoService.getTeamProductSkuInfoListByTeamId(teamId); if (teamProductSkuInfoList != null) { @@ -119,7 +118,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl