update

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

@@ -4,13 +4,9 @@ public class ActivityStudentAdjustDto {
 
     private Integer userId;
 
-    private Integer vipNum;
+    private Integer courseNum = 0;
 
-    private Integer giveVipNum;
-
-    private Integer practiceNum;
-
-    private Integer givePracticeNum;
+    private Integer giveCourseNum = 0;
 
     private Integer activityId;
 
@@ -32,36 +28,20 @@ public class ActivityStudentAdjustDto {
         this.userId = userId;
     }
 
-    public Integer getVipNum() {
-        return vipNum;
-    }
-
-    public void setVipNum(Integer vipNum) {
-        this.vipNum = vipNum;
-    }
-
-    public Integer getGiveVipNum() {
-        return giveVipNum;
-    }
-
-    public void setGiveVipNum(Integer giveVipNum) {
-        this.giveVipNum = giveVipNum;
-    }
-
-    public Integer getPracticeNum() {
-        return practiceNum;
+    public Integer getCourseNum() {
+        return courseNum;
     }
 
-    public void setPracticeNum(Integer practiceNum) {
-        this.practiceNum = practiceNum;
+    public void setCourseNum(Integer courseNum) {
+        this.courseNum = courseNum;
     }
 
-    public Integer getGivePracticeNum() {
-        return givePracticeNum;
+    public Integer getGiveCourseNum() {
+        return giveCourseNum;
     }
 
-    public void setGivePracticeNum(Integer givePracticeNum) {
-        this.givePracticeNum = givePracticeNum;
+    public void setGiveCourseNum(Integer giveCourseNum) {
+        this.giveCourseNum = giveCourseNum;
     }
 
     public Integer getActivityId() {

mec-biz/src/main/java/com/ym/mec/biz/service/ActivityUserMapperService.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.ActivityQueryDto;
+import com.ym.mec.biz.dal.dto.ActivityStudentAdjustDto;
 import com.ym.mec.biz.dal.dto.ActivityStudentDto;
 import com.ym.mec.biz.dal.entity.ActivityUserMapper;
 import com.ym.mec.biz.dal.page.ActivityStudentQueryInfo;
@@ -81,4 +82,23 @@ public interface ActivityUserMapperService extends BaseService<Integer, Activity
     * @date 2021/11/15 16:34
     */
     PageInfo<ActivityStudentDto> queryActivityUserMapper(ActivityStudentQueryInfo queryInfo);
+
+    /**
+    * @description: 添加排课资格
+     * @param activityStudentAdjustDtos
+    * @return void
+    * @author zx
+    * @date 2021/11/18 11:19
+    */
+    void add(List<ActivityStudentAdjustDto> activityStudentAdjustDtos);
+
+    /**
+    * @description: 取消排课资格
+     * @param activityUserMapperId
+     * @param memo
+    * @return void
+    * @author zx
+    * @date 2021/11/18 11:19
+    */
+    void cut(Integer activityUserMapperId, String memo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ActivityUserMapperServiceImpl.java

@@ -1,28 +1,37 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ActivityUserMapperDao;
+import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
 import com.ym.mec.biz.dal.dto.ActivityQueryDto;
+import com.ym.mec.biz.dal.dto.ActivityStudentAdjustDto;
 import com.ym.mec.biz.dal.dto.ActivityStudentDto;
 import com.ym.mec.biz.dal.entity.ActivityUserMapper;
+import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.biz.dal.page.ActivityStudentQueryInfo;
 import com.ym.mec.biz.service.ActivityUserMapperService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, ActivityUserMapper>  implements ActivityUserMapperService {
 	
 	@Autowired
 	private ActivityUserMapperDao activityUserMapperDao;
+	@Autowired
+	private VipGroupActivityDao vipGroupActivityDao;
 
 	@Override
 	public BaseDAO<Integer, ActivityUserMapper> getDAO() {
@@ -78,4 +87,63 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		pageInfo.setRows(dataList);
 		return pageInfo;
     }
+
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public void add(List<ActivityStudentAdjustDto> activityStudentAdjustDtos) {
+        if(activityStudentAdjustDtos == null || activityStudentAdjustDtos.size() == 0){
+        	throw new BizException("请选择学员");
+		}
+		Integer activityId = activityStudentAdjustDtos.get(0).getActivityId();
+		VipGroupActivity activity = vipGroupActivityDao.get(activityId);
+		if(activity == null){
+			throw new BizException("活动信息不存在");
+		}
+		if(activity.getActivityType() != 1){
+			throw new BizException("操作失败:只有课程活动支持此操作");
+		}
+		List<Integer> studentIds = activityStudentAdjustDtos.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+
+		String courseType = activity.getCourseType();
+		Integer giveCourseNum = activity.getGiveCourseNum();
+		String giveCourseType = activity.getGiveCourseType();
+		List<ActivityUserMapper> activityUserMappers = new ArrayList<>();
+		for (ActivityStudentAdjustDto adjustDto : activityStudentAdjustDtos) {
+			int activityUserMapperNum = adjustDto.getCourseNum();
+			if(giveCourseNum != null && giveCourseNum > 0){
+				if(adjustDto.getGiveCourseNum() > activityUserMapperNum){
+					activityUserMapperNum = adjustDto.getGiveCourseNum();
+				}
+			}
+			if(activityUserMapperNum <= 0){
+				throw new BizException("操作失败:加课次数不可为空");
+			}
+			for (int i = 0; i < activityUserMapperNum; i++) {
+				ActivityUserMapper activityUserMapper = new ActivityUserMapper();
+				activityUserMapper.setActivityId(activityId);
+				activityUserMapper.setUserId(adjustDto.getUserId());
+				activityUserMapper.setActualPrice(BigDecimal.ZERO);
+				activityUserMapper.setReturnFee(false);
+//				activityUserMapper.setTeacherId();
+				if("VIP".equals(courseType)){
+					activityUserMapper.setVipFlag(1);
+				}else {
+					activityUserMapper.setPracticeFlag(1);
+				}
+				if(giveCourseNum != null && giveCourseNum > 0){
+					if("VIP".equals(giveCourseType)){
+						activityUserMapper.setGiveVipFlag(1);
+					}else {
+						activityUserMapper.setGivePracticeFlag(1);
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void cut(Integer activityUserMapperId, String memo) {
+
+	}
 }

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

@@ -27,14 +27,16 @@ public class ActivityUserMapperController extends BaseController {
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('activityUserMapper/add')")
     public Object add(@RequestBody List<ActivityStudentAdjustDto> ActivityStudentAdjustDtos){
-        return succeed(activityUserMapperService.add(ActivityStudentAdjustDtos));
+        activityUserMapperService.add(ActivityStudentAdjustDtos);
+        return succeed();
     }
 
     @ApiOperation(value = "取消活动排课资格")
     @RequestMapping("/cut")
     @PreAuthorize("@pcs.hasPermissions('activityUserMapper/cut')")
     public Object cut(Integer activityUserMapperId,String memo){
-        return succeed(activityUserMapperService.cut(activityUserMapperId,memo));
+        activityUserMapperService.cut(activityUserMapperId,memo);
+        return succeed();
     }
 
     @ApiOperation(value = "获取学员活动排课资格列表")