czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into prod

Browse Source
This commit is contained in:
wangw
2025-04-01 09:41:16 +08:00
parent f10fba018a 9766205267
commit c3a1c547b1
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
View File

@@ -115,6 +115,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
long count = orderInfoService.queryChain()
.eq(OrderInfo::getTradeDay, orderInfo.getTradeDay())
.eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
.eq(OrderInfo::getShopId, orderInfo.getShopId())
.le(OrderInfo::getCreateTime,orderInfo.getCreateTime()).count();
String printerNum = "1";
if (StrUtil.isNotBlank(machine.getPrintQty())) {

1
cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
View File

@@ -160,6 +160,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
long count = orderInfoService.queryChain()
.eq(OrderInfo::getTradeDay, orderInfo.getTradeDay())
.eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
.eq(OrderInfo::getShopId, orderInfo.getShopId())
.le(OrderInfo::getCreateTime,orderInfo.getCreateTime()).count();
PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName())
.setPrintType("普通打印").setPickupNum(getPickupNum(orderInfo))

1
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -164,6 +164,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
long count = queryChain()
.eq(OrderInfo::getTradeDay, historyOrderVo.getTradeDay())
.eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
.eq(OrderInfo::getShopId, historyOrderVo.getShopId())
.le(OrderInfo::getCreateTime,historyOrderVo.getCreateTime()).count();
historyOrderVo.setOrderNum(count);
return CzgResult.success(historyOrderVo);