diff --git a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java~HEAD b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java~HEAD deleted file mode 100644 index bee67e8..0000000 --- a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java~HEAD +++ /dev/null @@ -1,97 +0,0 @@ -package com.kiisoo.ic.activity.bean; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.kiisoo.ic.activity.entity.PmnActivityPromotionParam; -import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; -import com.kiisoo.ic.store.entity.PoiStore; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -@Data -@ApiModel("活动实例") -public class ActivityInstanceVO implements Serializable { - - @ApiModelProperty(value = "活动实例ID,有就编辑无则新增") - private Long id; - - @ApiModelProperty(value = "活动池ID", required = true) - @NotNull(message = "请输入活动池ID") - private Long scheduleId; - - @ApiModelProperty(value = "活动池信息", hidden = true) - private ActivityScheduleVO scheduleVO; - - @ApiModelProperty(value = "类型CODE", hidden = true) - private String categoryCode; - - - @ApiModelProperty(value = "活动名称", required = true) - @NotBlank(message = "请输入活动名称") - private String name; - - @ApiModelProperty(value = "活动开始日期", required = true) - @NotNull(message = "请输入活动开始日期") - @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8") - private Date beginTime; - - @ApiModelProperty(value = "活动结束日期", required = true) - @NotNull(message = "请输入活动结束日期") - @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8") - private Date endTime; - - private String content; - - @ApiModelProperty(value = "活动类型，多选项", required = true) - @NotNull(message = "请选择活动类型") - @Size(min = 1, message = "请选择活动类型") - private List params; - - @ApiModelProperty(value = "选择的企业列表", required = true) -// @NotNull(message = "请选择企业列表") -// @Size(min = 1, message = "请选择企业列表") - private List organizations; - - @ApiModelProperty(value = "第一个店铺名", hidden = true) - private String storeName; - @ApiModelProperty(value = "所有店铺数", hidden = true) - private String storeCount; - - @ApiModelProperty(value = "创建时间", hidden = true) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - - @ApiModelProperty(value = "更新时间", hidden = true) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date updateTime; - - @ApiModelProperty(value = "第一个公司名", hidden = true) - private String companyName; - @ApiModelProperty(value = "所有公司数", hidden = true) - private String companyCount; - - - @ApiModelProperty(value = "选择的店铺列表", required = true) - @NotNull(message = "请选择店铺列表") - @Size(min = 1, message = "请选择店铺列表") - private List stores; // 店铺列表 - - @ApiModelProperty(value = "状态", hidden = true) - private int status; - /* - *分页总条数 - */ - @ApiModelProperty(value = "分页总条数", hidden = true) - private long totalSize; - - /**序号*/ - @ApiModelProperty(value = "序号", hidden = true) - private int number; -} diff --git a/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java~HEAD b/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java~HEAD deleted file mode 100644 index 1df0931..0000000 --- a/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java~HEAD +++ /dev/null @@ -1,46 +0,0 @@ -package com.kiisoo.ic.activity.bean; - -import com.kiisoo.ic.activity.entity.PmnActivityPromotionParam; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.List; - -@Data -public class ActivityScheduleVO { - - @ApiModelProperty(value = "活动池ID,有就编辑无则新增") - private Long id; - - @ApiModelProperty(value = "活动池名称", required = true) - @NotBlank(message = "请输入活动池名称") - private String name; - - @ApiModelProperty(value = "分类ID", required = true) - private Integer categoryId; - - @ApiModelProperty(value = "分类CODE", required = true) - private String categoryCode; - - @ApiModelProperty(value = "活动池图片", required = true) - private String logo; - - @ApiModelProperty(value = "活动池描述") - private String description; - - @ApiModelProperty(value = "APPID", required = true) - @NotBlank(message = "请输入APPID") - private String appId; - - @ApiModelProperty(value = "URI", required = true) - @NotBlank(message = "请输入uri") - private String uri; - - @ApiModelProperty(value = "活动类型", required = true) - @NotNull(message = "至少新增一个活动类型") - @Size(min = 1, message = "至少新增一个活动类型") - private List params; -} diff --git a/src/main/java/com/kiisoo/ic/activity/bean/RecruitVO.java b/src/main/java/com/kiisoo/ic/activity/bean/RecruitVO.java index e76d4d6..3e74d66 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/RecruitVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/RecruitVO.java @@ -1,15 +1,8 @@ package com.kiisoo.ic.activity.bean; -import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; -import com.kiisoo.ic.store.entity.PoiStore; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.List; - @ApiModel("招募申请") @Data public class RecruitVO { diff --git a/src/main/java/com/kiisoo/ic/activity/controller/FissionController.java b/src/main/java/com/kiisoo/ic/activity/controller/FissionController.java index bfc3764..b67ed51 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/FissionController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/FissionController.java @@ -1,12 +1,18 @@ package com.kiisoo.ic.activity.controller; +import com.kiisoo.ic.activity.bean.ActivityInstanceVO; import com.kiisoo.ic.activity.bean.FissionPosterVO; +import com.kiisoo.ic.activity.service.FissionService; +import com.kiisoo.ic.activity.service.IPmnActivityInstanceService; +import com.kiisoo.ic.activity.service.IPmnActivityScheduleService; 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 javax.annotation.Resource; import java.util.Map; @RestController @@ -15,16 +21,22 @@ import java.util.Map; @Slf4j public class FissionController extends BaseController { + @Resource + FissionService fissionService; + @ApiOperation(value = "查询当前的招募令") @GetMapping(value = "/detail") public Map detail() { - return data(null); + + return data(fissionService.detail()); } @ApiOperation("修改当前招募令") @PostMapping("/save") - public Map save(@RequestBody FissionPosterVO fissionPosterVO) { - return data(null); + public Map save(@RequestBody ActivityInstanceVO activityInstanceVO) { + + return data(fissionService.save(activityInstanceVO)); } + } diff --git a/src/main/java/com/kiisoo/ic/activity/service/FissionService.java b/src/main/java/com/kiisoo/ic/activity/service/FissionService.java new file mode 100644 index 0000000..6e1d6d7 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/activity/service/FissionService.java @@ -0,0 +1,31 @@ +package com.kiisoo.ic.activity.service; + +import com.kiisoo.ic.activity.bean.ActivityInstanceVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class FissionService { + + + @Resource + IPmnActivityScheduleService iPmnActivityScheduleService; + @Resource + IPmnActivityInstanceService iPmnActivityInstanceService; + + + public ActivityInstanceVO detail() { + + ActivityInstanceVO activityInstanceVO = iPmnActivityInstanceService.getVO(150L); + return activityInstanceVO; + } + + + public boolean save(ActivityInstanceVO activityInstanceVO) { + + return iPmnActivityInstanceService.saveVO(activityInstanceVO, false); + } + + +}