From cd4b4cd3228a95fcc827ddfdccaf3949d2546a7c Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Mon, 16 Oct 2023 22:03:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=9AReview=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/statistics/member.ts                    | 10 +++++-----
 src/api/mall/statistics/pay.ts                       |  8 +++++++-
 src/api/mall/statistics/trade.ts                     |  2 +-
 src/views/mall/home/components/OperationDataCard.vue |  3 ++-
 src/views/mall/home/index.vue                        |  4 ++--
 src/views/mall/statistics/trade/index.vue            |  6 +++---
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/api/mall/statistics/member.ts b/src/api/mall/statistics/member.ts
index 28d5a78c..92af031e 100644
--- a/src/api/mall/statistics/member.ts
+++ b/src/api/mall/statistics/member.ts
@@ -58,8 +58,8 @@ export interface MemberTerminalStatisticsRespVO {
 export interface MemberCountRespVO {
   /** 用户访问量 */
   visitUserCount: string
-  /** 新增用户数量 */
-  createUserCount: number
+  /** 注册用户数量 */
+  registerUserCount: number
 }
 
 /** 会员注册数量 Response VO */
@@ -86,21 +86,21 @@ export const getMemberAnalyse = (params: MemberAnalyseReqVO) => {
 // 按照省份，查询会员统计列表
 export const getMemberAreaStatisticsList = () => {
   return request.get<MemberAreaStatisticsRespVO[]>({
-    url: '/statistics/member/get-area-statistics-list'
+    url: '/statistics/member/area-statistics-list'
   })
 }
 
 // 按照性别，查询会员统计列表
 export const getMemberSexStatisticsList = () => {
   return request.get<MemberSexStatisticsRespVO[]>({
-    url: '/statistics/member/get-sex-statistics-list'
+    url: '/statistics/member/sex-statistics-list'
   })
 }
 
 // 按照终端，查询会员统计列表
 export const getMemberTerminalStatisticsList = () => {
   return request.get<MemberTerminalStatisticsRespVO[]>({
-    url: '/statistics/member/get-terminal-statistics-list'
+    url: '/statistics/member/terminal-statistics-list'
   })
 }
 
diff --git a/src/api/mall/statistics/pay.ts b/src/api/mall/statistics/pay.ts
index 1593f38d..f5d14c9d 100644
--- a/src/api/mall/statistics/pay.ts
+++ b/src/api/mall/statistics/pay.ts
@@ -1,6 +1,12 @@
 import request from '@/config/axios'
 
+/** 支付统计 */
+export interface PaySummaryRespVO {
+  /** 充值金额，单位分 */
+  rechargePrice: number
+}
+
 /** 获取钱包充值金额 */
 export const getWalletRechargePrice = async () => {
-  return await request.get<number>({ url: `/statistics/pay/wallet-recharge-price` })
+  return await request.get<PaySummaryRespVO>({ url: `/statistics/pay/summary` })
 }
diff --git a/src/api/mall/statistics/trade.ts b/src/api/mall/statistics/trade.ts
index ef2a2b2b..5e620a6e 100644
--- a/src/api/mall/statistics/trade.ts
+++ b/src/api/mall/statistics/trade.ts
@@ -25,7 +25,7 @@ export interface TradeTrendSummaryRespVO {
   expensePrice: number
   orderWalletPayPrice: number
   brokerageSettlementPrice: number
-  orderRefundPrice: number
+  afterSaleRefundPrice: number
 }
 
 /** 交易订单数量 Response VO */
diff --git a/src/views/mall/home/components/OperationDataCard.vue b/src/views/mall/home/components/OperationDataCard.vue
index cae09a3e..3efac9bf 100644
--- a/src/views/mall/home/components/OperationDataCard.vue
+++ b/src/views/mall/home/components/OperationDataCard.vue
@@ -70,7 +70,8 @@ const getProductData = async () => {
 
 /** 查询钱包充值数据 */
 const getWalletRechargeData = async () => {
-  data.rechargePrice.value = await PayStatisticsApi.getWalletRechargePrice()
+  const paySummary = await PayStatisticsApi.getWalletRechargePrice();
+  data.rechargePrice.value = paySummary.rechargePrice
 }
 
 /**
diff --git a/src/views/mall/home/index.vue b/src/views/mall/home/index.vue
index ede05bff..feaa46a9 100644
--- a/src/views/mall/home/index.vue
+++ b/src/views/mall/home/index.vue
@@ -32,8 +32,8 @@
         <ComparisonCard
           tag="今日"
           title="新增用户"
-          :value="userComparison?.value?.createUserCount || 0"
-          :reference="userComparison?.reference?.createUserCount || 0"
+          :value="userComparison?.value?.registerUserCount || 0"
+          :reference="userComparison?.reference?.registerUserCount || 0"
         />
       </el-col>
     </el-row>
diff --git a/src/views/mall/statistics/trade/index.vue b/src/views/mall/statistics/trade/index.vue
index b7dfc667..744bcd1e 100644
--- a/src/views/mall/statistics/trade/index.vue
+++ b/src/views/mall/statistics/trade/index.vue
@@ -192,11 +192,11 @@
             icon-bg-color="text-blue-500"
             prefix="￥"
             :decimals="2"
-            :value="fenToYuan(trendSummary?.value?.orderRefundPrice || 0)"
+            :value="fenToYuan(trendSummary?.value?.afterSaleRefundPrice || 0)"
             :percent="
               calculateRelativeRate(
-                trendSummary?.value?.orderRefundPrice,
-                trendSummary?.reference?.orderRefundPrice
+                trendSummary?.value?.afterSaleRefundPrice,
+                trendSummary?.reference?.afterSaleRefundPrice
               )
             "
           />