From c304a6d8cc9535748c688fa7397386a708a6c97e Mon Sep 17 00:00:00 2001
From: chenkai <chenkai@legu.cc>
Date: Fri, 22 Dec 2023 21:23:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=B2=E9=A2=86=E5=8F=96=E7=9A=84?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E6=B7=BB=E5=8A=A0gotAmount=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/event/payForDiamond/ApiCanReceive.ts          | 6 +++---
 src/shared/protocols/event/payForDiamond/PtlCanReceive.ts | 2 +-
 src/shared/protocols/serviceProto.ts                      | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts
index 5d16d02..77e0fa9 100644
--- a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts
+++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts
@@ -36,14 +36,14 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true
     const price = activityInfo.data['price'];
     if (!vipScore) {
         return {
-            payNum: 0, remaining, result: false, activityInfo, showOffList, price
+            payNum: 0, remaining, result: false, activityInfo, showOffList, price, gotAmount: 0
         };
     }
     const payNum = vipScore;
     // 玩家充值未达标或者奖池余额耗尽则不能领取
     if (payNum < price || remaining <= 0) {
         return {
-            payNum, remaining, result: false, activityInfo, showOffList, price
+            payNum, remaining, result: false, activityInfo, showOffList, price, gotAmount: 0
         }
     }
     // 检查玩家今日是否已经领取
@@ -56,7 +56,7 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true
         }
     }
     return {
-        payNum, remaining, result: true, activityInfo, showOffList, price
+        payNum, remaining, result: true, activityInfo, showOffList, price, gotAmount: 0
     };
 }
 
diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts
index 2560773..99ec132 100644
--- a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts
+++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts
@@ -8,5 +8,5 @@ export type ResCanReceive = {
     result: boolean;
     price: number;
     showOffList: any[];
-    gotAmount?: number;
+    gotAmount: number;
 };
\ No newline at end of file
diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts
index c99c096..945d070 100644
--- a/src/shared/protocols/serviceProto.ts
+++ b/src/shared/protocols/serviceProto.ts
@@ -10165,8 +10165,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "name": "gotAmount",
                     "type": {
                         "type": "Number"
-                    },
-                    "optional": true
+                    }
                 }
             ]
         },