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

订单数

This commit is contained in:
wangw 2025-03-31 15:03:52 +08:00
parent 6375328c95
commit 0a96135fd0
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
View File

@ -11,6 +11,7 @@ import com.czg.order.vo.HistoryOrderVo;
import com.czg.order.vo.OrderInfoVo; import com.czg.order.vo.OrderInfoVo;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
import com.czg.service.order.enums.OrderStatusEnums;
import com.czg.service.order.service.PayService; import com.czg.service.order.service.PayService;
import com.czg.utils.AssertUtil; import com.czg.utils.AssertUtil;
import com.czg.utils.ServletUtil; import com.czg.utils.ServletUtil;

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

@ -113,7 +113,8 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId()); ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId());
long count = orderInfoService.queryChain() long count = orderInfoService.queryChain()
.eq(OrderInfo::getTradeDay, orderInfo.getTradeDay()) .eq(OrderInfo::getTradeDay, orderInfo.getTradeDay())
.eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()).count(); .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
.le(OrderInfo::getCreateTime,orderInfo.getCreateTime()).count();
String printerNum = "1"; String printerNum = "1";
if (StrUtil.isNotBlank(machine.getPrintQty())) { if (StrUtil.isNotBlank(machine.getPrintQty())) {
printerNum = machine.getPrintQty().split("\\^")[1]; printerNum = machine.getPrintQty().split("\\^")[1];

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

@ -159,7 +159,8 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId()); ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId());
long count = orderInfoService.queryChain() long count = orderInfoService.queryChain()
.eq(OrderInfo::getTradeDay, orderInfo.getTradeDay()) .eq(OrderInfo::getTradeDay, orderInfo.getTradeDay())
.eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()).count(); .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
.le(OrderInfo::getCreateTime,orderInfo.getCreateTime()).count();
PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName()).setPrintType("普通打印").setPickupNum(getPickupNum(orderInfo)) PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName()).setPrintType("普通打印").setPickupNum(getPickupNum(orderInfo))
.setOrderNo(orderInfo.getOrderNo()).setTradeDate(DateUtil.format(orderInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")).setOperator("【POS-1】001").setPayAmount(orderInfo.getPayAmount().toPlainString()) .setOrderNo(orderInfo.getOrderNo()).setTradeDate(DateUtil.format(orderInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")).setOperator("【POS-1】001").setPayAmount(orderInfo.getPayAmount().toPlainString())
.setOriginalAmount(orderInfo.getOriginAmount().toPlainString()).setReturn(isReturn(orderInfo)) .setOriginalAmount(orderInfo.getOriginAmount().toPlainString()).setReturn(isReturn(orderInfo))

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

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