|
@@ -137,9 +137,10 @@ public class JiaoYangReportController extends BaseController {
|
|
|
@GetMapping("/promoter")
|
|
|
@ApiOperation(value = "达人订单")
|
|
|
public TableDataInfo promoter(@ApiParam("订单开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
- @ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
|
- @ApiParam("达人名称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName,
|
|
|
- @ApiParam("达人ID") @RequestParam(value = "promoterId", required = false) Long promoterId) {
|
|
|
+ @ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
|
+ @ApiParam("达人名称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName,
|
|
|
+ @ApiParam("达人ID") @RequestParam(value = "promoterId", required = false) Long promoterId,
|
|
|
+ @ApiParam("类型") @RequestParam(value = "type", required = false) Long type) {
|
|
|
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
@@ -156,6 +157,9 @@ public class JiaoYangReportController extends BaseController {
|
|
|
if (!Check.isNull(promoterId)) {
|
|
|
requestMap.put("promoterId", promoterId);
|
|
|
}
|
|
|
+ if (!Check.isNull(type)) {
|
|
|
+ requestMap.put("type", type);
|
|
|
+ }
|
|
|
TableDataInfo dataInfo = new TableDataInfo();
|
|
|
if (Check.isNullMap(requestMap)) {
|
|
|
dataInfo.setCode(-1);
|