From e49861bcaf749f0e33cb6e77146223cc7bd74531 Mon Sep 17 00:00:00 2001
From: xcy <871622040@qq.com>
Date: Sat, 23 Dec 2023 00:44:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/email/ApiAllRemove.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api_s2c/email/ApiAllRemove.ts b/src/api_s2c/email/ApiAllRemove.ts
index d27b610..220bed2 100644
--- a/src/api_s2c/email/ApiAllRemove.ts
+++ b/src/api_s2c/email/ApiAllRemove.ts
@@ -5,7 +5,7 @@ import { ReqAllRemove, ResAllRemove } from "../../shared/protocols/email/PtlAllR
 export default async function (call: ApiCall<ReqAllRemove, ResAllRemove>) {
     // 筛选出没有奖励已读邮件和已经领取过奖励的邮件
     let emailList = (await EmailFun.getAllEmail(call.uid, true)).filter(email => (
-        (email.emailRead && email.prizeData.prize.length <= 0) || email.prizeData.isGet
+        (email.emailRead && email.prizeData?.prize.length <= 0) || email.prizeData.isGet
     ));
 
     if (emailList.length < 1) return call.error(globalThis.lng.email_2);

From d37774d54f123e29b4907f211145a566690d4f43 Mon Sep 17 00:00:00 2001
From: dy <askjjdk@153.com>
Date: Sat, 23 Dec 2023 01:08:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20json=E9=85=8D=E7=BD=AE=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json/shopItem.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/json/shopItem.json b/src/json/shopItem.json
index 42ead51..eade77b 100644
--- a/src/json/shopItem.json
+++ b/src/json/shopItem.json
@@ -6407,11 +6407,11 @@
   "10006": [
     {
       "id": 10006,
-      "a": "attr",
-      "t": "jinbi",
-      "n": 1000000,
+      "a": "item",
+      "t": 37,
+      "n": 1,
       "p": 1,
-      "colour": 3,
+      "colour": 4,
       "buyNum": -1,
       "openDay": 1,
       "buyNeed": [

From 862052e8271ae918477da57445077e1d71b913f2 Mon Sep 17 00:00:00 2001
From: xcy <871622040@qq.com>
Date: Sat, 23 Dec 2023 01:11:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/email/ApiAllReceive.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api_s2c/email/ApiAllReceive.ts b/src/api_s2c/email/ApiAllReceive.ts
index 571b4b4..829f9ac 100644
--- a/src/api_s2c/email/ApiAllReceive.ts
+++ b/src/api_s2c/email/ApiAllReceive.ts
@@ -6,7 +6,7 @@ import {ReqAllReceive, ResAllReceive} from "../../shared/protocols/email/PtlAllR
 export default async function (call: ApiCall<ReqAllReceive, ResAllReceive>) {
     // 筛选出有奖励并且未领取的邮件
     let emailList = (await EmailFun.getAllEmail(call.uid, false)).filter(email => (
-        email.prizeData.prize.length > 0 && !email.prizeData?.isGet
+        email.prizeData?.prize.length > 0 && !email.prizeData?.isGet
     ));
 
     if (emailList.length < 1) return call.error(globalThis.lng.email_1);

From f8298f08e9064435d4fb5e4d9270fa6482816e9c Mon Sep 17 00:00:00 2001
From: xcy <871622040@qq.com>
Date: Sat, 23 Dec 2023 01:35:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api_s2c/email/ApiAllRemove.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api_s2c/email/ApiAllRemove.ts b/src/api_s2c/email/ApiAllRemove.ts
index 220bed2..e2d9bbd 100644
--- a/src/api_s2c/email/ApiAllRemove.ts
+++ b/src/api_s2c/email/ApiAllRemove.ts
@@ -3,9 +3,9 @@ import { EmailFun } from '../../public/email';
 import { ReqAllRemove, ResAllRemove } from "../../shared/protocols/email/PtlAllRemove";
 
 export default async function (call: ApiCall<ReqAllRemove, ResAllRemove>) {
-    // 筛选出没有奖励已读邮件和已经领取过奖励的邮件
+    //  邮件已读 并且 (没有奖励 或者 (有奖励 并且 领取了))
     let emailList = (await EmailFun.getAllEmail(call.uid, true)).filter(email => (
-        (email.emailRead && email.prizeData?.prize.length <= 0) || email.prizeData.isGet
+        email.emailRead && (!email.prizeData || (email.prizeData?.prize.length > 0 && email.prizeData?.isGet))
     ));
 
     if (emailList.length < 1) return call.error(globalThis.lng.email_2);