Merge remote-tracking branch 'origin/test' into test

2024-08-29 15:10:45 +08:00
parent 88526e0dd9 cf4116e4b9
commit 2f6a3d9c16
2 changed files with 2 additions and 1 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -363,6 +363,7 @@ public class OrderService {
        String day = DateUtils.getDay();

        LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
+                .notIn(TbCashierCart::getStatus, "final", "refund", "closed", "pending")
                .eq(TbCashierCart::getShopId, shopId);

        // 普通点单