修改接口文档

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfZhengzaiController.java

@@ -35,14 +35,14 @@ public class GoblinSelfZhengzaiController extends BaseController {
     @ApiOperation("活动详情-正在下单列表")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "page", value = "页数", example = "1"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageNum", value = "页数", example = "1"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "purchaseName", value = "活动名称", example = ""),
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "status", value = "活动状态[-1-全部|0-等待开始|1-活动中|2-活动结束|7-停用]", example = ""),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "startTime", value = "活动开始时间", example = ""),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "endTime", value = "活动结束时间", example = ""),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "createdAt", value = "活动创建时间", example = ""),
     })
-    public TableDataInfo purchasingList(@RequestParam(value = "page", required = false) @Valid Integer page,
+    public TableDataInfo purchasingList(@RequestParam(value = "pageNum", required = false) @Valid Integer page,
                                         @RequestParam(value = "purchaseName", required = false) String purchaseName,
                                         @RequestParam(value = "status", required = false) Integer status,
                                         @RequestParam(value = "startTime", required = false) String st,
@@ -152,11 +152,11 @@ public class GoblinSelfZhengzaiController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "marketId", value = "活动id", example = "1"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "商铺id", example = "1"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "page", value = "页数", example = "1"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageNum", value = "页数", example = "1"),
     })
     public ResponseDto<List<GoblinMarketSpuListVo>> purchasingSpuList(@RequestParam("marketId") @Valid String marketId,
                                                                       @RequestParam("storeId") @Valid String storeId,
-                                                                      @RequestParam("page") @Valid int page) {
+                                                                      @RequestParam("pageNum") @Valid int page) {
         return goblinZhengzaiMarketService.zhengzaiSpuList(marketId, storeId, page);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java

@@ -69,10 +69,10 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
                 break;
         }
 
-        if (st != null && et != null) {
+        if ((st != null && !st.equals("")) && (et != null && !et.equals(""))) {
             queryMapper.ge(GoblinSelfMarketing::getStartTime, st).le(GoblinSelfMarketing::getEndTime, et);
         }
-        if (ct != null) {
+        if (ct != null&& !ct.equals("")) {
             queryMapper.eq(GoblinSelfMarketing::getCreatedAt, ct);
         }
         return ResponseDto.success(goblinSelfMarketingMapper.selectList(queryMapper));