| 
					
				 | 
			
			
				@ -219,6 +219,8 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        taskGoodsDO.setCoupon(jsonObject.getInteger("couponNum")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        taskGoodsDO.setImg(jsonObject.getString("picUrl")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        taskGoodsDO.setName(jsonObject.getString("name")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        taskGoodsDO.setCreateTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        taskGoodsDO.setUpdateTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        taskGoodsDO.setSaasId("dev"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        taskGoodsDO.setStatus(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        taskGoodsDao.save(taskGoodsDO); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -235,7 +237,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        activityRuleDO.setDelFlag(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        activityRuleDao.save(activityRuleDO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        System.out.println("----------------------------update--"+activityDO.getId()+activityDO.getAreaName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        activityDO.setCreateTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				//        activityDO.setCreateTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        activityDao.save(activityDO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        MixEnvelop<Boolean, Boolean> envelop = new MixEnvelop<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        envelop.setObj(true); 
			 |