双十一活动

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

@@ -1235,33 +1235,17 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 				subActual = subActual.subtract(multiply);
 				activityUserMapper.setActualPrice(multiply);
 			}
-			if(activity.getActivityType().equals(0)){
-				activityUserMapper.setSubNoCoursePrice(activityUserMapper.getActualPrice());
-				activityUserMapper.setTotalCourseNum(activity.getMinCourseNum());
-				activityUserMapper.setSubCourseNum(activity.getMinCourseNum());
-				activityUserMapper.setSingleCourseTime(activity.getSingleCourseTime());
-				//vip课
-				if(StringUtils.isNotEmpty(activity.getVipGroupCategoryIdList())){
-					activityUserMapper.setVipFlag(1);
-					activityUserMapper.setCategoryId(Integer.parseInt(activity.getVipGroupCategoryIdList()));
-				}else {
-					//网管课
-					activityUserMapper.setPracticeFlag(1);
-				}
+			activityUserMapper.setSubNoCoursePrice(activityUserMapper.getActualPrice());
+			activityUserMapper.setTotalCourseNum(activity.getMinCourseNum());
+			activityUserMapper.setSubCourseNum(activity.getMinCourseNum());
+			activityUserMapper.setSingleCourseTime(activity.getSingleCourseTime());
+			//vip课
+			if(StringUtils.isNotEmpty(activity.getVipGroupCategoryIdList())){
+				activityUserMapper.setVipFlag(1);
+				activityUserMapper.setCategoryId(Integer.parseInt(activity.getVipGroupCategoryIdList()));
 			}else {
-				CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
-				cloudTeacherOrder.setStatus(1);
-				cloudTeacherOrder.setAmount(activityUserMapper.getActualPrice());
-				cloudTeacherOrder.setOrderId(studentPaymentOrder.getId());
-				cloudTeacherOrder.setRemark(studentPaymentOrder.getMemo());
-				cloudTeacherOrder.setLevel(activity.getMemberRankId());
-				cloudTeacherOrder.setStudentId(studentPaymentOrder.getUserId());
-				cloudTeacherOrder.setType(activity.getPeriodEnum());
-				cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
-				cloudTeacherOrder.setTime(studentPaymentOrder.getActivityBuyNum());
-				cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
-				activityUserMapper.setMemberFlag(1);
-				activityUserMapper.setMemberOrderId(cloudTeacherOrder.getId());
+				//网管课
+				activityUserMapper.setPracticeFlag(1);
 			}
 			activityUserMapperDao.insert(activityUserMapper);
 		}

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

@@ -642,11 +642,8 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
 			Student student = studentDao.get(studentPaymentOrder.getUserId());
 			//处理双十一活动特殊赠送
-			this.doubleElevenGive(studentPaymentOrder);
-			//处理活动赠送
-			if(StringUtils.contains(studentPaymentOrder.getActivityId(),",")){
-				activityUserMapperService.saveToOrder(studentPaymentOrder,student.getTeacherId());
-			}else {
+			boolean elevenFlag = this.doubleElevenGive(studentPaymentOrder, student.getTeacherId());
+			if(!elevenFlag){
 				studentPaymentOrderService.activityGive(Integer.parseInt(studentPaymentOrder.getActivityId()), studentPaymentOrder,
 						null, null, student.getTeacherId());
 			}
@@ -664,17 +661,19 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	}
 
 	//处理双十一活动特殊赠送
-	private void doubleElevenGive(StudentPaymentOrder studentPaymentOrder){
+	private boolean doubleElevenGive(StudentPaymentOrder studentPaymentOrder,Integer teacherId){
 		String[] split = studentPaymentOrder.getActivityId().split(",");
 		String activeConfig = sysConfigDao.findConfigValue("2022_double_eleven_give_config");
 		String giveStartTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_start_time");
 		String giveEndTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_end_time");
+		Boolean doubleElevenFlag = false;
 		for (String activityId : split) {
 			List<SysConfigJsonDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, SysConfigJsonDto.class);
 			List<SysConfigJsonDto> activityDtos = cloud2022ActivityDtos.stream().
 					filter(e -> Arrays.stream(e.getKey().split(",")).collect(Collectors.toList()).
 							contains(activityId)).collect(Collectors.toList());
 			if(!CollectionUtils.isEmpty(activityDtos)){
+				doubleElevenFlag = true;
 				SysConfigJsonDto jsonDto = activityDtos.get(0);
 				//处理双十一活动特殊处理
 				Date now = new Date();
@@ -700,6 +699,11 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),groupId);
 			}
 		}
+		if (doubleElevenFlag){
+			//处理活动特殊排课资格
+			activityUserMapperService.saveToOrder(studentPaymentOrder,teacherId);
+		}
+		return doubleElevenFlag;
 	}
 
     @Override