From 36280359a1c9bc8e179e70a147d5bad8ab2b6814 Mon Sep 17 00:00:00 2001 From: cuijie Date: Tue, 19 May 2020 14:17:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivityController.java | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java b/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java index 78a9278..7f1c2dc 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java @@ -7,7 +7,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -24,7 +23,7 @@ public class ActivityController extends BaseController { PmnActivityScheduleDOMapper pmnActivityScheduleDOMapper; @ApiOperation(value = "所有活动池列表") - @RequestMapping(value = "/schedule/list/all", method = RequestMethod.GET) + @RequestMapping(value = "/schedule/list/all") @ResponseBody public Map listAll() { try { @@ -37,9 +36,43 @@ public class ActivityController extends BaseController { } @ApiOperation(value = "新增或修改活动池") - @RequestMapping(value = "/schedule/save", method = RequestMethod.GET) + @RequestMapping(value = "/schedule/save") @ResponseBody public Map save() { return data(null); } + + @ApiOperation(value = "根据活动池新建实例，修改实例详情") + @RequestMapping(value = "/instance/save") + @ResponseBody + public Map saveInstance() { + // TODO 分开保存实例参数，店铺关系，修改的时候，也需要操作活动店铺关系表 + // TODO 异步批量生成店铺二维码，导购二维码，回调的时候保存到对应的表 + return data(null); + } + + @ApiOperation(value = "活动实例分页列表") + @RequestMapping(value = "/instance/list") + @ResponseBody + public Map instanceList() { + // TODO 需要根据当前用户角色分开查询 + return data(null); + } + + @ApiOperation(value = "活动实例详情") + @RequestMapping(value = "/instance/detail") + @ResponseBody + public Map instanceDetail() { + return data(null); + } + + @ApiOperation(value = "活动实例终止") + @RequestMapping(value = "/instance/terminate") + @ResponseBody + public Map instanceTerminate() { + // TODO 终止后不可恢复 + return data(null); + } + + } From 4f017ec5aa4211767c3a03b75b7a000c81a95bd2 Mon Sep 17 00:00:00 2001 From: cuijie Date: Tue, 19 May 2020 14:38:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kiisoo/ic/activity/controller/ActivityController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java b/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java index 7f1c2dc..0506e58 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java @@ -46,8 +46,11 @@ public class ActivityController extends BaseController { @RequestMapping(value = "/instance/save") @ResponseBody public Map saveInstance() { - // TODO 分开保存实例参数，店铺关系，修改的时候，也需要操作活动店铺关系表 - // TODO 异步批量生成店铺二维码，导购二维码，回调的时候保存到对应的表 + // TODO 第一步先创建活动实例，包括活动时间范围，状态等() + // TODO 第二步拿到活动实例ID，再根据公司创建场景(promotion_case)，控制器单独写 + // TODO 第三步拿到场景ID后，再添加店铺关系进去(store_relation)，控制器单独写 + // TODO 店铺有店铺的二维码，店铺下的店员都有自己的二维码 + // TODO 异步批量生成店铺二维码，店铺二维码 return data(null); }