update

liujie

2026-07-02 055bb95f76e7e15cb1cbd5f9b7fe79b41eb30e5e

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

@@ -136,8 +136,19 @@
    @RequestMapping(value = "/getIncomeData")
    @ResponseBody
    public Object getIncomeData(Integer operatorId,Integer storeId) {
        operatorId = resolveOperatorId(operatorId);
        storeId = resolveStoreId(storeId);
//        operatorId = resolveOperatorId(operatorId);
//        storeId = resolveStoreId(operatorId);
        Integer objectId = UserExt.getUser().getObjectId();
        List<Integer> cityManagerId= new ArrayList<>();
        if(objectId>0){
            operatorId=objectId;
            if(storeId==null){
                cityManagerId= storeService.list(new QueryWrapper<TStore>().eq("cityManagerId", objectId)).stream().map(TStore::getId).collect(Collectors.toList());
            }else {
                cityManagerId.add(storeId);
            }

        }
        // 报名课程查询query
        RegisterOrderQuery query = new RegisterOrderQuery();
        // 充值记录查询query
@@ -164,7 +175,11 @@
            }
        }else {
            List<Integer> list = new ArrayList<>();


            list.add(storeId);


            query.setStoresIds(list);
            siteBookingQuery.setStoreIds(list);
            competitionQuery.setStoreId(storeId);
@@ -258,7 +273,7 @@
        }

        // 积分商品
        List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount();
        List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount(cityManagerId);
        for (PointMerchandiseIncomeVo pointMerchandiseIncomeVo : amount) {
            IncomeVO temp = new IncomeVO();
            if (pointMerchandiseIncomeVo==null) continue;
@@ -1056,8 +1071,9 @@
        //门票


        competionVO.setIds(list);
        competionVO.setIds(list2);
        competionVO.setOperatorId(id);
        competionVO.setStoreIds(collect1);
        HashMap<String, Object> map = competitionClient.actYys(competionVO);

        List<TStore> lists = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId, id));