From 4e6d6711aa7bf432f053afc7888cea7848a46642 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Thu, 4 Feb 2021 10:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E9=80=9A=E7=9F=A5=E9=A2=91=E7=8E=87=EF=BC=8C=20?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=A0=E4=BA=AC=E8=B1=86=E4=B8=8D=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_jdzz.js     | 10 +++++++---
 jd_necklace.js |  2 +-
 jd_sgmh.js     |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jd_jdzz.js b/jd_jdzz.js
index 4701029c..d6b78c55 100644
--- a/jd_jdzz.js
+++ b/jd_jdzz.js
@@ -135,10 +135,14 @@ async function jdWish() {
 function showMsg() {
   return new Promise(async resolve => {
     message += `本次获得${parseInt($.totalBeanNum) - $.nowBean}京豆，${parseInt($.totalNum) - $.nowNum}金币\n`
-    message += `累计获得${$.totalBeanNum}京豆，${$.totalNum}金币\n`
-    $.msg($.name, '', `京东账号${$.index} ${$.nickName}\n${message}`);
+    message += `累计获得${$.totalBeanNum}京豆，${$.totalNum}金币\n可兑换${$.totalNum / 10000}元无门槛红包`
+    if (parseInt($.totalBeanNum) - $.nowBean > 0) {
+      $.msg($.name, '', `京东账号${$.index} ${$.nickName}\n${message}`);
+    } else {
+      $.log(message)
+    }
     // 云端大于10元无门槛红包时进行通知推送
-    if ($.isNode() && $.totalScore >= 10000) await notify.sendNotify(`${$.name} - 京东账号${$.index} - ${$.nickName}`, `京东账号${$.index} ${$.nickName}\n当前金币：${$.totalScore}个\n可兑换无门槛红包：${parseInt($.totalNum) / 1000}元\n`,)
+    if ($.isNode() && $.totalNum >= 100000) await notify.sendNotify(`${$.name} - 京东账号${$.index} - ${$.nickName}`, `京东账号${$.index} ${$.nickName}\n当前金币：${$.totalNum}个\n可兑换无门槛红包：${parseInt($.totalNum) / 10000}元\n`,)
     resolve();
   })
 }
diff --git a/jd_necklace.js b/jd_necklace.js
index 75702267..f0123f47 100644
--- a/jd_necklace.js
+++ b/jd_necklace.js
@@ -96,7 +96,7 @@ async function jd_necklace() {
 function showMsg() {
   return new Promise(async resolve => {
     let nowTimes = new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000);
-    if (nowTimes.getHours() >= 20) {
+    if (nowTimes.getHours() >= 20 && $.totalScore >= 10000) {
       $.msg($.name, '', `京东账号${$.index} ${$.nickName}\n当前${$.name}：${$.totalScore}个\n可兑换无门槛红包：${$.totalScore / 1000}元\n点击弹窗即可去兑换(注：此红包具有时效性)`, { 'open-url': openUrl});
     }
     // 云端大于10元无门槛红包时进行通知推送
diff --git a/jd_sgmh.js b/jd_sgmh.js
index f87f8531..de98502c 100644
--- a/jd_sgmh.js
+++ b/jd_sgmh.js
@@ -262,7 +262,8 @@ function interact_template_getLotteryResult(taskId,timeout = 0) {
 function showMsg() {
   message += `任务已完成，本次运行获得京豆${$.beans}`
   return new Promise(resolve => {
-    $.msg($.name, '', `【京东账号${$.index}】${$.nickName}\n${message}`);
+    if ($.beans) $.msg($.name, '', `【京东账号${$.index}】${$.nickName}\n${message}`);
+    $.log(`【京东账号${$.index}】${$.nickName}\n${message}`);
     resolve()
   })
 }