From fa8d26aa33254ab93e1109c9b4f712ca9305342c Mon Sep 17 00:00:00 2001
From: any <any@gmail.com>
Date: Wed, 23 Dec 2020 23:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E9=A2=86?=
 =?UTF-8?q?=E5=8F=96=E5=8A=A9=E5=8A=9B=E4=BB=BB=E5=8A=A1=E5=A5=96=E5=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_crazy_joy.js | 54 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/jd_crazy_joy.js b/jd_crazy_joy.js
index 2e746db6..96043c86 100644
--- a/jd_crazy_joy.js
+++ b/jd_crazy_joy.js
@@ -194,11 +194,14 @@ if ($.isNode()) {
         }
         continue
       }
+      await shareCodesFormat()
       await jdCrazyJoy()
     }
   }
+
   if (helpSelf) {
     console.log(`开始循环助力`)
+    // 助力
     for (let i = 0; i < cookiesArr.length; i++) {
       if (cookiesArr[i]) {
         cookie = cookiesArr[i];
@@ -222,6 +225,29 @@ if ($.isNode()) {
         await helpFriends()
       }
     }
+    // 领取任务奖励
+    for (let i = 0; i < cookiesArr.length; i++) {
+      if (cookiesArr[i]) {
+        cookie = cookiesArr[i];
+        $.UserName = decodeURIComponent(cookie.match(/pt_pin=(.+?);/) && cookie.match(/pt_pin=(.+?);/)[1])
+        $.index = i + 1;
+        $.isLogin = true;
+        $.nickName = '';
+        await TotalBean();
+        console.log(`\n开始【京东账号${$.index}】${$.nickName || $.UserName}\n`);
+        if (!$.isLogin) {
+          $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/`, {"open-url": "https://bean.m.jd.com/"});
+
+          if ($.isNode()) {
+            await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`);
+          } else {
+            $.setdata('', `CookieJD${i ? i + 1 : ""}`);//cookie失效，故清空cookie。$.setdata('', `CookieJD${i ? i + 1 : "" }`);//cookie失效，故清空cookie。
+          }
+          continue
+        }
+        await doTasks()
+      }
+    }
   }
 })()
   .catch((e) => {
@@ -236,17 +262,9 @@ async function jdCrazyJoy() {
   $.bean = 0
   await getUserInfo($.nextCode)
   await doSign()
-  // await helpFriends()
-  await getTaskInfo()
-  for (let j = 0; j < $.taskList.length; ++j) {
-    let task = $.taskList[j]
-    if (task.status === 0)
-      for (let i = task.doneTimes; i < task.ext.count; ++i) {
-        await doTask(task.taskId)
-      }
-    if (task.status === 2)
-      await awardTask(task.taskId)
-  }
+  // 帮助作者
+  await helpFriends()
+  await doTasks()
   await getCoin()
   await getUserBean()
   console.log(`当前信息：${$.bean} 京豆，${$.coin} 金币`)
@@ -256,6 +274,18 @@ async function jdCrazyJoy() {
     await doApplyJdBean(applyJdBean)
   }
 }
+async function doTasks() {
+  await getTaskInfo()
+  for (let j = 0; j < $.taskList.length; ++j) {
+    let task = $.taskList[j]
+    if (task.status === 0 && task.taskTypeId === 103)
+      for (let i = task.doneTimes; i < task.ext.count; ++i) {
+        await doTask(task.taskId)
+      }
+    if (task.status === 2)
+      await awardTask(task.taskId)
+  }
+}
 function doApplyJdBean(bean = 1000) {
   // 兑换京豆
   let body = {"paramData":{"bean":bean}}
@@ -333,7 +363,7 @@ function getTaskInfo() {
           if (safeGet(data)) {
             data = JSON.parse(data);
             if (data.success && data.data && data.data.length) {
-              $.taskList = data.data.filter(vo => vo.taskTypeId === 103)
+              $.taskList = data.data
             } else {
               console.log(`任务信息获取失败`)
             }