合并代码

无关风月

2025-01-21 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db

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

@@ -143,6 +143,13 @@
        integralGoodsOfSearch.setPage(page);
        integralGoodsOfSearch.setObjType(UserExt.getUser().getObjectType());
        integralGoodsOfSearch.setObjId(UserExt.getUser().getObjectId());
        if (UserExt.getUser().getObjectType()==2){
            // 查询这个运营商下的所有门店
            List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", UserExt.getUser().getObjectId())).stream().map(TStore::getId)
                    .collect(Collectors.toList());
            integralGoodsOfSearch.setStoreIds(operatorId);
        }
        return pointMercharsClient.ticketList(integralGoodsOfSearch);
    }