双十一活动

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

@@ -874,7 +874,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 activityUserMapper.setMemberFlag(1);
                 activityUserMapper.setMemberOrderId(cloudTeacherOrder.getId());
             }
-//            activityUserMapperService.copyProperty(activityUserMapper,activity,false,true);
 
             //是否达到满赠标准
             if (activity.getFullMinusCourseTimes() == -1 || studentPaymentOrder.getActivityBuyNum() < activity.getFullMinusCourseTimes()) {

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

@@ -604,9 +604,11 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 			//处理双十一活动特殊赠送
 			this.doubleElevenGive(studentPaymentOrder);
 			//处理活动赠送
-
-			studentPaymentOrderService.activityGive(Integer.parseInt(studentPaymentOrder.getActivityId()), studentPaymentOrder,
-					null, null, student.getTeacherId());
+			String[] activityIds = studentPaymentOrder.getActivityId().split(",");
+			for (String activityId : activityIds) {
+				studentPaymentOrderService.activityGive(Integer.parseInt(activityId), studentPaymentOrder,
+						null, null, student.getTeacherId());
+			}
 			//保存账户信息
 			sysUserCashAccountDetailService.saveSysUserCashAccountDetail(studentPaymentOrder,studentPaymentOrder.getMemo());
 			//发送短信
@@ -622,28 +624,31 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 
 	//处理双十一活动特殊赠送
 	private void doubleElevenGive(StudentPaymentOrder studentPaymentOrder){
+		String[] split = studentPaymentOrder.getActivityId().split(",");
 		String activeConfig = sysConfigDao.findConfigValue("2022_double_eleven_give_config");
-		List<SysConfigJsonDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, SysConfigJsonDto.class);
-		List<SysConfigJsonDto> activityDtos = cloud2022ActivityDtos.stream().
-				filter(e -> Arrays.stream(e.getKey().split(",")).collect(Collectors.toList()).
-						contains(studentPaymentOrder.getActivityId())).collect(Collectors.toList());
-		if(!CollectionUtils.isEmpty(activityDtos)){
-			SysConfigJsonDto jsonDto = activityDtos.get(0);
-			//处理双十一活动特殊处理
-			String giveStartTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_start_time");
-			String giveEndTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_end_time");
-			Date now = new Date();
-			TempBuyDoubleElevenUserLog doubleElevenUserLog = new TempBuyDoubleElevenUserLog();
-			doubleElevenUserLog.setUserId(studentPaymentOrder.getUserId());
-			doubleElevenUserLog.setCreateTime(now);
-			doubleElevenUserLog.setOrganId(studentPaymentOrder.getOrganId());
-			if(DateUtil.contents(giveStartTime,giveEndTime,now)){
-				//符合赠送条件，赠送乐保套装
-				doubleElevenUserLog.setGiveFlag(true);
+		String giveStartTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_start_time");
+		String giveEndTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_end_time");
+		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)){
+				SysConfigJsonDto jsonDto = activityDtos.get(0);
+				//处理双十一活动特殊处理
+				Date now = new Date();
+				TempBuyDoubleElevenUserLog doubleElevenUserLog = new TempBuyDoubleElevenUserLog();
+				doubleElevenUserLog.setUserId(studentPaymentOrder.getUserId());
+				doubleElevenUserLog.setCreateTime(now);
+				doubleElevenUserLog.setOrganId(studentPaymentOrder.getOrganId());
+				if(DateUtil.contents(giveStartTime,giveEndTime,now)){
+					//符合赠送条件，赠送乐保套装
+					doubleElevenUserLog.setGiveFlag(true);
+				}
+				tempBuyDoubleElevenUserLogDao.insert(doubleElevenUserLog);
+				//赠送抽奖机会
+				luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),3);
 			}
-			tempBuyDoubleElevenUserLogDao.insert(doubleElevenUserLog);
-			//赠送抽奖机会
-			luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),3);
 		}
 	}