Browse Source

Merge branch 'dev/2024/0703/update-business-Y' of Harper/feifan-backend-zx-business into master

添加账单和结算功能,加导出功能
Yangzw 9 months ago
parent
commit
84d85820ff

+ 1 - 0
feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -121,6 +121,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(TradeOrderDO::getShopId, shopId)
                 .eqIfPresent(TradeOrderDO::getMerchantId, merId)
+                .ne(TradeOrderDO::getRefundStatus, TradeOrderRefundStatusEnum.ALL.getStatus())
         );
     }