zm/finance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排除灵枢微信订单

Browse Source
This commit is contained in:
wuchunlei
2026-02-04 09:34:00 +08:00
parent b6e4a6eb2c
commit f0c73ab615
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java
View File

@@ -66,8 +66,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
.select("if(t4.trade_no is null,t.order_sn,t4.out_trade_no) as orderSn") .select("if(t4.trade_no is null,t.order_sn,t4.out_trade_no) as orderSn")
.selectAs(ShopProduct::getGoodsType,"goodsType") .selectAs(ShopProduct::getGoodsType,"goodsType")
.notIn(BuyOrder::getOrderStatus,0,5) .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::getRealMoney,0)
.gt(BuyOrder::getOrderId,oldBuyOrderId)); .gt(BuyOrder::getOrderId,oldBuyOrderId));
List<Orders> os = new ArrayList<>(); List<Orders> os = new ArrayList<>();
@@ -93,7 +91,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
if ("relearn".equals(bo.getOrderType())){ if ("relearn".equals(bo.getOrderType())){
o.setType(2); 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())){ if ("05".equals(bo.getGoodsType())){
o.setType(2); o.setType(2);
}else{ }else{