|
@@ -118,11 +118,13 @@ public class BytedancePromoterOrderListController extends BaseController {
|
|
|
export.add(date.getString("validRadio"));
|
|
|
export.add(date.getString("payAmount"));
|
|
|
export.add(date.getString("validPayAmount"));
|
|
|
+ export.add(date.getString("regimentalPromotionAmount"));
|
|
|
+ export.add(date.getString("secondEstimatedCommission"));
|
|
|
export.add(date.getString("userName"));
|
|
|
exportList.add(export);
|
|
|
}
|
|
|
}
|
|
|
- String[] headers = {"达人名称", "订单数", "有效订单数", "有效订单率", "GVM", "有效GMV", "绑定人"};
|
|
|
+ String[] headers = {"达人名称", "订单数", "有效订单数", "有效订单率", "GVM", "有效GMV", "预估服务费", "二级团预估服务费", "绑定人"};
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -372,7 +374,7 @@ public class BytedancePromoterOrderListController extends BaseController {
|
|
|
List<JSONObject> list = new ArrayList<>();
|
|
|
if (!Check.isNull(orderStartDate) && !Check.isNull(orderEndDate)) {
|
|
|
list = bytedancePromoterOrderListService.bdReportList(requestMap);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
list = bytedancePromoterOrderListService.bdReportListByBind(requestMap);
|
|
|
}
|
|
|
|
|
@@ -641,10 +643,12 @@ public class BytedancePromoterOrderListController extends BaseController {
|
|
|
export.add(date.getInteger("orderNum"));
|
|
|
export.add(date.getInteger("validOrderNUm"));
|
|
|
export.add(date.getString("validRadio"));
|
|
|
+ export.add(date.getString("regimentalPromotionAmount"));
|
|
|
+ export.add(date.getString("secondEstimatedCommission"));
|
|
|
exportList.add(export);
|
|
|
}
|
|
|
}
|
|
|
- String[] headers = {"所属人", "商品ID", "商品名称", "商品封面", "佣金率", "订单数", "有效订单数", "有效订单率"};
|
|
|
+ String[] headers = {"所属人", "商品ID", "商品名称", "商品封面", "佣金率", "订单数", "有效订单数", "有效订单率", "预估服务费", "二级团长预估服务费"};
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|