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


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




    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;


        }


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


        }




        // 积分商品


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


        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);


        for (PointMerchandiseIncomeVo pointMerchandiseIncomeVo : amount) {


            IncomeVO temp = new IncomeVO();


            if (pointMerchandiseIncomeVo==null) continue;


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


    @RequestMapping(value = "/backStore")


    @ResponseBody


    public Object backStore(Integer id) {


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


        id = resolveStoreId(id);


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


        //课程


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


        //场地


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


    @RequestMapping(value = "/stuStores")


    @ResponseBody


    public Object stuStores(Integer id) {


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


        id = resolveStoreId(id);


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


        //课程


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


        //场地


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


    @RequestMapping(value = "/courseStore")


    @ResponseBody


    public Object courseStore(Integer id) {


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


        id = resolveStoreId(id);


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


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


        return map;


    }


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


    @RequestMapping(value = "/userAndVipStore")


    @ResponseBody


    public Object userAndVipStore(Integer id) {


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


        id = resolveStoreId(id);


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


        //课程


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


        //场地


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


    @RequestMapping(value = "/actStore")


    @ResponseBody


    public Object actStore(Integer id) {


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


        id = resolveStoreId(id);


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


        //课程


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


        //场地


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


    @RequestMapping("/selectStore")


    public Object selectStore(Integer id,String time) {


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


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


        id = resolveStoreId(id);


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


        //课程


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


        //场地


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


    @ResponseBody


    public Object stuUserDataStore(Integer id) {




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


        id = resolveStoreId(id);


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


        //课程


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


        //场地


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


    @RequestMapping("/selectStoreJx")


    @ResponseBody


    public Object selectStoreJx(Integer id) {


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


        id = resolveStoreId(id);


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


        //课程


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


        //场地