From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 19 八月 2025 08:58:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java index ca07801..ed9a805 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TPayHuiminController.java @@ -163,6 +163,17 @@ @RequestMapping("/getStaticsData") @ResponseBody public ResultUtil<Map<String, BigDecimal>> getStaticsData(HuiminPayQuery query) { + Integer objectType = UserExt.getUser().getObjectType(); + if (objectType.equals(2)){ + //查询运营商 + TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>() + .eq("userId", UserExt.getUser().getId()) + .ne("state", 3) + .last("LIMIT 1")); + if (Objects.nonNull(operator)) { + query.setOperatorId(Long.valueOf(operator.getId())); + } + } Map<String, BigDecimal> map = new HashMap<>(); map.put("totalAmount",BigDecimal.ZERO); map.put("refundAmount",BigDecimal.ZERO); -- Gitblit v1.7.1