From b6e4a6eb2c3ed82d41dce75b68ed4022af808cea Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Tue, 3 Feb 2026 17:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=81=B5=E6=9E=A2=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zmzm/finance/common/service/impl/OrdersServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java b/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java index fecf25f..691fa68 100644 --- a/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java @@ -66,7 +66,8 @@ public class OrdersServiceImpl extends ServiceImpl impleme .select("if(t4.trade_no is null,t.order_sn,t4.out_trade_no) as orderSn") .selectAs(ShopProduct::getGoodsType,"goodsType") .notIn(BuyOrder::getOrderStatus,0,5) - .ne(BuyOrder::getOrderType,"lsorder") + .and(t->t.eq(BuyOrder::getOrderType,"order") + .or().and(s->s.eq(BuyOrder::getOrderType,"lsorder").ne(BuyOrder::getPaymentMethod,1))) .gt(BuyOrder::getRealMoney,0) .gt(BuyOrder::getOrderId,oldBuyOrderId)); List os = new ArrayList<>();