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

处理没有订单是台桌信息为空

This commit is contained in:
GYJ 2024-07-09 10:38:05 +08:00
parent de049b5791
commit 507b4d4d9e
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
View File

@ -5,11 +5,14 @@ import cn.ysk.cashier.dto.shop.ShopTableSeleInfoDto;
import cn.ysk.cashier.enums.PayTypeEnum; import cn.ysk.cashier.enums.PayTypeEnum;
import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.mybatis.service.TbShopUserFlowService; import cn.ysk.cashier.mybatis.service.TbShopUserFlowService;
import cn.ysk.cashier.pojo.shop.TbShopTable;
import cn.ysk.cashier.repository.ShopUserDutyDetailRepository; import cn.ysk.cashier.repository.ShopUserDutyDetailRepository;
import cn.ysk.cashier.repository.ShopUserDutyRepository; import cn.ysk.cashier.repository.ShopUserDutyRepository;
import cn.ysk.cashier.repository.TbTokenRepository; import cn.ysk.cashier.repository.TbTokenRepository;
import cn.ysk.cashier.repository.order.TbOrderDetailRepository; import cn.ysk.cashier.repository.order.TbOrderDetailRepository;
import cn.ysk.cashier.repository.order.TbOrderInfoRepository; import cn.ysk.cashier.repository.order.TbOrderInfoRepository;
import cn.ysk.cashier.repository.shop.TbShopAreaRepository;
import cn.ysk.cashier.repository.shop.TbShopTableRepository;
import cn.ysk.cashier.repository.shop.TbShopUserRepository; import cn.ysk.cashier.repository.shop.TbShopUserRepository;
import cn.ysk.cashier.service.SummaryService; import cn.ysk.cashier.service.SummaryService;
import cn.ysk.cashier.utils.DateUtil; import cn.ysk.cashier.utils.DateUtil;
@ -56,6 +59,12 @@ public class SummaryServiceImpl implements SummaryService {
@Resource @Resource
private TbShopUserFlowService tbShopUserFlowService; private TbShopUserFlowService tbShopUserFlowService;
@Resource
private TbShopTableRepository shopTableRepository;
@Resource
TbShopAreaRepository tbShopAreaRepository;
@Override @Override
public SummaryVO selectSummary(Integer shopId) { public SummaryVO selectSummary(Integer shopId) {
@ -487,6 +496,16 @@ public class SummaryServiceImpl implements SummaryService {
List<ShopTableSaleInfoVo> list = new ArrayList<>(); List<ShopTableSaleInfoVo> list = new ArrayList<>();
for (String shopTableCode : shopTableCodes) { for (String shopTableCode : shopTableCodes) {
ShopTableSaleInfoVo shopTableSaleInfoVo = tbOrderInfoRepository.queryShopTableSaleInfo(shopId.toString(), shopTableCode, start, end); ShopTableSaleInfoVo shopTableSaleInfoVo = tbOrderInfoRepository.queryShopTableSaleInfo(shopId.toString(), shopTableCode, start, end);
if (shopTableSaleInfoVo.getTableId() == null) {
TbShopTable table = shopTableRepository.findByQrcode(shopTableCode);
if (table != null) {
shopTableSaleInfoVo.setShopId(shopId);
shopTableSaleInfoVo.setTableId(table.getId());
shopTableSaleInfoVo.setTableName(table.getName());
shopTableSaleInfoVo.setAreaId(table.getAreaId());
shopTableSaleInfoVo.setAreaName(tbShopAreaRepository.findById(table.getAreaId()).get().getName());
}
}
list.add(shopTableSaleInfoVo); list.add(shopTableSaleInfoVo);
} }
@ -495,7 +514,7 @@ public class SummaryServiceImpl implements SummaryService {
// 先比较 orderAmount // 先比较 orderAmount
BigDecimal aAmount = a.getOrderAmount() == null ? BigDecimal.ZERO : new BigDecimal(a.getOrderAmount().toString()); BigDecimal aAmount = a.getOrderAmount() == null ? BigDecimal.ZERO : new BigDecimal(a.getOrderAmount().toString());
BigDecimal bAmount = b.getOrderAmount() == null ? BigDecimal.ZERO : new BigDecimal(b.getOrderAmount().toString()); BigDecimal bAmount = b.getOrderAmount() == null ? BigDecimal.ZERO : new BigDecimal(b.getOrderAmount().toString());
int compareAmount = aAmount.compareTo(bAmount); int compareAmount = bAmount.compareTo(aAmount);
if (compareAmount != 0) { if (compareAmount != 0) {
return compareAmount; return compareAmount;
} }
@ -504,7 +523,7 @@ public class SummaryServiceImpl implements SummaryService {
Integer aCount = a.getOrderCount() == null ? 0 : Integer.parseInt(a.getOrderCount().toString()); Integer aCount = a.getOrderCount() == null ? 0 : Integer.parseInt(a.getOrderCount().toString());
Integer bCount = b.getOrderCount() == null ? 0 : Integer.parseInt(b.getOrderCount().toString()); Integer bCount = b.getOrderCount() == null ? 0 : Integer.parseInt(b.getOrderCount().toString());
return aCount - bCount; return bCount - aCount;
}); });
} }