diff --git a/doc/团购修改数据结构.java b/doc/团购修改数据结构.json similarity index 56% rename from doc/团购修改数据结构.java rename to doc/团购修改数据结构.json index c439ba5..3113554 100644 --- a/doc/团购修改数据结构.java +++ b/doc/团购修改数据结构.json @@ -1,6 +1,6 @@ { "拼团活动Id": "Long", - "商品ID": "Long", //activity_team_info.product_id + "商品ID": "Long", "商品图片": "String", "活动名称": "String", "活动简介": "String", @@ -11,14 +11,19 @@ "活动时间": "date", "策略类型": "String", "策略ID": "Long", - "商品规格List": [ // activity_team_product_sku_info - { - "规格SKUId": "Long", - "规格SKU": "String", // activity_team_product_sku_info.product_sku + "商品规格List": [{ + "规格SKUid": "Long", + "拼团价格": "BigDecimal", + "拼团库存": "Long" + }], + "商品规格List": [{ + "规格SKUid": "Long" + }], + "商品规格List": [{ "拼团价格": "BigDecimal", "拼团库存": "Long" - } - ], + }], "排序": "Integer", - "详情": "String" -} \ No newline at end of file + "详情": "String", + "活动状态":"Long" +} 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 fc079e0..9955f20 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 @@ -53,7 +53,7 @@ public class ActivityTeamController { * @param activityTeamInfoSaveReq 添加请求对象 * @return 结果集 */ - @PostMapping + @PostMapping("/addTeam") public Result save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); return Result.success(); 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 fc4f871..a65de9e 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 @@ -98,8 +98,10 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl TeamInfoProductSkuIdByIdResp.buildModel(activityTeamProductSkuIdModel) + activityTeamProductSkuInfoModels + .stream() + .map(activityTeamProductSkuIdModel -> + TeamInfoProductSkuIdByIdResp.buildModel(activityTeamProductSkuIdModel) ).collect(Collectors.toList()) );