|  | @@ -77,7 +77,6 @@ public class KuaishouRuleSettlementDataController extends BaseController {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |      @GetMapping("/testData")
 | 
	
		
			
				|  |  |      public JSONObject testData(Long relateId, Long promoterId, Long ruleId, Long validOrderNum) {
 | 
	
		
			
				|  |  |         /* JSONObject data = kuaishouRuleSettlementDataService.getData();
 | 
	
	
		
			
				|  | @@ -85,8 +84,8 @@ public class KuaishouRuleSettlementDataController extends BaseController {
 | 
	
		
			
				|  |  |          array.add(data);*/
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        return  kuaishouRuleSettlementDataService.getPromoterRuleData(null, promoterId,ruleId,validOrderNum);
 | 
	
		
			
				|  |  | -       //  return kuaishouRuleSettlementDataService.getOrderRuleData(relateId, promoterId, ruleId, validOrderNum);
 | 
	
		
			
				|  |  | +        return kuaishouRuleSettlementDataService.getPromoterRuleData(null, promoterId, ruleId, validOrderNum);
 | 
	
		
			
				|  |  | +        //  return kuaishouRuleSettlementDataService.getOrderRuleData(relateId, promoterId, ruleId, validOrderNum);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -116,8 +115,10 @@ public class KuaishouRuleSettlementDataController extends BaseController {
 | 
	
		
			
				|  |  |                  export.add(data.getString("ruleName"));
 | 
	
		
			
				|  |  |                  export.add(data.getString("itemIds"));
 | 
	
		
			
				|  |  |                  export.add(data.getString("itemName"));
 | 
	
		
			
				|  |  | +                export.add(data.getString("itemUserName"));
 | 
	
		
			
				|  |  |                  export.add(data.getString("promoterId"));
 | 
	
		
			
				|  |  |                  export.add(data.getString("promoterName"));
 | 
	
		
			
				|  |  | +                export.add(data.getString("promoterUserName"));
 | 
	
		
			
				|  |  |                  export.add(data.getString("orderNum"));
 | 
	
		
			
				|  |  |                  export.add(data.getString("validOrderNum"));
 | 
	
		
			
				|  |  |                  export.add(data.getString("lastSettlementOrderNum"));
 | 
	
	
		
			
				|  | @@ -127,7 +128,7 @@ public class KuaishouRuleSettlementDataController extends BaseController {
 | 
	
		
			
				|  |  |                  exportList.add(export);
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        String[] headers = {"规则名称", "商品ID", "商品名称", "达人ID", "达人名称", "订单数", "有效订单数", "上次结算有效单数", "达人激励", "推荐人激励", "结算状态"};
 | 
	
		
			
				|  |  | +        String[] headers = {"规则名称", "商品ID", "商品名称", "招商", "达人ID", "达人名称", "渠道", "订单数", "有效订单数", "上次结算有效单数", "达人激励", "推荐人激励", "结算状态"};
 | 
	
		
			
				|  |  |          OutputStream os = response.getOutputStream();
 | 
	
		
			
				|  |  |          ExportExcelUtils eeu = new ExportExcelUtils();
 | 
	
		
			
				|  |  |          XSSFWorkbook workbook = new XSSFWorkbook();
 |