玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liujie
2026-07-02 83e8981accbc513b287184ca4094a50b5e5299ca 
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java


@@ -64,9 +64,6 @@




    private Integer resolveStoreId(Integer storeId) {


        Integer objectType = UserExt.getUser().getObjectType();


        if (Integer.valueOf(3).equals(objectType)) {


            return UserExt.getUser().getObjectId();


        }


        if (!Integer.valueOf(2).equals(objectType) || storeId == null) {


            return storeId;


        }


@@ -276,16 +273,7 @@


        }




        // 积分商品


        List<Integer> pointMerchandiseStoreIds = Collections.emptyList();


        if (storeId != null) {


            pointMerchandiseStoreIds = Collections.singletonList(storeId);


        } else if (operatorId != null) {


            pointMerchandiseStoreIds = storeIds;


            if (pointMerchandiseStoreIds.size() == 0) {


                pointMerchandiseStoreIds = Collections.singletonList(-1);


            }


        }


        List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount(pointMerchandiseStoreIds);


        List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount(cityManagerId);


        for (PointMerchandiseIncomeVo pointMerchandiseIncomeVo : amount) {


            IncomeVO temp = new IncomeVO();


            if (pointMerchandiseIncomeVo==null) continue;


@@ -808,8 +796,7 @@


    @RequestMapping(value = "/backStore")


    @ResponseBody


    public Object backStore(Integer id) {


        id = resolveStoreId(id);


        List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);


        List<Integer> collect1 = Arrays.asList(id);


        //课程


        List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);


        //场地


@@ -958,8 +945,7 @@


    @RequestMapping(value = "/stuStores")


    @ResponseBody


    public Object stuStores(Integer id) {


        id = resolveStoreId(id);


        List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);


        List<Integer> collect1 = Arrays.asList(id);


        //课程


        List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);


        //场地


@@ -996,8 +982,7 @@


    @RequestMapping(value = "/courseStore")


    @ResponseBody


    public Object courseStore(Integer id) {


        id = resolveStoreId(id);


        List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(id == null ? -1 : id));


        List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(id));


        HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);


        return map;


    }


@@ -1025,8 +1010,7 @@


    @RequestMapping(value = "/userAndVipStore")


    @ResponseBody


    public Object userAndVipStore(Integer id) {


        id = resolveStoreId(id);


        List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);


        List<Integer> collect1 = Arrays.asList(id);


        //课程


        List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);


        //场地


@@ -1116,8 +1100,7 @@


    @RequestMapping(value = "/actStore")


    @ResponseBody


    public Object actStore(Integer id) {


        id = resolveStoreId(id);


        List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);


        List<Integer> collect1 = Arrays.asList(id);


        //课程


        List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);


        //场地


@@ -1286,8 +1269,7 @@


    @RequestMapping("/selectStore")


    public Object selectStore(Integer id,String time) {


        HashMap<String, Object> map = new HashMap<>();


        id = resolveStoreId(id);


        List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);


        List<Integer> collect1 = Arrays.asList(id);


        //课程


        List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);


        //场地


@@ -1578,8 +1560,7 @@


    @ResponseBody


    public Object stuUserDataStore(Integer id) {




        id = resolveStoreId(id);


        List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);


        List<Integer> collect1 = Arrays.asList(id);


        //课程


        List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);


        //场地


@@ -1632,8 +1613,7 @@


    @RequestMapping("/selectStoreJx")


    @ResponseBody


    public Object selectStoreJx(Integer id) {


        id = resolveStoreId(id);


        List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);


        List<Integer> collect1 = Arrays.asList(id);


        //课程


        List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);


        //场地