活动问题修改

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

@@ -117,7 +117,7 @@ public class ActivityRewardController extends BaseController {
     /**
      * 调整库存
      */
-    @GetMapping("/updateStock")
+    @PostMapping("/updateStock")
     @ApiOperation(value = "调整库存")
     @PreAuthorize("@pcs.hasPermissions('activityPlan/updateStock')")
     public HttpResponseResult updateStock(@RequestBody ActivityRewardChangeStock activityRewardChangeStock) {

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

@@ -1,12 +1,15 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Date;
@@ -22,6 +25,8 @@ public class ActivityPlanSearch extends QueryInfo{
 	private String activityName;
 	@ApiModelProperty("客户端：STUDENT 学生端 TEACHER 老师端 ")
 	private ClientEnum activityClient;
+	@ApiModelProperty(value = "活动类型 EVALUATION 评测活动 STANDARD_GIFT 达标赠送")
+	private ActivityTypeEnum activityType;
 	@ApiModelProperty("创建状态 0 正式 1 草稿 ")
 	private Integer draftFlag;
 	@ApiModelProperty("活动状态 0 停用 1 启用 ")
@@ -51,6 +56,14 @@ public class ActivityPlanSearch extends QueryInfo{
 		this.activityClient = activityClient;
 	}
 
+	public ActivityTypeEnum getActivityType() {
+		return activityType;
+	}
+
+	public void setActivityType(ActivityTypeEnum activityType) {
+		this.activityType = activityType;
+	}
+
 	public Integer getDraftFlag() {
 		return draftFlag;
 	}

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanMapper.xml

@@ -88,6 +88,9 @@
 		    <if test="param.activityClient != null">
                 and t.activity_client_ = #{param.activityClient}
             </if>
+            <if test="param.activityType != null">
+                and t.activity_type_ = #{param.activityType}
+            </if>
         </where>
         order by t.id_ desc
 	</select>