From 92fb9c48a08ccdf16c6d399f04d29f8064b15c82 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 26 Jun 2024 11:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B5=E6=95=B0=E8=B6=85?= =?UTF-8?q?=E9=99=90=20=E4=BB=8D=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/MemberService.java | 9 +++------ .../system/cashierservice/service/OrderService.java | 4 ++-- .../system/cashierservice/service/PayService.java | 2 +- .../cashierservice/service/ProductService.java | 10 ++++------ .../cashierservice/service/ShopInfoService.java | 7 ++++--- .../service/TbGroupOrderInfoService.java | 4 ++-- .../service/TbPrintPCMachineService.java | 4 ++-- .../system/cashierservice/util/PageHelperUtil.java | 13 +++++++++++++ 8 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/util/PageHelperUtil.java diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java index 8719dab..29b65a0 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -14,10 +14,7 @@ import com.chaozhanggui.system.cashierservice.thirdpay.resp.MainScanResp; import com.chaozhanggui.system.cashierservice.thirdpay.resp.OrderStatusQueryResp; import com.chaozhanggui.system.cashierservice.thirdpay.resp.PublicResp; import com.chaozhanggui.system.cashierservice.thirdpay.service.ThirdPayService; -import com.chaozhanggui.system.cashierservice.util.BeanUtil; -import com.chaozhanggui.system.cashierservice.util.DateUtils; -import com.chaozhanggui.system.cashierservice.util.MD5Util; -import com.chaozhanggui.system.cashierservice.util.SnowFlakeUtil; +import com.chaozhanggui.system.cashierservice.util.*; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -78,7 +75,7 @@ public class MemberService { public Result queryMember(String shopId, String phone, int page, int pageSize) { - PageHelper.startPage(page, pageSize); + PageHelperUtil.startPage(page, pageSize); List tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone); PageInfo pageInfo = new PageInfo(tbShopUsers); return Result.success(CodeEnum.SUCCESS, pageInfo); @@ -616,7 +613,7 @@ public class MemberService { if (ObjectUtil.isEmpty(memberId)) { return Result.fail(CodeEnum.PARAM); } - PageHelper.startPage(page, pageSize); + PageHelperUtil.startPage(page, pageSize); List> list = tbShopUserFlowMapper.selectByMemberAccountFlow(memberId); PageInfo pageInfo = new PageInfo(list); return Result.success(CodeEnum.SUCCESS, pageInfo); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 7436064..b473db1 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -702,7 +702,7 @@ public class OrderService { public Result findOrder(Integer shopId, String status, Integer page, Integer size, String orderNo) { String day = DateUtils.getDay(); - PageHelper.startPage(page, size); + PageHelperUtil.startPage(page, size); String orderType = ""; if (StringUtils.isNotEmpty(status)) { if (status.equals("refund")) { @@ -1065,7 +1065,7 @@ public class OrderService { public Result getOutNumber(String shopId,Integer page,Integer pageSize){ - PageHelper.startPage(page, pageSize); + PageHelperUtil.startPage(page, pageSize); List list= tbOrderOutNumberMapper.selectAll(shopId); PageInfo pageInfo=new PageInfo(list); return Result.success(CodeEnum.SUCCESS,pageInfo); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 105a094..190c55c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1093,7 +1093,7 @@ public class PayService { String shopId = info.getString("shopId"); String staffId = info.getString("staffId"); - PageHelper.startPage(pageNo, pageSize); + PageHelperUtil.startPage(pageNo, pageSize); List list = tbQuickPayMapper.selectByShopIdAndStaffId(Integer.valueOf(shopId), Integer.valueOf(staffId)); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index 21d9dfb..722bf57 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -7,14 +7,13 @@ import com.chaozhanggui.system.cashierservice.entity.vo.ShopCategoryVo; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; import com.chaozhanggui.system.cashierservice.util.DateUtils; -import com.github.pagehelper.PageHelper; +import com.chaozhanggui.system.cashierservice.util.PageHelperUtil; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; @Service @Slf4j @@ -39,14 +38,14 @@ public class ProductService { public Result queryCategory(String shopId,Integer page,Integer pageSize){ - PageHelper.startPage(page, pageSize); + PageHelperUtil.startPage(page, pageSize); List list=tbShopCategoryMapper.selectByAll(shopId); PageInfo pageInfo=new PageInfo(list); return Result.success(CodeEnum.SUCCESS,pageInfo); } public Result queryAllCategory(String shopId,Integer page,Integer pageSize){ - PageHelper.startPage(page, pageSize); + PageHelperUtil.startPage(page, pageSize); List list=tbShopCategoryMapper.queryAllCategory(shopId); PageInfo pageInfo=new PageInfo(list); return Result.success(CodeEnum.SUCCESS,pageInfo); @@ -95,11 +94,10 @@ public class ProductService { public Result queryNewCommodityInfo(String shopId, String categoryId, String commdityName, int page, int pageSize, String masterId) { List tbProductWithBLOBs=null; + PageHelperUtil.startPage(page,pageSize); if(ObjectUtil.isEmpty(categoryId)){ - PageHelper.startPage(page, pageSize); tbProductWithBLOBs=tbProductMapper.selectByShopId(shopId,commdityName); }else { - PageHelper.startPage(page, pageSize); tbProductWithBLOBs=tbProductMapper.selectByShopIdAndShopType(shopId,categoryId,commdityName); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java index 0fb1fce..9dab6c6 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java @@ -7,6 +7,7 @@ import com.chaozhanggui.system.cashierservice.entity.*; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; import com.chaozhanggui.system.cashierservice.util.DateUtils; +import com.chaozhanggui.system.cashierservice.util.PageHelperUtil; import com.chaozhanggui.system.cashierservice.util.TokenUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -44,7 +45,7 @@ public class ShopInfoService { return Result.fail(CodeEnum.PARAM); } - PageHelper.startPage(page, pageSize); + PageHelperUtil.startPage(page, pageSize); List shopTables=tbShopTableMapper.selectByShopIdAndStatus(shopId,areaId,status); PageInfo pageInfo=new PageInfo(shopTables); return Result.success(CodeEnum.SUCCESS,pageInfo); @@ -64,7 +65,7 @@ public class ShopInfoService { // ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndTrade(shopId,day); // List list = shopUserDutyMapper.selectByShopIdAndTradeAll(shopId,day,tbToken.getId()); if (Objects.nonNull(shopUserDuty)){ -// PageHelper.startPage(page, pageSize); +// PageHelperUtil.startPage(page, pageSize); List shopTables=shopUserDutyDetailMapper.selectAllByDuctId(shopUserDuty.getId()); // PageInfo pageInfo=new PageInfo(shopTables); shopUserDuty.setDetailList(shopTables); @@ -82,7 +83,7 @@ public class ShopInfoService { public Result queryDutyFlow(String token, String shopId, int page, int pageSize) { // JSONObject jsonObject = TokenUtil.parseParamFromToken(token); // String userId = jsonObject.getString("accountId"); - PageHelper.startPage(page, pageSize); + PageHelperUtil.startPage(page, pageSize); PageHelper.orderBy("login_out_time desc"); List list = shopUserDutyMapper.selectByShopId(shopId); PageInfo pageInfo=new PageInfo(list); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbGroupOrderInfoService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbGroupOrderInfoService.java index 2c06098..742a52a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbGroupOrderInfoService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbGroupOrderInfoService.java @@ -13,7 +13,7 @@ import com.chaozhanggui.system.cashierservice.entity.vo.ProductVo; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; import com.chaozhanggui.system.cashierservice.util.JSONUtil; -import com.github.pagehelper.PageHelper; +import com.chaozhanggui.system.cashierservice.util.PageHelperUtil; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -109,7 +109,7 @@ public class TbGroupOrderInfoService { } public Result queryByPage(GroupOrderDto param) { - PageHelper.startPage(param.getPage(), param.getSize()); + PageHelperUtil.startPage(param.getPage(), param.getSize()); return Result.success(CodeEnum.SUCCESS, new PageInfo(tbGroupOrderInfoMapper.queryList(param))); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java index ae1c771..4858de9 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java @@ -8,7 +8,7 @@ import com.chaozhanggui.system.cashierservice.entity.dto.PrintMachineDto; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; import com.chaozhanggui.system.cashierservice.util.JSONUtil; -import com.github.pagehelper.PageHelper; +import com.chaozhanggui.system.cashierservice.util.PageHelperUtil; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -60,7 +60,7 @@ public class TbPrintPCMachineService { * @return 查询结果 */ public Result queryByPage(TbPrintPCMachine tbPrintMachine) { - PageHelper.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize()); + PageHelperUtil.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize()); tbPrintMachine.setContentType("local"); List tbPrintMachines = this.tbPrintMachineMapper.queryAll(tbPrintMachine); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PageHelperUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PageHelperUtil.java new file mode 100644 index 0000000..93fa390 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PageHelperUtil.java @@ -0,0 +1,13 @@ +package com.chaozhanggui.system.cashierservice.util; + +import com.github.pagehelper.PageHelper; + +public class PageHelperUtil { + + /** + * 解决页数超限 仍返回数据问题 + */ + public static void startPage(int page, int pageSize) { + PageHelper.startPage(page, pageSize, true, false, false); + } +}