From 4b190272b172f277053b66aeff566afb7db4c714 Mon Sep 17 00:00:00 2001
From: chenkai <chenkai@legu.cc>
Date: Fri, 22 Dec 2023 10:11:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20remaining=20?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/event/payForDiamond/ApiCanReceive.ts | 2 +-
 src/api_s2c/event/payForDiamond/ApiReceive.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts
index b77fe24..a39596f 100644
--- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts
+++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts
@@ -8,7 +8,7 @@ export async function playerCanReceive(call: ApiCall) {
     if (!activityInfo) {
         return call.error('No such activity');
     }
-    const remaining = activityInfo.data['remaining'];
+    const remaining = typeof activityInfo.data['remaining'] === 'number'? activityInfo.data['remaining'] : activityInfo.data['totalmoney'];
     const zeroTime = PublicShared.getToDayZeroTime();
     const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime });
     if (!dayPayInfo || !dayPayInfo.payNum) {
diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts
index aaf8a56..bb1d00d 100644
--- a/src/api_s2c/event/payForDiamond/ApiReceive.ts
+++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts
@@ -66,7 +66,7 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
             });
         }
         const activityData = canReceiveResult.activityInfo.data;
-        const remaining = activityData['remaining']? activityData['remaining'] : activityData['totalmoney'];
+        const remaining = typeof activityData['remaining'] === 'number'? activityData['remaining'] : activityData['totalmoney'];
         const { group, maxAmount } = randomWithWeight(activityData['groupConf']['arr']);
         const gotAmount = calcDiamondGot(remaining, group, maxAmount);
         // 减去余额