|
@@ -39,7 +39,7 @@ public class SupplyChainController extends BaseController {
|
|
|
public TableDataInfo orderList(@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) String promoterId) {
|
|
|
+ @ApiParam("达人ID") @RequestParam(value = "promoterId", required = false) Long promoterId) {
|
|
|
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
@@ -212,8 +212,8 @@ public class SupplyChainController extends BaseController {
|
|
|
@ApiParam("商品ID") @RequestParam(value = "itemId", required = false) String itemId,
|
|
|
@ApiParam("订单开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
@ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
|
- @ApiParam("达人Id") @RequestParam(value = "itemId", required = false) String promoterId,
|
|
|
- @ApiParam("商品名称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName) {
|
|
|
+ @ApiParam("达人Id") @RequestParam(value = "promoterId", required = false) String promoterId,
|
|
|
+ @ApiParam("达人名称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
|
Long start = DateUtils.getStartLongTime(orderStartDate);
|