|  | @ -180,7 +180,7 @@ public class ActivityController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |      */
 | 
	
		
			
				|  |  |     @PostMapping(value = HealthBankMapping.healthBank.editActivity)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "编辑活动:上下线、推荐")
 | 
	
		
			
				|  |  |     public ObjEnvelop<Boolean> editActivity(
 | 
	
		
			
				|  |  |     public ObjEnvelop<ActivityDO> editActivity(
 | 
	
		
			
				|  |  |             @ApiParam(name = "id", value = "活动id")
 | 
	
		
			
				|  |  |             @RequestParam(value = "id", required = true) String id,
 | 
	
		
			
				|  |  |             @ApiParam(name = "type", value = "操作类型:上线:0,下线:2,推荐:3")
 | 
	
	
		
			
				|  | @ -195,6 +195,27 @@ public class ActivityController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 编辑活动:上下线、推荐
 | 
	
		
			
				|  |  |      *
 | 
	
		
			
				|  |  |      * @param id
 | 
	
		
			
				|  |  |      * @return
 | 
	
		
			
				|  |  |      */
 | 
	
		
			
				|  |  |     @PostMapping(value = HealthBankMapping.healthBank.findActivityById)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "根据id获取活动详情+活动规则")
 | 
	
		
			
				|  |  |     public ObjEnvelop<ActivityDO> findActivityById(
 | 
	
		
			
				|  |  |             @ApiParam(name = "id", value = "活动id")
 | 
	
		
			
				|  |  |             @RequestParam(value = "id", required = true) String id) {
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             ActivityDO activityDO=service.findActivityById(id);
 | 
	
		
			
				|  |  |             return  ObjEnvelop.getSuccess("获取成功!",activityDO);
 | 
	
		
			
				|  |  |         } catch (Exception e) {
 | 
	
		
			
				|  |  |             e.printStackTrace();
 | 
	
		
			
				|  |  |             tracer.getCurrentSpan().logEvent(e.getMessage());
 | 
	
		
			
				|  |  |             return ObjEnvelop.getError("获取失败!"+e.getMessage());
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 |