|
@@ -89,14 +89,21 @@ public class KuaishouRuleSettlementDataController extends BaseController {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
JSONObject data = list.get(i);
|
|
JSONObject data = list.get(i);
|
|
List<Object> export = new ArrayList();
|
|
List<Object> export = new ArrayList();
|
|
|
|
+ export.add(data.getString("ruleName"));
|
|
|
|
+ export.add(data.getString("itemIds"));
|
|
|
|
+ export.add(data.getString("itemName"));
|
|
export.add(data.getString("promoterId"));
|
|
export.add(data.getString("promoterId"));
|
|
export.add(data.getString("promoterName"));
|
|
export.add(data.getString("promoterName"));
|
|
|
|
+ export.add(data.getString("orderNum"));
|
|
|
|
+ export.add(data.getString("validOrderNum"));
|
|
|
|
+ export.add(data.getString("lastSettlementOrderNum"));
|
|
export.add(data.getString("anchorAmount"));
|
|
export.add(data.getString("anchorAmount"));
|
|
export.add(data.getString("referenceAmount"));
|
|
export.add(data.getString("referenceAmount"));
|
|
|
|
+ export.add(data.getString("settlementStatusDesc"));
|
|
exportList.add(export);
|
|
exportList.add(export);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- String[] headers = {"达人ID", "达人名称", "达人激励", "推荐人激励"};
|
|
|
|
|
|
+ String[] headers = {"规则名称", "商品ID", "商品名称", "达人ID", "达人名称", "订单数", "有效订单数", "上次结算有效单数", "达人激励", "推荐人激励", "结算状态"};
|
|
OutputStream os = response.getOutputStream();
|
|
OutputStream os = response.getOutputStream();
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -134,10 +141,10 @@ public class KuaishouRuleSettlementDataController extends BaseController {
|
|
|
|
|
|
|
|
|
|
@GetMapping("/getPromoterSettlementDetail")
|
|
@GetMapping("/getPromoterSettlementDetail")
|
|
- public TableDataInfo getPromoterSettlementDetail(String statDate, Long promoterId,Integer settlementStatus) {
|
|
|
|
|
|
+ public TableDataInfo getPromoterSettlementDetail(String statDate, Long promoterId, Integer settlementStatus) {
|
|
Long date = Long.valueOf(statDate.replace("-", ""));
|
|
Long date = Long.valueOf(statDate.replace("-", ""));
|
|
startPage();
|
|
startPage();
|
|
- List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId,settlementStatus);
|
|
|
|
|
|
+ List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId, settlementStatus);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -147,7 +154,7 @@ public class KuaishouRuleSettlementDataController extends BaseController {
|
|
Long date = Long.valueOf(requestJson.getString("statDate").replace("-", ""));
|
|
Long date = Long.valueOf(requestJson.getString("statDate").replace("-", ""));
|
|
Long promoterId = requestJson.getLong("promoterId");
|
|
Long promoterId = requestJson.getLong("promoterId");
|
|
|
|
|
|
- List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId,null);
|
|
|
|
|
|
+ List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId, null);
|
|
List<List<Object>> exportList = new ArrayList<>();
|
|
List<List<Object>> exportList = new ArrayList<>();
|
|
if (!Check.isNull(list)) {
|
|
if (!Check.isNull(list)) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|