排课资格调整

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ActivityStudentDto.java

@@ -0,0 +1,124 @@
+package com.ym.mec.biz.dal.dto;
+
+public class ActivityStudentDto{
+
+    private String organName;
+
+    private Integer userId;
+
+    private String username;
+
+    private String phone;
+
+    private Integer freeVipNum;
+
+    private Integer useVipNum;
+
+    private Integer freeGiveVipNum;
+
+    private Integer useGiveVipNum;
+
+    private Integer freePracticeNum;
+
+    private Integer usePracticeNum;
+
+    private Integer freeGivePracticeNum;
+
+    private Integer useGivePracticeNum;
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Integer getFreeVipNum() {
+        return freeVipNum;
+    }
+
+    public void setFreeVipNum(Integer freeVipNum) {
+        this.freeVipNum = freeVipNum;
+    }
+
+    public Integer getUseVipNum() {
+        return useVipNum;
+    }
+
+    public void setUseVipNum(Integer useVipNum) {
+        this.useVipNum = useVipNum;
+    }
+
+    public Integer getFreeGiveVipNum() {
+        return freeGiveVipNum;
+    }
+
+    public void setFreeGiveVipNum(Integer freeGiveVipNum) {
+        this.freeGiveVipNum = freeGiveVipNum;
+    }
+
+    public Integer getUseGiveVipNum() {
+        return useGiveVipNum;
+    }
+
+    public void setUseGiveVipNum(Integer useGiveVipNum) {
+        this.useGiveVipNum = useGiveVipNum;
+    }
+
+    public Integer getFreePracticeNum() {
+        return freePracticeNum;
+    }
+
+    public void setFreePracticeNum(Integer freePracticeNum) {
+        this.freePracticeNum = freePracticeNum;
+    }
+
+    public Integer getUsePracticeNum() {
+        return usePracticeNum;
+    }
+
+    public void setUsePracticeNum(Integer usePracticeNum) {
+        this.usePracticeNum = usePracticeNum;
+    }
+
+    public Integer getFreeGivePracticeNum() {
+        return freeGivePracticeNum;
+    }
+
+    public void setFreeGivePracticeNum(Integer freeGivePracticeNum) {
+        this.freeGivePracticeNum = freeGivePracticeNum;
+    }
+
+    public Integer getUseGivePracticeNum() {
+        return useGivePracticeNum;
+    }
+
+    public void setUseGivePracticeNum(Integer useGivePracticeNum) {
+        this.useGivePracticeNum = useGivePracticeNum;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupActivity.java

@@ -93,7 +93,7 @@ public class VipGroupActivity {
 	private Integer givePrizeNum = 0;
 
 	@ApiModelProperty(value = "是否充值到余额")
-	private boolean isPayToBalance = true;
+	private boolean isPayToBalance = false;
 
 	@ApiModelProperty(value = "创建时间")
 	private java.util.Date createTime;

mec-web/src/main/java/com/ym/mec/web/controller/ActivityUserMapperController.java

@@ -0,0 +1,44 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dto.ActivityPlanAddDto;
+import com.ym.mec.biz.dal.entity.ActivityPlan;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.page.ActivityPlanQueryInfo;
+import com.ym.mec.biz.service.ActivityPlanService;
+import com.ym.mec.biz.service.ActivityUserMapperService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+@Api(tags = "学员活动排课记录服务")
+@RequestMapping("activityUserMapper")
+@RestController
+public class ActivityUserMapperController extends BaseController {
+
+    @Autowired
+    private ActivityUserMapperService activityUserMapperService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private EmployeeDao employeeDao;
+
+    @ApiOperation(value = "获取学员活动排课资格列表")
+    @PostMapping("/queryActivityUserMapper")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/addActivityPlan')")
+    public Object addActivityPlan(@RequestBody ActivityPlanAddDto activityPlanAddDto){
+        activityPlanService.addActivityPlan(activityPlanAddDto);
+        return succeed();
+    }
+}