|
@@ -126,7 +126,7 @@ public class SupplyChainController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/orderStatistics")
|
|
|
@ApiOperation(value = "订单统计")
|
|
|
- public TableDataInfo orderStatistics(
|
|
|
+ public JSONObject orderStatistics(
|
|
|
@ApiParam("达人Id") @RequestParam(value = "promoterId", required = false) String promoterId,
|
|
|
@ApiParam("订单开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
@ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
@@ -142,15 +142,18 @@ public class SupplyChainController extends BaseController {
|
|
|
if (!Check.isNull(promoterId)) {
|
|
|
requestMap.put("promoterId", promoterId);
|
|
|
}
|
|
|
- TableDataInfo dataInfo = new TableDataInfo();
|
|
|
+
|
|
|
+ JSONObject returnJson = new JSONObject();
|
|
|
if (Check.isNullMap(requestMap)) {
|
|
|
- dataInfo.setCode(-1);
|
|
|
- dataInfo.setMsg("入参不能为空");
|
|
|
- return dataInfo;
|
|
|
+ returnJson.put("code", -1);
|
|
|
+ returnJson.put("message", "入参不能为空");
|
|
|
+
|
|
|
+ return returnJson;
|
|
|
}
|
|
|
- startPage();
|
|
|
List<JSONObject> list = supplyChainService.orderStatistics(requestMap);
|
|
|
- return getDataTable(list);
|
|
|
+ returnJson.put("code", 0);
|
|
|
+ returnJson.put("data", list);
|
|
|
+ return returnJson;
|
|
|
}
|
|
|
|
|
|
|