双十一活动调整

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

@@ -682,22 +682,18 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				doubleElevenUserLog.setUserId(studentPaymentOrder.getUserId());
 				doubleElevenUserLog.setCreateTime(now);
 				doubleElevenUserLog.setOrganId(studentPaymentOrder.getOrganId());
-				//杭州不送保养套装
-				if(studentPaymentOrder.getOrganId().equals(4)){
-					if(DateUtil.contents(giveStartTime,giveEndTime,now)){
+				if(DateUtil.contents(giveStartTime,giveEndTime,now)){
+					if(studentPaymentOrder.getOrganId().equals(4)){
 						//赠送抽奖机会
 						luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),4);
-					}
-				}else {
-					if(DateUtil.contents(giveStartTime,giveEndTime,now)){
+					}else {
+						luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),3);
 						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);