代码生成

rk

22 小时以前 a25bdfb2832d682a58466d98a58865b98e885709

代码生成

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

@@ -410,6 +410,9 @@
            existMember.setLoginTime(now);
            existMember.setLoginTimes(existMember.getLoginTimes() + 1);
            member = existMember;
            driverInfo = driverInfoMapper.selectOne(new QueryWrapper<DriverInfo>().lambda().eq(DriverInfo::getMemberId, member.getId())
                    .eq(DriverInfo::getDeleted, Constants.ZERO).eq(DriverInfo::getVersionType,Constants.ZERO).last("limit 1")
            );
        } else {
            // 没有司机账号，注册新用户，默认密码为手机号后六位
            String salt = RandomStringUtils.randomAlphanumeric(6);

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

@@ -252,6 +252,7 @@
    public PageData<Revenue> findDriverRevenuePage(PageWrap<RevenueQueryDTO> pageWrap, Integer memberId) {
        IPage<Revenue> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Revenue> qw = buildRevenueQueryWrapper(pageWrap.getModel(), memberId);
        qw.lambda().eq(Revenue::getMemberType, Constants.ONE);
        PageData<Revenue> result = PageData.from(revenueMapper.selectPage(page, qw));
        if (result != null && result.getRecords() != null) {
            for (Revenue model : result.getRecords()) {
@@ -269,6 +270,7 @@
        }
        IPage<Revenue> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Revenue> qw = buildRevenueQueryWrapper(pageWrap.getModel(), shop.getId());
        qw.lambda().eq(Revenue::getMemberType, Constants.TWO);
        PageData<Revenue> result = PageData.from(revenueMapper.selectPage(page, qw));
        if (result != null && result.getRecords() != null) {
            for (Revenue model : result.getRecords()) {
@@ -315,46 +317,56 @@
    }

    private RevenueSummaryVO buildRevenueSummary(RevenueQueryDTO queryDTO, Integer memberId) {
        // 收入
        QueryWrapper<Revenue> incomeQw = new QueryWrapper<>();
        incomeQw.eq("DELETED", Constants.ZERO);
        incomeQw.eq("MEMBER_ID", memberId);
        incomeQw.eq("OPT_TYPE", Constants.ONE);
        if (queryDTO != null) {
            if (queryDTO.getType() != null) {
                incomeQw.eq("TYPE", queryDTO.getType());
        Integer queryOptType = queryDTO != null ? queryDTO.getOptType() : null;

        long totalIncome = 0L;
        long totalExpense = 0L;

        // 收入：optType未指定或optType=1时查询
        if (queryOptType == null || Constants.equalsInteger(queryOptType, Constants.ONE)) {
            QueryWrapper<Revenue> incomeQw = new QueryWrapper<>();
            incomeQw.eq("DELETED", Constants.ZERO);
            incomeQw.eq("MEMBER_ID", memberId);
            incomeQw.eq("OPT_TYPE", Constants.ONE);
            if (queryDTO != null) {
                if (queryDTO.getType() != null) {
                    incomeQw.eq("TYPE", queryDTO.getType());
                }
                if (queryDTO.getStartTime() != null) {
                    incomeQw.ge("CREATE_TIME", queryDTO.getStartTime());
                }
                if (queryDTO.getEndTime() != null) {
                    incomeQw.le("CREATE_TIME", Utils.Date.getEnd(queryDTO.getEndTime()));
                }
            }
            if (queryDTO.getStartTime() != null) {
                incomeQw.ge("CREATE_TIME", queryDTO.getStartTime());
            }
            if (queryDTO.getEndTime() != null) {
                incomeQw.le("CREATE_TIME", Utils.Date.getEnd(queryDTO.getEndTime()));
            }
            incomeQw.select("IFNULL(SUM(AMOUNT), 0) as amount");
            Map<String, Object> incomeResult = revenueMapper.selectMaps(incomeQw).stream().findFirst().orElse(null);
            totalIncome = incomeResult != null && incomeResult.get("amount") != null
                    ? Long.parseLong(incomeResult.get("amount").toString()) : 0L;
        }
        incomeQw.select("IFNULL(SUM(AMOUNT), 0) as amount");
        Map<String, Object> incomeResult = revenueMapper.selectMaps(incomeQw).stream().findFirst().orElse(null);
        long totalIncome = incomeResult != null && incomeResult.get("amount") != null
                ? Long.parseLong(incomeResult.get("amount").toString()) : 0L;
        // 支出
        QueryWrapper<Revenue> expenseQw = new QueryWrapper<>();
        expenseQw.eq("DELETED", Constants.ZERO);
        expenseQw.eq("MEMBER_ID", memberId);
        expenseQw.eq("OPT_TYPE", -Constants.ONE);
        if (queryDTO != null) {
            if (queryDTO.getType() != null) {
                expenseQw.eq("TYPE", queryDTO.getType());

        // 支出：optType未指定或optType=-1时查询
        if (queryOptType == null || Constants.equalsInteger(queryOptType, -Constants.ONE)) {
            QueryWrapper<Revenue> expenseQw = new QueryWrapper<>();
            expenseQw.eq("DELETED", Constants.ZERO);
            expenseQw.eq("MEMBER_ID", memberId);
            expenseQw.eq("OPT_TYPE", -Constants.ONE);
            if (queryDTO != null) {
                if (queryDTO.getType() != null) {
                    expenseQw.eq("TYPE", queryDTO.getType());
                }
                if (queryDTO.getStartTime() != null) {
                    expenseQw.ge("CREATE_TIME", queryDTO.getStartTime());
                }
                if (queryDTO.getEndTime() != null) {
                    expenseQw.le("CREATE_TIME", Utils.Date.getEnd(queryDTO.getEndTime()));
                }
            }
            if (queryDTO.getStartTime() != null) {
                expenseQw.ge("CREATE_TIME", queryDTO.getStartTime());
            }
            if (queryDTO.getEndTime() != null) {
                expenseQw.le("CREATE_TIME", Utils.Date.getEnd(queryDTO.getEndTime()));
            }
            expenseQw.select("IFNULL(SUM(AMOUNT), 0) as amount");
            Map<String, Object> expenseResult = revenueMapper.selectMaps(expenseQw).stream().findFirst().orElse(null);
            totalExpense = expenseResult != null && expenseResult.get("amount") != null
                    ? Long.parseLong(expenseResult.get("amount").toString()) : 0L;
        }
        expenseQw.select("IFNULL(SUM(AMOUNT), 0) as amount");
        Map<String, Object> expenseResult = revenueMapper.selectMaps(expenseQw).stream().findFirst().orElse(null);
        long totalExpense = expenseResult != null && expenseResult.get("amount") != null
                ? Long.parseLong(expenseResult.get("amount").toString()) : 0L;

        RevenueSummaryVO vo = new RevenueSummaryVO();
        vo.setTotalIncome(totalIncome);