活动新增需求修改

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRewardController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.yonge.cooleshow.biz.dal.dto.ActivityRewardDto;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -64,7 +65,7 @@ public class ActivityRewardController extends BaseController {
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入activityReward")
 	@PreAuthorize("@pcs.hasPermissions('activityReward/submit')")
-	public HttpResponseResult submit(@Valid @RequestBody ActivityReward activityReward) {
+	public HttpResponseResult submit(@Valid @RequestBody ActivityRewardDto activityReward) {
         return status(activityRewardService.submit(activityReward));
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityRewardDto.java

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author: liweifan
@@ -10,4 +12,15 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "ActivityRewardDto对象", description = "活动奖品表数据传输对象")
 public class ActivityRewardDto extends ActivityReward{
 	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建状态 0 正式 1 草稿 ")
+	private Integer draftFlag;
+
+	public Integer getDraftFlag() {
+		return draftFlag;
+	}
+
+	public void setDraftFlag(Integer draftFlag) {
+		this.draftFlag = draftFlag;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityRewardService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.dto.ActivityRewardDto;
 import com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityRewardSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
@@ -35,7 +36,7 @@ public interface ActivityRewardService extends IService<ActivityReward>  {
      */
     IPage<ActivityRewardVo> selectPage(IPage<ActivityRewardVo> page, ActivityRewardSearch query);
 
-	Boolean submit(ActivityReward activityReward);
+	Boolean submit(ActivityRewardDto activityReward);
 
 	/**
 	 * 获取活动所有奖品

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRewardServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dao.ActivityPlanDao;
+import com.yonge.cooleshow.biz.dal.dto.ActivityRewardDto;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,7 +45,15 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean submit(ActivityReward activityReward) {
+    public Boolean submit(ActivityRewardDto activityReward) {
+        //更改活动状态
+        if(activityReward.getDraftFlag() == 0){
+            ActivityPlan activityPlan = new ActivityPlan();
+            activityPlan.setId(activityReward.getActivityId());
+            activityPlan.setDraftFlag(activityReward.getDraftFlag());
+            activityPlanDao.updateById(activityPlan);
+        }
+
         if(null == activityReward.getId()){
             return createActivityReward(activityReward);
         }else{
@@ -57,21 +66,12 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
                 .eq(ActivityReward::getActivityId, activityReward.getActivityId())
         );
         baseMapper.insert(activityReward);
-        //更改活动状态
-        ActivityPlan activityPlan = new ActivityPlan();
-        activityPlan.setId(activityReward.getActivityId());
-        activityPlan.setDraftFlag(0);
-        activityPlanDao.updateById(activityPlan);
+
         return true;
     }
 
     private Boolean updateActivityReward(ActivityReward activityReward) {
         baseMapper.updateById(activityReward);
-        //更改活动状态
-        ActivityPlan activityPlan = new ActivityPlan();
-        activityPlan.setId(activityReward.getActivityId());
-        activityPlan.setDraftFlag(0);
-        activityPlanDao.updateById(activityPlan);
         return true;
     }