双十一活动

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

@@ -683,20 +683,24 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				doubleElevenUserLog.setCreateTime(now);
 				doubleElevenUserLog.setOrganId(studentPaymentOrder.getOrganId());
 				//杭州不送保养套装
-				if(!studentPaymentOrder.getOrganId().equals(4) && DateUtil.contents(giveStartTime,giveEndTime,now)){
-					Integer giveNum = tempBuyDoubleElevenUserLogDao.countGiveNum(studentPaymentOrder.getUserId());
-					if(giveNum == null || giveNum == 0){
-						//符合赠送条件，赠送乐保套装
-						doubleElevenUserLog.setGiveFlag(true);
+				if(studentPaymentOrder.getOrganId().equals(4)){
+					if(DateUtil.contents(giveStartTime,giveEndTime,now)){
+						//赠送抽奖机会
+						luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),4);
+					}
+				}else {
+					if(DateUtil.contents(giveStartTime,giveEndTime,now)){
+						Integer giveNum = tempBuyDoubleElevenUserLogDao.countGiveNum(studentPaymentOrder.getUserId());
+						if(giveNum == null || giveNum == 0){
+							//符合赠送条件，赠送乐保套装
+							doubleElevenUserLog.setGiveFlag(true);
+						}
 					}
+					//赠送抽奖机会
+					luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),3);
 				}
 				tempBuyDoubleElevenUserLogDao.insert(doubleElevenUserLog);
-				//赠送抽奖机会
-				Integer groupId = 3;
-				if(studentPaymentOrder.getOrganId().equals(4)){
-					groupId = 4;
-				}
-				luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),groupId);
+
 			}
 		}
 		if (doubleElevenFlag){