From f0c73ab615c26e1162f3386dde768b30fb0c28f9 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 4 Feb 2026 09:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=81=B5=E6=9E=A2=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finance/common/service/impl/OrdersServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 691fa68..06c9f77 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,8 +66,6 @@ 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) - .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<>(); @@ -93,7 +91,10 @@ public class OrdersServiceImpl extends ServiceImpl impleme if ("relearn".equals(bo.getOrderType())){ o.setType(2); } - if ("order".equals(bo.getOrderType())){ + if ("order".equals(bo.getOrderType())||"lsorder".equals(bo.getOrderType())){ + if ("lsorder".equals(bo.getOrderType())&&"1".equals(bo.getPaymentMethod())){ + continue; + } if ("05".equals(bo.getGoodsType())){ o.setType(2); }else{