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 0506e58..b22d50b 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/ActivityController.java @@ -1,16 +1,21 @@ package com.kiisoo.ic.activity.controller; +import com.kiisoo.ic.activity.entity.PmnActivityInstance; +import com.kiisoo.ic.activity.entity.PmnActivityPromotionCase; import com.kiisoo.ic.activity.entity.PmnActivitySchedule; +import com.kiisoo.ic.activity.mapper.PmnActivityInstanceDOMapper; import com.kiisoo.ic.activity.mapper.PmnActivityScheduleDOMapper; import com.kiisoo.ic.common.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ModelAttribute; 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.HashMap; import java.util.List; import java.util.Map; @@ -21,6 +26,8 @@ import java.util.Map; public class ActivityController extends BaseController { @Resource PmnActivityScheduleDOMapper pmnActivityScheduleDOMapper; + @Resource + PmnActivityInstanceDOMapper pmnActivityInstanceDOMapper; @ApiOperation(value = "所有活动池列表") @RequestMapping(value = "/schedule/list/all") @@ -45,13 +52,45 @@ public class ActivityController extends BaseController { @ApiOperation(value = "根据活动池新建实例,修改实例详情") @RequestMapping(value = "/instance/save") @ResponseBody - public Map saveInstance() { + public Map saveInstance(@ModelAttribute PmnActivityInstance instance) { // TODO 第一步先创建活动实例,包括活动时间范围,状态等() // TODO 第二步拿到活动实例ID,再根据公司创建场景(promotion_case),控制器单独写 // TODO 第三步拿到场景ID后,再添加店铺关系进去(store_relation),控制器单独写 // TODO 店铺有店铺的二维码,店铺下的店员都有自己的二维码 // TODO 异步批量生成店铺二维码,店铺二维码 - return data(null); + try { + if(instance.getId() != null && instance.getId() > 0) { + pmnActivityInstanceDOMapper.updateById(instance); + }else { + instance.setId(Long.valueOf(pmnActivityInstanceDOMapper.insert(instance))); + } + return data(instance); + } catch (Exception e) { + log.error("查询出错", e); + return fail(); + } + } + + @ApiOperation(value = "根据活动实例修改场景") + @RequestMapping(value = "/promotionCase/save") + public Map savePromotionCase(@ModelAttribute PmnActivityPromotionCase promotionCase){ + try { + return data(null); + } catch (Exception e) { + log.error("查询出错", e); + return fail(); + } + } + + @ApiOperation(value = "根据活动绑定店铺") + @RequestMapping(value = "/promotionStore/save") + public Map saveStore(){ + try { + return data(null); + } catch (Exception e) { + log.error("查询出错", e); + return fail(); + } } @ApiOperation(value = "活动实例分页列表")