From 328ba81892349e09d21c4806298c1d7db27298e9 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期五, 18 九月 2026 13:53:29 +0800
Subject: [PATCH] bug：统计数据修改

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
index b991950..3e88fa6 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
@@ -130,10 +130,12 @@
                                 <div class="col-sm-10" style="width: 1500px" >
                                     </br>
                                     </br>
+                                    <span>会员费收入:<label id="fee1">0.0</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <span>玩湃币充值收入:<label id="fee2">0.0</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     <span>课程收入:<label id="fee3">0.0</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     <span>活动/赛事收入:<label id="fee4">0.0</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     <span>订场收入:<label id="fee5">0.0</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <span>商品收入:<label id="fee7">0.0</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <span>商品/其他收入:<label id="fee7">0.0</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     </br>
                                     </br>
                                     </br>
@@ -337,6 +339,13 @@
             $("#netIncomeAmount").text(resp.incomeStatistics.netIncomeAmount || 0);
             $("#couponDeductionAmount").text(resp.incomeStatistics.couponDeductionAmount || 0);
             $("#refundAmount").text(resp.incomeStatistics.refundAmount || 0);
+            var incomeTypeNet = resp.incomeTypeNet || {};
+            $("#fee1").text(incomeTypeNet[1] || 0);
+            $("#fee2").text(incomeTypeNet[2] || 0);
+            $("#fee3").text(incomeTypeNet[3] || 0);
+            $("#fee4").text(incomeTypeNet[4] || 0);
+            $("#fee5").text(incomeTypeNet[5] || 0);
+            $("#fee7").text(incomeTypeNet[6] || 0);
             renderIncomeStatisticsList("yearIncomeStatistics", "历年营收明细", resp.yearLabels, resp.yearIncomeStatistics);
             renderIncomeStatisticsList("monthIncomeStatistics", "本年各月营收明细", resp.monthLabels, resp.monthIncomeStatistics);
             renderIncomeStatisticsList("weekIncomeStatistics", "近四周营收明细", resp.weekLabels, resp.weekIncomeStatistics);
@@ -348,6 +357,7 @@
         });
         ajax.set("type", 1);
         ajax.set("storeId", $("#objectType").val() == 3 ? $("#objectId").val() : $("#cCode").val());
+        ajax.set("time", $("#beginTime").val());
         ajax.start();
     }
 
@@ -364,10 +374,6 @@
         }
         var ajax = new $ax(Feng.ctxPath + "/data/selectStore", function (data) {
 
-            $("#fee3").text(data.fee3)
-            $("#fee4").text(data.fee4)
-            $("#fee5").text(data.fee5)
-            $("#fee7").text(data.fee7)
             $("#day").val(data.dayone)
             $("#month").val(data.monthone)
             $("#quarter").val(data.quarterone)

--
Gitblit v1.7.1