update

longz

2026-07-02 c05a63acc60e4978ae47be779824ec0055069381

update

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

@@ -53,6 +53,27 @@
@RequestMapping("/data")
public class DataStatisticsController extends BaseController {
    private String PREFIX = "/system/dataStatistics/";

    private Integer resolveOperatorId(Integer operatorId) {
        Integer objectType = UserExt.getUser().getObjectType();
        if (Integer.valueOf(2).equals(objectType)) {
            return UserExt.getUser().getObjectId();
        }
        return operatorId;
    }

    private Integer resolveStoreId(Integer storeId) {
        Integer objectType = UserExt.getUser().getObjectType();
        if (!Integer.valueOf(2).equals(objectType) || storeId == null) {
            return storeId;
        }
        TStore store = storeService.getById(storeId);
        if (store != null && UserExt.getUser().getObjectId().equals(store.getOperatorId())) {
            return storeId;
        }
        return null;
    }

    @Autowired
    private ICityService cityService;
    @Resource
@@ -115,6 +136,8 @@
    @RequestMapping(value = "/getIncomeData")
    @ResponseBody
    public Object getIncomeData(Integer operatorId,Integer storeId) {
        operatorId = resolveOperatorId(operatorId);
        storeId = resolveStoreId(storeId);
        // 报名课程查询query
        RegisterOrderQuery query = new RegisterOrderQuery();
        // 充值记录查询query
@@ -653,6 +676,7 @@
    @RequestMapping(value = "/backYys")
    @ResponseBody
    public Object backYys(Integer id) {
        id = resolveOperatorId(id);
        HashMap<String, Object> map = new HashMap<>();
        List<Integer> userPt = appUserClient.getUserYYs(id);
        if(userPt.size()==0){
@@ -886,6 +910,7 @@
    @RequestMapping(value = "/stuYys")
    @ResponseBody
    public Object stuYys(Integer id) {
        id = resolveOperatorId(id);
        List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
        List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
        //课程
@@ -933,6 +958,7 @@
    @RequestMapping(value = "/courseYys")
    @ResponseBody
    public Object courseYys(Integer id) {
        id = resolveOperatorId(id);
        List<Integer> userPt = appUserClient.getUserYYs(id);
        HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);
        return map;
@@ -949,6 +975,7 @@
    @RequestMapping(value = "/userAndVipYys")
    @ResponseBody
    public Object userAndVipYys(Integer id) {
        id = resolveOperatorId(id);
        List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
        List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
        //课程
@@ -1013,6 +1040,7 @@
    @RequestMapping(value = "/actYys")
    @ResponseBody
    public Object actYys(Integer id) {
        id = resolveOperatorId(id);
        CompetionVO competionVO = new CompetionVO();
        List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
        List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
@@ -1117,6 +1145,7 @@
    @ResponseBody
    @RequestMapping("/selectYys")
    public Object selectYys(Integer id,String time) {
        id = resolveOperatorId(id);
        HashMap<String, Object> map = new HashMap<>();
        // 找出平台的用户
//        List<User> list = sysUserService.list(new LambdaQueryWrapper<User>().eq(User::getObjectType, 2));
@@ -1495,6 +1524,7 @@
    @RequestMapping("/stuUserDataYys")
    @ResponseBody
    public Object stuUserDataYys(Integer id) {
        id = resolveOperatorId(id);
        List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
        List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
        //课程
@@ -1533,6 +1563,7 @@
    @RequestMapping("/selectYysJx")
    @ResponseBody
    public Object selectYysJx(Integer id) {
        id = resolveOperatorId(id);
        List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
        List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
        //课程

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html

@@ -269,6 +269,14 @@

    var weekX = ["1周","2周","3周","4周"];
    var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];

    function currentOperatorId() {
        if ($("#objectType").val() == 2) {
            return $("#objectId").val();
        }
        return $("#cCode").val();
    }

    function oneChangeNext(e){
        var oneId=$(e).val();
        var ajax = new $ax(Feng.ctxPath + "/tCity/onChange", function(data){
@@ -316,7 +324,7 @@
        }
    }
    function income(){
        var id = $("#cCode").val()
        var id = currentOperatorId()
        var beginTime = $("#beginTime").val()
        console.log(id)
        if(id==""){
@@ -820,7 +828,7 @@

    }
    function srtj() {
        var id = $("#cCode").val()
        var id = currentOperatorId()
        var beginTime = $("#beginTime").val()
        console.log(id)
        if(id==""){
@@ -949,18 +957,14 @@
        }, function (data) {

        });
        if($("#objectType").val()==2){
            ajax.set("id",$("#objectId").val())
        }else {
            ajax.set("id", id)
        }
        ajax.set("id", id)
        ajax.set("time",beginTime);
        ajax.start();

    }

    function jxtj()     {
        var id = $("#cCode").val()
        var id = currentOperatorId()
        console.log(id,333)
        if(id==""){
            Feng.info("请先选择运营商");
@@ -1181,7 +1185,7 @@
        myChart7.setOption(option7);
    }
    function yytj() {
        let id  = $("#cCode").val()
        let id  = currentOperatorId()
        console.log(id)
        if(id==''){
            Feng.info("请先选择运营商");
@@ -1412,7 +1416,7 @@
    }
    function tuifei() {
        var myChart1 = echarts.init(document.getElementById('refund'));
        let id  = $("#cCode").val()
        let id  = currentOperatorId()
        console.log(id)
        if(id==''){
            Feng.info("请先选择运营商");
@@ -1529,7 +1533,7 @@
            }
            myChart2.setOption(options, true)
        });
        let id  = $("#cCode").val()
        let id  = currentOperatorId()
        console.log(id)
        if(id==''){
            Feng.info("请先选择运营商");
@@ -1714,7 +1718,7 @@
            }
            myChart5.setOption(options, true)
        });
        let id  = $("#cCode").val()
        let id  = currentOperatorId()
        console.log(id)
        if(id==''){
            Feng.info("请先选择运营商");