Merge remote-tracking branch 'origin/master'

doum

2 天以前 4ab710d8d70017f090dd9601099ded1a50a58a10

 server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java

@@ -217,7 +217,10 @@
        queryWrapper.select("IFNULL(SUM(amount), 0) as amount");
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda().eq(WithdrawalOrders::getDeleted, Constants.ZERO);
        queryWrapper.lambda().in(WithdrawalOrders::getStatus, Arrays.asList(Constants.ZERO, Constants.ONE));
        queryWrapper.lambda().eq(WithdrawalOrders::getStatus, Constants.ONE);
        if (pageWrap.getModel().getMemberType() != null) {
            queryWrapper.lambda().eq(WithdrawalOrders::getMemberType, pageWrap.getModel().getMemberType());
        }
        if (pageWrap.getModel().getOutBillNo() != null) {
            queryWrapper.lambda().like(WithdrawalOrders::getOutBillNo, pageWrap.getModel().getOutBillNo());
        }