分页请求修改

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java

@@ -2,15 +2,14 @@ package com.bonus.core.account.v3.app.controller;
 
 
 import com.bonus.common.core.utils.StringUtils;
+import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
 import com.bonus.core.account.v3.app.service.AppAccService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,29 +22,21 @@ import javax.validation.Valid;
         tags = {"ly_小程序账户控制器V3"}
 )
 @RequestMapping({"/api/v3/app/accInfo"})
-public class AppAccController {
+public class AppAccController extends BaseController {
     private static final Logger log = LoggerFactory.getLogger(AppAccController.class);
     @Resource
     private AppAccService appAccService;
 
 
     @ApiOperation("分页查询账户充值记录")
-    @PostMapping({"/queryTradeAppPage"})
+    @GetMapping({"/queryTradeAppPage"})
-    public AjaxResult queryTradeAppPage(@RequestBody @Valid AppTradeDetailListDTO dto) {
+    public TableDataInfo queryTradeAppPage(@Valid AppTradeDetailListDTO dto) {
         try {
-            if (StringUtils.isBlank(String.valueOf(dto.getCustId()))) {
+            startPage();
-                return AjaxResult.error("食堂ID不能为空");
+            return getDataTable(this.appAccService.queryTradeAppPage(dto));
-            }
-            if (StringUtils.isBlank(String.valueOf(dto.getCurrent()))) {
-                return AjaxResult.error("当前页不能为空");
-            }
-            if (StringUtils.isBlank(String.valueOf(dto.getSize()))) {
-                return AjaxResult.error("每页显示记录数不能为空");
-            }
-            return AjaxResult.success(this.appAccService.queryTradeAppPage(dto));
         } catch (Exception e) {
             log.error(e.toString(), e);
-            return AjaxResult.error("查询账户充值记录失败");
+            return getDataTable(null);
         }
     }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/AppAccService.java

@@ -1,10 +1,12 @@
 package com.bonus.core.account.v3.app.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
 import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
-import com.github.pagehelper.Page;
+
+import java.util.List;
 
 public interface AppAccService {
 
-   Page<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto);
+   List<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java

@@ -1,24 +1,18 @@
 package com.bonus.core.account.v3.app.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
 import com.bonus.core.account.v3.app.service.AppAccService;
 import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
 import com.bonus.core.account.v3.constants.AccTradeTypeEnum;
-import com.bonus.core.account.v3.custom.AccForAppCustomBusiness;
-import com.bonus.core.account.v3.metadata.service.AccMetadataService;
-import com.bonus.core.account.v3.service.AccInfoService;
 import com.bonus.core.account.v3.service.AccTradeService;
-import com.bonus.core.account.v3.service.AccTradeWalletDetailService;
-import com.bonus.core.allocation.api.AllocMetadataApi;
-import com.github.pagehelper.Page;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class AppAccServiceImpl implements AppAccService {
@@ -29,7 +23,7 @@ public class AppAccServiceImpl implements AppAccService {
 
 
    @Override
-   public Page<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto) {
+   public List<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto) {
       dto.setTradeTypeList(AccTradeTypeEnum.getRechargeListForApp());
       dto.setPayStateList(dto.convertPayStateList());
       return this.accTradeService.queryTradeAppPage(dto);

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java

@@ -1,15 +1,17 @@
 package com.bonus.core.account.v3.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
 import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
 import com.bonus.core.account.v3.model.AccTrade;
-import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface AccTradeMapper extends BaseMapper<AccTrade> {
 
-   Page<AppAccTradePageVO> queryTradeAppPage(Page<AccTrade> page, @Param("infoParam") AppTradeDetailListDTO dto);
+   List<AppAccTradePageVO> queryTradeAppPage(@Param("infoParam") AppTradeDetailListDTO dto);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeService.java

@@ -1,13 +1,15 @@
 package com.bonus.core.account.v3.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
 import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
 import com.bonus.core.account.v3.model.AccTrade;
-import com.github.pagehelper.Page;
+
+import java.util.List;
 
 public interface AccTradeService extends IService<AccTrade> {
 
-   Page<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto);
+   List<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java

@@ -1,24 +1,25 @@
 package com.bonus.core.account.v3.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
 import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
 import com.bonus.core.account.v3.mapper.AccTradeMapper;
 import com.bonus.core.account.v3.model.AccTrade;
 import com.bonus.core.account.v3.service.AccTradeService;
-import com.github.pagehelper.Page;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class AccTradeServiceImpl extends ServiceImpl<AccTradeMapper, AccTrade> implements AccTradeService {
    private static final Logger log = LoggerFactory.getLogger(AccTradeServiceImpl.class);
 
 
    @Override
-   public Page<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto) {
+   public List<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto) {
-      Page<AccTrade> page = new Page((int) dto.getCurrent(), (int) dto.getSize());
+      return ((AccTradeMapper)this.baseMapper).queryTradeAppPage(dto);
-      return ((AccTradeMapper)this.baseMapper).queryTradeAppPage(page, dto);
    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletRecipeV2Controller.java

@@ -1,5 +1,9 @@
 package com.bonus.core.menu.controller;
 
+import com.bonus.common.core.utils.StringUtils;
+import com.bonus.common.core.web.controller.BaseController;
+import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.core.menu.dto.AppletWeekCanteenDTO;
 import com.bonus.core.menu.dto.AppletWeekRecipeDTO;
 import com.bonus.core.menu.service.MenuRecipeService;
@@ -10,17 +14,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
 
 @RestController
 @RequestMapping("/api/v2/applet/menurecipe")
-public class AppletRecipeV2Controller {
+public class AppletRecipeV2Controller extends BaseController {
    private static final Logger log = LoggerFactory.getLogger(AppletRecipeV2Controller.class);
    @Lazy
    @Autowired
@@ -28,13 +29,28 @@ public class AppletRecipeV2Controller {
 
    @PostMapping({"/list/week/canteen"})
    @ApiOperation("获取一周菜谱食堂列表")
-   public List<AppletWeekCanteenVO> getWeekMealList(@RequestBody AppletWeekCanteenDTO appletWeekCanteenDTO) {
+   public AjaxResult getWeekMealList(@RequestBody AppletWeekCanteenDTO appletWeekCanteenDTO) {
-      return this.menuRecipeService.getWeekMealList(appletWeekCanteenDTO);
+      try {
+         if (StringUtils.isBlank(String.valueOf(appletWeekCanteenDTO.getCustId()))){
+            return AjaxResult.error("客户id不能为空");
+         }
+         return AjaxResult.success(this.menuRecipeService.getWeekMealList(appletWeekCanteenDTO));
+      } catch (Exception e) {
+            log.error(e.toString(), e);
+            return AjaxResult.error("获取一周菜谱食堂列表失败");
+      }
    }
 
    @ApiOperation("获取一周菜谱详情")
-   @PostMapping({"/week/recipe/detail"})
+   @GetMapping({"/week/recipe/detail"})
-   public List<AppletWeekRecipeVO> getWeekRecipeDetailList(@RequestBody @Valid AppletWeekRecipeDTO content) {
+   public TableDataInfo getWeekRecipeDetailList(@Valid AppletWeekRecipeDTO content) {
-      return this.menuRecipeService.getWeekRecipeDetailList(content);
+      try {
+         startPage();
+         return getDataTable(this.menuRecipeService.getWeekRecipeDetailList(content));
+      } catch (Exception e) {
+            log.error(e.toString(), e);
+            return getDataTable(null);
+      }
+
    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/dto/AppletWeekRecipeDTO.java

@@ -8,9 +8,7 @@ import java.time.LocalDate;
 @Data
 public class AppletWeekRecipeDTO {
    @ApiModelProperty("菜谱日期")
-   private @NotNull(
+   private @NotNull(message = "菜谱id不能为空") LocalDate applyDate;
-   message = "{menu_apply_date_null}"
-) LocalDate applyDate;
    @ApiModelProperty("人员id")
    private Long custId;
    @ApiModelProperty("菜谱id")