From 400084bbaa2286f364ab9c1032fd5783a48a8c44 Mon Sep 17 00:00:00 2001 From: Yixian Date: Fri, 12 Nov 2021 18:13:14 +0800 Subject: [PATCH] =?UTF-8?q?hotfix:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/analysis/core/impls/DashboardServiceImpl.java | 1 - src/main/ui/static/dashboard/dashboard.js | 2 -- src/main/ui/static/dashboard/templates/dashboard.html | 6 ++---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index bfeed2463..9d7dc7f86 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -114,7 +114,6 @@ public class DashboardServiceImpl implements DashboardService, DashboardAnalysis if (params.getDate("end").after(new Date())) { if (params.getDate("begin").compareTo(DateUtils.addDays(params.getDate("end"), -1)) == 0) { res.put("total_customers", transactionAnalysisMapper.countCustomers(params)); - res.put("old_customers", transactionAnalysisMapper.countOldCustomers(params)); res.put("traded_partners", clientAnalysisMapper.countTradedPartners(params)); } else { res = getYesOrLasMonth(params); diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js index 5eb574c10..215b47411 100644 --- a/src/main/ui/static/dashboard/dashboard.js +++ b/src/main/ui/static/dashboard/dashboard.js @@ -139,8 +139,6 @@ define(['angular', 'uiRouter', 'jstz', 'uiBootstrap', 'angularEcharts'], functio $scope.analysis.traded_partners = resp.data.traded_partners; $scope.analysis.total_customers = resp.data.total_customers; - $scope.analysis.new_customers = resp.data.total_customers - resp.data.old_customers; - $scope.analysis.old_customers = resp.data.old_customers; }); $http.get('/dashboard/system/common_analysis_4', {params: $scope.currentScale.params()}).then(function (resp) { diff --git a/src/main/ui/static/dashboard/templates/dashboard.html b/src/main/ui/static/dashboard/templates/dashboard.html index a548a0776..a1044dcf3 100644 --- a/src/main/ui/static/dashboard/templates/dashboard.html +++ b/src/main/ui/static/dashboard/templates/dashboard.html @@ -233,11 +233,9 @@

- / - / - +

-

总消费人数/新客户/老客户

+

总消费人数