Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-11 6a8b55a2183720ff6106f581695298168896cadc

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java

@@ -115,28 +115,29 @@
    public Object getIncomeData(Integer operatorId,Integer storeId) {
        // 报名课程查询query
        RegisterOrderQuery query = new RegisterOrderQuery();
// 充值记录查询query
        RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
        // 赛事活动查询query
        CompetitionQuery competitionQuery = new CompetitionQuery();

        // 会员支付查询query
        IncomeQuery incomeQuery = new IncomeQuery();
        // 场地预约记录查询query
        SiteBookingQuery siteBookingQuery = new SiteBookingQuery();
        // 根据运营商ID 查询运营商下的所有门店
        if (operatorId!=null){
            List<TStore> stores = storeService.list(new QueryWrapper<TStore>().eq("operatorId", operatorId));
            // 拿到该运营商下的门店id集合
            List<Integer> storeIds = stores.stream().map(TStore::getId).collect(Collectors.toList());
            query.setStoresIds(storeIds);
            siteBookingQuery.setStoreIds(storeIds);
        }

        // 充值记录查询query
        RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
        // 赛事活动查询query
        CompetitionQuery competitionQuery = new CompetitionQuery();
        // 会员支付查询query
        IncomeQuery incomeQuery = new IncomeQuery();
        // 场地预约记录查询query
        SiteBookingQuery siteBookingQuery = new SiteBookingQuery();

        Integer roleType = UserExt.getUser().getObjectType();
        rechargeRecordsQuery.setInsertType(roleType);
                       query.setInsertType(roleType);
            competitionQuery.setInsertType(roleType);
                 incomeQuery.setInsertType(roleType);
                 incomeQuery.setInsertType(roleType);
        List<IncomeVO> incomeVOS = new ArrayList<>();
        // 会员支付记录
@@ -193,22 +194,28 @@
            if (competition.getAmount() != null) {
                temp.setAmount(new BigDecimal(competition.getAmount().toString()));
            }

            incomeVOS.add(temp);
        }
        // 预约场地
        List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
        for (SiteBooking siteBooking : siteBookings) {
            IncomeVO temp = new IncomeVO();
            if(siteBooking.getStatus()!=3){
                continue;
        if (operatorId!=null){
            if (siteBookingQuery.getStoreIds().size()==0){
            }else{
                List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
                for (SiteBooking siteBooking : siteBookings) {
                    IncomeVO temp = new IncomeVO();
                    if(siteBooking.getStatus()!=3){
                        continue;
                    }
                    temp.setInsertTime(siteBooking.getPayTime());
                    if (siteBooking.getPayMoney() != null) {
                        temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString()));
                    }
                    incomeVOS.add(temp);
                }
            }
            temp.setInsertTime(siteBooking.getPayTime());
            if (siteBooking.getPayMoney() != null) {
                temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString()));
            }
            incomeVOS.add(temp);

        }

        // 积分商品
        List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount();
        for (PointMerchandiseIncomeVo pointMerchandiseIncomeVo : amount) {