| 
															
																@ -356,7 +356,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        else if("2".equals(type)){ 
															 | 
															
															 | 
															
																        else if("2".equals(type)){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            //下线 
															 | 
															
															 | 
															
																            //下线 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            activityDO.setStatus(2); 
															 | 
															
															 | 
															
																            activityDO.setStatus(2); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        }else if("1".equals(type)){ 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        }else if("0".equals(type)){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            //上线 
															 | 
															
															 | 
															
																            //上线 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            String ruleJson=null!=activityRuleDO?activityRuleDO.getValue2():""; 
															 | 
															
															 | 
															
																            String ruleJson=null!=activityRuleDO?activityRuleDO.getValue2():""; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            JSONObject obj=JSONObject.parseObject(ruleJson); 
															 | 
															
															 | 
															
																            JSONObject obj=JSONObject.parseObject(ruleJson); 
															 |