|  | @@ -76,10 +76,10 @@
 | 
	
		
			
				|  |  |          t1.phone,
 | 
	
		
			
				|  |  |          t1.consignee,
 | 
	
		
			
				|  |  |          t1.promoter_address,
 | 
	
		
			
				|  |  | -        t1.total_sale,
 | 
	
		
			
				|  |  | -        t1.fans_number,
 | 
	
		
			
				|  |  | -        t1.avg_video_sales,
 | 
	
		
			
				|  |  | -        t1.video_sales,
 | 
	
		
			
				|  |  | +        t3.total_sale,
 | 
	
		
			
				|  |  | +        t3.fans_number,
 | 
	
		
			
				|  |  | +        t3.avg_video_sales,
 | 
	
		
			
				|  |  | +        t3.video_sales,
 | 
	
		
			
				|  |  |          t1.create_time,
 | 
	
		
			
				|  |  |          t2.30day_gmv,
 | 
	
		
			
				|  |  |          t2.30day_order_num,
 | 
	
	
		
			
				|  | @@ -91,6 +91,7 @@
 | 
	
		
			
				|  |  |          FROM
 | 
	
		
			
				|  |  |          kuaishou_promoter t1
 | 
	
		
			
				|  |  |          LEFT JOIN promoter_oerder_amount t2 on t1.promoter_id = t2.promoter_id
 | 
	
		
			
				|  |  | +        LEFT JOIN promoter_sales_info t3 ON t1.promoter_id = t3.promoter_id
 | 
	
		
			
				|  |  |          <where>
 | 
	
		
			
				|  |  |              <if test="userList != null and userList.size() > 0  ">
 | 
	
		
			
				|  |  |                  and t1.user_id in
 | 
	
	
		
			
				|  | @@ -119,17 +120,19 @@
 | 
	
		
			
				|  |  |          (CASE WHEN t2.promoter_id IS NULL THEN 2 ELSE 1 END) AS 'status',
 | 
	
		
			
				|  |  |          IF(t0.promoter_name is null,t2.promoter_nick_name,t0.promoter_name) AS 'promoterNickName',
 | 
	
		
			
				|  |  |          IFNULL(t2.userName,'-') AS 'userName',
 | 
	
		
			
				|  |  | -        t2.commission_requirement AS 'commissionRequirement',
 | 
	
		
			
				|  |  | +        IFNULL(t2.commission_requirement,'-') AS 'commissionRequirement',
 | 
	
		
			
				|  |  |          IF(t0.handurl is null,t2.promoter_url,t0.handurl) AS 'promoterUrl',
 | 
	
		
			
				|  |  | -        IF(t0.fans is null,t2.fans_number,t0.fans) AS 'fansNumber',
 | 
	
		
			
				|  |  | -        t1.30day_gmv AS 'monthDayGmv',
 | 
	
		
			
				|  |  | -        t1.30day_order_num AS 'monthDayOrderNum',+
 | 
	
		
			
				|  |  | -        t1.valid_amount AS 'validAmount',
 | 
	
		
			
				|  |  | -        IF(t0.videoSales is null,t2.video_sales,t0.videoSales) AS 'videoSales',
 | 
	
		
			
				|  |  | -        IF(t0.avgVideoSales is null,t2.avg_video_sales,t0.avgVideoSales) AS 'avgVideoSales'
 | 
	
		
			
				|  |  | +        IFNULL(t1.30day_gmv,'-') AS 'monthDayGmv',
 | 
	
		
			
				|  |  | +        IFNULL(t1.30day_order_num,'-') AS 'monthDayOrderNum',+
 | 
	
		
			
				|  |  | +        IFNULL(t1.valid_amount,'-') AS 'validAmount',
 | 
	
		
			
				|  |  | +        IFNULL(t3.fans_number,'-') AS 'fansNumber',
 | 
	
		
			
				|  |  | +        IFNULL(t3.video_sales,'-') AS 'videoSales',
 | 
	
		
			
				|  |  | +        IFNULL(t3.avg_video_sales,'-') AS 'avgVideoSales',
 | 
	
		
			
				|  |  | +        IFNULL(t3.total_sale,'-') AS 'totalSale'
 | 
	
		
			
				|  |  |          FROM
 | 
	
		
			
				|  |  |          promoter_oerder_amount t1
 | 
	
		
			
				|  |  |          LEFT JOIN promoter_info t0 ON t1.promoter_id = t0.promoter_id
 | 
	
		
			
				|  |  | +        LEFT JOIN promoter_sales_info t3 ON t1.promoter_id = t3.promoter_id
 | 
	
		
			
				|  |  |          <choose>
 | 
	
		
			
				|  |  |              <when test="userId !=null and userId !='' ">
 | 
	
		
			
				|  |  |                  RIGHT
 |