Merge remote-tracking branch 'origin/master'

doum

4 天以前 c51de64d5ee334d914c90f5e4f82a13f159492ca

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

@@ -173,8 +173,7 @@
        if (shop == null || Constants.equalsInteger(shop.getDeleted(), Constants.ONE)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "门店不存在");
        }
        Integer memberId = shop.getRegionMemberId();
        return buildRevenueStatistics(memberId, Constants.TWO, shop.getBalance());
        return buildRevenueStatistics(shop.getId(), Constants.TWO, shop.getBalance());
    }

    @Override
@@ -257,7 +256,7 @@
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        IPage<Revenue> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Revenue> qw = buildRevenueQueryWrapper(pageWrap.getModel(), shop.getRegionMemberId());
        QueryWrapper<Revenue> qw = buildRevenueQueryWrapper(pageWrap.getModel(), shop.getId());
        PageData<Revenue> result = PageData.from(revenueMapper.selectPage(page, qw));
        if (result != null && result.getRecords() != null) {
            for (Revenue model : result.getRecords()) {
@@ -278,7 +277,7 @@
        if (shop == null || Constants.equalsInteger(shop.getDeleted(), Constants.ONE)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        return buildRevenueSummary(queryDTO, shop.getRegionMemberId());
        return buildRevenueSummary(queryDTO, shop.getId());
    }

    private QueryWrapper<Revenue> buildRevenueQueryWrapper(RevenueQueryDTO query, Integer memberId) {