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<>();