czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决页数超限 仍返回数据问题

This commit is contained in:
wangw 2024-06-26 11:09:05 +08:00
parent 82935827f5
commit 92fb9c48a0
8 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
View File

@ -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.OrderStatusQueryResp;
import com.chaozhanggui.system.cashierservice.thirdpay.resp.PublicResp; import com.chaozhanggui.system.cashierservice.thirdpay.resp.PublicResp;
import com.chaozhanggui.system.cashierservice.thirdpay.service.ThirdPayService; import com.chaozhanggui.system.cashierservice.thirdpay.service.ThirdPayService;
import com.chaozhanggui.system.cashierservice.util.BeanUtil; import com.chaozhanggui.system.cashierservice.util.*;
import com.chaozhanggui.system.cashierservice.util.DateUtils;
import com.chaozhanggui.system.cashierservice.util.MD5Util;
import com.chaozhanggui.system.cashierservice.util.SnowFlakeUtil;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -78,7 +75,7 @@ public class MemberService {
public Result queryMember(String shopId, String phone, int page, int pageSize) { public Result queryMember(String shopId, String phone, int page, int pageSize) {
PageHelper.startPage(page, pageSize); PageHelperUtil.startPage(page, pageSize);
List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone); List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone);
PageInfo pageInfo = new PageInfo(tbShopUsers); PageInfo pageInfo = new PageInfo(tbShopUsers);
return Result.success(CodeEnum.SUCCESS, pageInfo); return Result.success(CodeEnum.SUCCESS, pageInfo);
@ -616,7 +613,7 @@ public class MemberService {
if (ObjectUtil.isEmpty(memberId)) { if (ObjectUtil.isEmpty(memberId)) {
return Result.fail(CodeEnum.PARAM); return Result.fail(CodeEnum.PARAM);
} }
PageHelper.startPage(page, pageSize); PageHelperUtil.startPage(page, pageSize);
List<Map<String, Object>> list = tbShopUserFlowMapper.selectByMemberAccountFlow(memberId); List<Map<String, Object>> list = tbShopUserFlowMapper.selectByMemberAccountFlow(memberId);
PageInfo pageInfo = new PageInfo(list); PageInfo pageInfo = new PageInfo(list);
return Result.success(CodeEnum.SUCCESS, pageInfo); return Result.success(CodeEnum.SUCCESS, pageInfo);

4
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -702,7 +702,7 @@ public class OrderService {
public Result findOrder(Integer shopId, String status, Integer page, Integer size, String orderNo) { public Result findOrder(Integer shopId, String status, Integer page, Integer size, String orderNo) {
String day = DateUtils.getDay(); String day = DateUtils.getDay();
PageHelper.startPage(page, size); PageHelperUtil.startPage(page, size);
String orderType = ""; String orderType = "";
if (StringUtils.isNotEmpty(status)) { if (StringUtils.isNotEmpty(status)) {
if (status.equals("refund")) { if (status.equals("refund")) {
@ -1065,7 +1065,7 @@ public class OrderService {
public Result getOutNumber(String shopId,Integer page,Integer pageSize){ public Result getOutNumber(String shopId,Integer page,Integer pageSize){
PageHelper.startPage(page, pageSize); PageHelperUtil.startPage(page, pageSize);
List<TbOrderOutNumber> list= tbOrderOutNumberMapper.selectAll(shopId); List<TbOrderOutNumber> list= tbOrderOutNumberMapper.selectAll(shopId);
PageInfo pageInfo=new PageInfo(list); PageInfo pageInfo=new PageInfo(list);
return Result.success(CodeEnum.SUCCESS,pageInfo); return Result.success(CodeEnum.SUCCESS,pageInfo);

2
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@ -1093,7 +1093,7 @@ public class PayService {
String shopId = info.getString("shopId"); String shopId = info.getString("shopId");
String staffId = info.getString("staffId"); String staffId = info.getString("staffId");
PageHelper.startPage(pageNo, pageSize); PageHelperUtil.startPage(pageNo, pageSize);
List<TbQuickPay> list = tbQuickPayMapper.selectByShopIdAndStaffId(Integer.valueOf(shopId), Integer.valueOf(staffId)); List<TbQuickPay> list = tbQuickPayMapper.selectByShopIdAndStaffId(Integer.valueOf(shopId), Integer.valueOf(staffId));

10
src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
View File

@ -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.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result; import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.DateUtils; 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 com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
@Service @Service
@Slf4j @Slf4j
@ -39,14 +38,14 @@ public class ProductService {
public Result queryCategory(String shopId,Integer page,Integer pageSize){ public Result queryCategory(String shopId,Integer page,Integer pageSize){
PageHelper.startPage(page, pageSize); PageHelperUtil.startPage(page, pageSize);
List<TbShopCategory> list=tbShopCategoryMapper.selectByAll(shopId); List<TbShopCategory> list=tbShopCategoryMapper.selectByAll(shopId);
PageInfo pageInfo=new PageInfo(list); PageInfo pageInfo=new PageInfo(list);
return Result.success(CodeEnum.SUCCESS,pageInfo); return Result.success(CodeEnum.SUCCESS,pageInfo);
} }
public Result queryAllCategory(String shopId,Integer page,Integer pageSize){ public Result queryAllCategory(String shopId,Integer page,Integer pageSize){
PageHelper.startPage(page, pageSize); PageHelperUtil.startPage(page, pageSize);
List<ShopCategoryVo> list=tbShopCategoryMapper.queryAllCategory(shopId); List<ShopCategoryVo> list=tbShopCategoryMapper.queryAllCategory(shopId);
PageInfo pageInfo=new PageInfo(list); PageInfo pageInfo=new PageInfo(list);
return Result.success(CodeEnum.SUCCESS,pageInfo); 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) { public Result queryNewCommodityInfo(String shopId, String categoryId, String commdityName, int page, int pageSize, String masterId) {
List<TbProductWithBLOBs> tbProductWithBLOBs=null; List<TbProductWithBLOBs> tbProductWithBLOBs=null;
PageHelperUtil.startPage(page,pageSize);
if(ObjectUtil.isEmpty(categoryId)){ if(ObjectUtil.isEmpty(categoryId)){
PageHelper.startPage(page, pageSize);
tbProductWithBLOBs=tbProductMapper.selectByShopId(shopId,commdityName); tbProductWithBLOBs=tbProductMapper.selectByShopId(shopId,commdityName);
}else { }else {
PageHelper.startPage(page, pageSize);
tbProductWithBLOBs=tbProductMapper.selectByShopIdAndShopType(shopId,categoryId,commdityName); tbProductWithBLOBs=tbProductMapper.selectByShopIdAndShopType(shopId,categoryId,commdityName);
} }

7
src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
View File

@ -7,6 +7,7 @@ import com.chaozhanggui.system.cashierservice.entity.*;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result; import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.DateUtils; import com.chaozhanggui.system.cashierservice.util.DateUtils;
import com.chaozhanggui.system.cashierservice.util.PageHelperUtil;
import com.chaozhanggui.system.cashierservice.util.TokenUtil; import com.chaozhanggui.system.cashierservice.util.TokenUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -44,7 +45,7 @@ public class ShopInfoService {
return Result.fail(CodeEnum.PARAM); return Result.fail(CodeEnum.PARAM);
} }
PageHelper.startPage(page, pageSize); PageHelperUtil.startPage(page, pageSize);
List<TbShopTable> shopTables=tbShopTableMapper.selectByShopIdAndStatus(shopId,areaId,status); List<TbShopTable> shopTables=tbShopTableMapper.selectByShopIdAndStatus(shopId,areaId,status);
PageInfo pageInfo=new PageInfo(shopTables); PageInfo pageInfo=new PageInfo(shopTables);
return Result.success(CodeEnum.SUCCESS,pageInfo); return Result.success(CodeEnum.SUCCESS,pageInfo);
@ -64,7 +65,7 @@ public class ShopInfoService {
// ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndTrade(shopId,day); // ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndTrade(shopId,day);
// List<String> list = shopUserDutyMapper.selectByShopIdAndTradeAll(shopId,day,tbToken.getId()); // List<String> list = shopUserDutyMapper.selectByShopIdAndTradeAll(shopId,day,tbToken.getId());
if (Objects.nonNull(shopUserDuty)){ if (Objects.nonNull(shopUserDuty)){
// PageHelper.startPage(page, pageSize); // PageHelperUtil.startPage(page, pageSize);
List<ShopUserDutyDetail> shopTables=shopUserDutyDetailMapper.selectAllByDuctId(shopUserDuty.getId()); List<ShopUserDutyDetail> shopTables=shopUserDutyDetailMapper.selectAllByDuctId(shopUserDuty.getId());
// PageInfo pageInfo=new PageInfo(shopTables); // PageInfo pageInfo=new PageInfo(shopTables);
shopUserDuty.setDetailList(shopTables); shopUserDuty.setDetailList(shopTables);
@ -82,7 +83,7 @@ public class ShopInfoService {
public Result queryDutyFlow(String token, String shopId, int page, int pageSize) { public Result queryDutyFlow(String token, String shopId, int page, int pageSize) {
// JSONObject jsonObject = TokenUtil.parseParamFromToken(token); // JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
// String userId = jsonObject.getString("accountId"); // String userId = jsonObject.getString("accountId");
PageHelper.startPage(page, pageSize); PageHelperUtil.startPage(page, pageSize);
PageHelper.orderBy("login_out_time desc"); PageHelper.orderBy("login_out_time desc");
List<ShopUserDuty> list = shopUserDutyMapper.selectByShopId(shopId); List<ShopUserDuty> list = shopUserDutyMapper.selectByShopId(shopId);
PageInfo pageInfo=new PageInfo(list); PageInfo pageInfo=new PageInfo(list);

4
src/main/java/com/chaozhanggui/system/cashierservice/service/TbGroupOrderInfoService.java
View File

@ -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.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result; import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.JSONUtil; 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 com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -109,7 +109,7 @@ public class TbGroupOrderInfoService {
} }
public Result queryByPage(GroupOrderDto param) { 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))); return Result.success(CodeEnum.SUCCESS, new PageInfo(tbGroupOrderInfoMapper.queryList(param)));
} }

4
src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java
View File

@ -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.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result; import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.JSONUtil; 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 com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
@ -60,7 +60,7 @@ public class TbPrintPCMachineService {
* @return 查询结果 * @return 查询结果
*/ */
public Result queryByPage(TbPrintPCMachine tbPrintMachine) { public Result queryByPage(TbPrintPCMachine tbPrintMachine) {
PageHelper.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize()); PageHelperUtil.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize());
tbPrintMachine.setContentType("local"); tbPrintMachine.setContentType("local");
List<TbPrintPCMachine> tbPrintMachines = this.tbPrintMachineMapper.queryAll(tbPrintMachine); List<TbPrintPCMachine> tbPrintMachines = this.tbPrintMachineMapper.queryAll(tbPrintMachine);

13
src/main/java/com/chaozhanggui/system/cashierservice/util/PageHelperUtil.java Normal file
View File

@ -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);
}
}