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 0f6ecfb..0506e58 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java @@ -1,21 +1,14 @@ package com.kiisoo.ic.activity.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kiisoo.ic.activity.entity.PmnActivityInstance; -import com.kiisoo.ic.activity.entity.PmnActivityPromotion; import com.kiisoo.ic.activity.entity.PmnActivitySchedule; -import com.kiisoo.ic.activity.mapper.PmnActivityPromotionCaseMapper; -import com.kiisoo.ic.activity.mapper.PmnActivityPromotionMapper; -import com.kiisoo.ic.activity.mapper.PmnActivityPromotionParamMapper; import com.kiisoo.ic.activity.mapper.PmnActivityScheduleDOMapper; -import com.kiisoo.ic.activity.vo.ActivityInstanceVO; -import com.kiisoo.ic.activity.vo.ActivityScheduleVO; import com.kiisoo.ic.common.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; @@ -29,17 +22,8 @@ public class ActivityController extends BaseController { @Resource PmnActivityScheduleDOMapper pmnActivityScheduleDOMapper; - @Resource - PmnActivityPromotionMapper pmnActivityPromotionMapper; - - @Resource - PmnActivityPromotionCaseMapper pmnActivityPromotionCaseMapper; - - @Resource - PmnActivityPromotionParamMapper pmnActivityPromotionParamMapper; - @ApiOperation(value = "所有活动池列表") - @RequestMapping(value = "/schedule/list/all", method = RequestMethod.GET) + @RequestMapping(value = "/schedule/list/all") @ResponseBody public Map listAll() { try { @@ -52,35 +36,46 @@ public class ActivityController extends BaseController { } @ApiOperation(value = "新增或修改活动池") - @RequestMapping(value = "/schedule/save", method = RequestMethod.GET) + @RequestMapping(value = "/schedule/save") @ResponseBody - public Map save(@ModelAttribute ActivityScheduleVO activitySchedule) { - try { -// int scheduleId = pmnActivityScheduleDOMapper.insert(activitySchedule); -// if(scheduleId > 0) { -// PmnActivityPromotion pmnActivityPromotion = new PmnActivityPromotion(); -// pmnActivityPromotion.setScheduleId(Long.valueOf(scheduleId)); -// pmnActivityPromotion.setName(activitySchedule.getName()); -// pmnActivityPromotion.setStatus(1); -// } - return data(null); - } catch (Exception e) { - log.error("查询出错", e); - return fail(); - } + public Map save() { + return data(null); } - @ApiOperation(value = "活动计划列表") - @RequestMapping(value = "/schedule/list/all", method = RequestMethod.GET) + @ApiOperation(value = "根据活动池新建实例,修改实例详情") + @RequestMapping(value = "/instance/save") @ResponseBody - public Map listAll(@RequestParam Long current, @RequestParam Long companyId, @RequestParam Long storeId, @RequestParam Integer status, @RequestParam String dateStart, @RequestParam String dateEnd) { - try { -// Page page = new Page<>(current, 10); -// Page list = pmnActivityScheduleDOMapper.selectPage(page, null); - return data(null); - } catch (Exception e) { - log.error("查询出错", e); - return fail(); - } + public Map saveInstance() { + // TODO 第一步先创建活动实例,包括活动时间范围,状态等() + // TODO 第二步拿到活动实例ID,再根据公司创建场景(promotion_case),控制器单独写 + // TODO 第三步拿到场景ID后,再添加店铺关系进去(store_relation),控制器单独写 + // 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); + } + + }