diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java index 1da09d86..df5eb0ba 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/controller/AppAccController.java @@ -37,11 +37,10 @@ public class AppAccController extends BaseController { @ApiOperation("分页查询账户充值记录") @PostMapping({"/queryTradeAppPage"}) - public PageVO queryTradeAppPage(@RequestBody @Valid AppTradeDetailListDTO dto) { + public Page queryTradeAppPage(@RequestBody @Valid AppTradeDetailListDTO dto) { try { - PageMethod.startPage((int) dto.getCurrent(), (int) dto.getSize()); - List list = this.appAccService.queryTradeAppPage(dto); - return PageVO.of(list, list); + Page pages = this.appAccService.queryTradeAppPage(dto); + return pages; } catch (Exception e) { log.error(e.toString(), e); return null; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/dto/AppTradeDetailListDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/dto/AppTradeDetailListDTO.java index ed35b467..a21b0b15 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/dto/AppTradeDetailListDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/dto/AppTradeDetailListDTO.java @@ -1,7 +1,7 @@ package com.bonus.core.account.v3.app.dto; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; +import com.bonus.core.common.page.PageDTO; import com.bonus.core.pay.common.constants.PayStateEnum; import com.google.common.collect.Lists; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/AppAccService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/AppAccService.java index 74cd1cdc..b5416ec2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/AppAccService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/AppAccService.java @@ -11,7 +11,7 @@ import java.util.List; public interface AppAccService { - List queryTradeAppPage(AppTradeDetailListDTO dto); + Page queryTradeAppPage(AppTradeDetailListDTO dto); MobilePayVO accRechargeForApp(AccRechargeForAppDTO dto); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java index b5c48eb1..66448a67 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/app/service/impl/AppAccServiceImpl.java @@ -81,7 +81,7 @@ public class AppAccServiceImpl implements AppAccService { @Override - public List queryTradeAppPage(AppTradeDetailListDTO dto) { + public Page queryTradeAppPage(AppTradeDetailListDTO dto) { dto.setTradeTypeList(AccTradeTypeEnum.getRechargeListForApp()); dto.setPayStateList(dto.convertPayStateList()); return this.accTradeService.queryTradeAppPage(dto); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java index b4b78088..fb80cba0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mapper/AccTradeMapper.java @@ -16,7 +16,7 @@ import java.util.List; @Mapper public interface AccTradeMapper extends BaseMapper { - List queryTradeAppPage(@Param("infoParam") AppTradeDetailListDTO dto); + Page queryTradeAppPage(Page page,@Param("infoParam") AppTradeDetailListDTO dto); List listAccTradeForSend(@Param("tradeIdList") List tradeIdList); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeService.java index 62e3205d..bd4e77c5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccTradeService.java @@ -18,7 +18,7 @@ import java.util.List; public interface AccTradeService extends IService { - List queryTradeAppPage(AppTradeDetailListDTO dto); + Page queryTradeAppPage(AppTradeDetailListDTO dto); Long insertAccTradeAndDetail(AccInfoVO accInfoVO, Integer tradeType, BigDecimal amount, String mchSn, List walletPayList, Long orderNo, String remark, Integer payState, boolean updateWalletInfo); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java index fc7aa4c4..c932ffb0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccTradeServiceImpl.java @@ -65,9 +65,11 @@ public class AccTradeServiceImpl extends ServiceImpl i private CustInfoApi custInfoApi; @Override - public List queryTradeAppPage(AppTradeDetailListDTO dto) { - - return ((AccTradeMapper) this.baseMapper).queryTradeAppPage(dto); + public Page queryTradeAppPage(AppTradeDetailListDTO dto) { + Page page = new Page(dto.getCurrent(), dto.getSize()); + Page pages = ((AccTradeMapper) this.baseMapper).queryTradeAppPage(page,dto); + pages.setTotal(((AccTradeMapper) this.baseMapper).queryTradeAppPage(page, dto).getTotal()); + return pages; } @Override public Long insertAccTradeAndDetail(AccInfoVO accInfoVO, Integer tradeType, BigDecimal amount, String mchSn, List walletPayList, Long orderNo, String remark, Integer payState, boolean updateWalletInfo) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/canteen/controller/AllocCanteenController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/canteen/controller/AllocCanteenController.java index 16dcf2bc..92ae4379 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/canteen/controller/AllocCanteenController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/canteen/controller/AllocCanteenController.java @@ -37,9 +37,6 @@ public class AllocCanteenController { @PostMapping({"/list-avail-pay-type"}) public AjaxResult listAvailPayTypeForApp(@RequestBody AllocCanteen bean) { try { - if (bean.getCanteenId() == null) { - return AjaxResult.error("食堂ID不能为空"); - } return AjaxResult.success(this.allocCanteenService.listAvailPayTypeForApp(bean.getCanteenId())); } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/mybatisPlusConfig/MybatisPlusPageConfig.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/mybatisPlusConfig/MybatisPlusPageConfig.java index 8539912b..72213d23 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/mybatisPlusConfig/MybatisPlusPageConfig.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/mybatisPlusConfig/MybatisPlusPageConfig.java @@ -1,6 +1,7 @@ package com.bonus.core.config.mybatisPlusConfig; import com.alipay.api.domain.PageInfo; +import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; @@ -19,7 +20,8 @@ public class MybatisPlusPageConfig { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); + // 根据你的数据库类型设置 + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } }