jd_blueCoin.js脚本已改为默认兑换20京豆(之前是默认不兑换)

jd_blueCoin.js

@@ -1,7 +1,7 @@
 /*
 京小超兑换奖品 脚本地址：https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_blueCoin.js
 感谢@yangtingxiao提供PR
-更新时间：2020-11-05
+更新时间：2020-11-22
 支持京东多个账号
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
 ======================quantumultx===============
@@ -18,7 +18,7 @@ const $ = new Env('京小超兑换奖品');
 const notify = $.isNode() ? require('./sendNotify') : '';
 //Node.js用户请在jdCookie.js处填写京东ck;
 const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
-let coinToBeans = $.getdata('coinToBeans') || 0; //兑换多少数量的京豆（20或者1000），0默认兑换不兑换，如需兑换把0改成20或者1000，或者'商品名称'(商品名称放到单引号内)即可
+let coinToBeans = $.getdata('coinToBeans') || 20; //兑换多少数量的京豆（20或者1000），0表示不兑换，默认兑换20京豆，如需兑换把0改成20或者1000，或者'商品名称'(商品名称放到单引号内)即可
 let jdNotify = false;//是否开启静默运行，默认false关闭(即:奖品兑换成功后会发出通知提示)
 //IOS等用户直接用NobyDa的jd cookie
 let cookiesArr = [], cookie = '';
@@ -55,6 +55,7 @@ const JD_API_HOST = `https://api.m.jd.com/api?appid=jdsupermarket`;
       $.nickName = '';
       await TotalBean();
       console.log(`\n开始【京东账号${$.index}】${$.nickName || $.UserName}\n`);
+      console.log(`目前暂无兑换酒类的奖品功能，即使输入酒类名称，脚本也会提示下架\n`)
       if (!$.isLogin) {
         $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/`, {"open-url": "https://bean.m.jd.com/"});
 
@@ -73,7 +74,7 @@ const JD_API_HOST = `https://api.m.jd.com/api?appid=jdsupermarket`;
       }
       if (`${coinToBeans}` !== '0') {
         await smtgHome();//查询蓝币数量，是否满足兑换的条件
-        await smtg_queryPrize();
+        await PrizeIndex();
       } else {
         console.log('查询到您设置的是不兑换京豆选项，现在为您跳过兑换京豆。如需兑换，请去BoxJs设置或者修改脚本coinToBeans\n')
       }
@@ -83,35 +84,11 @@ const JD_API_HOST = `https://api.m.jd.com/api?appid=jdsupermarket`;
 })()
   .catch((e) => $.logErr(e))
   .finally(() => $.done())
-
+async function PrizeIndex() {
-//查询任务
+  await smtg_queryPrize();
-function smtg_queryPrize(timeout = 0){
+  // await smtg_materialPrizeIndex();//兑换酒类奖品，此兑换API与之前的兑换京豆类的不一致，故目前无法进行
-  return new Promise((resolve) => {
+  // const prizeList = [...$.queryPrizeData, ...$.materialPrizeIndex];
-    setTimeout( ()=>{
+  const prizeList = [...$.queryPrizeData];
-      let url = {
-        url : `${JD_API_HOST}&functionId=smtg_queryPrize&clientVersion=8.0.0&client=m&body=%7B%7D&t=${Date.now()}`,
-        headers : {
-          'Origin' : `https://jdsupermarket.jd.com`,
-          'Cookie' : cookie,
-          'Connection' : `keep-alive`,
-          'Accept' : `application/json, text/plain, */*`,
-          'Referer' : `https://jdsupermarket.jd.com/game/?tt=1597540727225`,
-          'Host' : `api.m.jd.com`,
-          'Accept-Encoding' : `gzip, deflate, br`,
-          'Accept-Language' : `zh-cn`
-        }
-      }
-      $.post(url, async (err, resp, data) => {
-        try {
-          if (safeGet(data)) {
-            data = JSON.parse(data);
-            $.queryPrizeData = data;
-            if (data.data.bizCode !== 0) {
-              $.beanerr = `${data.data.bizMsg}`;
-              return
-            }
-            if (data.data.bizCode === 0) {
-              const { prizeList } = data.data.result;
   if (`${coinToBeans}` === '1000') {
     if (prizeList[1].beanType === 'BeanPackage') {
       console.log(`查询换${prizeList[1].title}ID成功，ID:${prizeList[1].prizeId}`)
@@ -175,16 +152,16 @@ function smtg_queryPrize(timeout = 0){
       }
     }
     if (prizeId) {
-                  if (prizeList[i].inStock === 506) {
+      if (prizeList[i].inStock === 506 || prizeList[i].inStock === -1) {
         console.log(`失败，您输入设置的${coinToBeans}领光了，请明天再来`);
         $.beanerr = `失败，您输入设置的${coinToBeans}领光了，请明天再来`;
         return ;
       }
-                  if (prizeList[i].targetNum === prizeList[i].finishNum) {
+      if ((prizeList[i].targetNum) && prizeList[i].targetNum === prizeList[i].finishNum) {
         $.beanerr = `${prizeList[0].subTitle}`;
         return ;
       }
-                  if ($.totalBlue > $.blueCost) {
+      if ($.totalBlue < $.blueCost) {
         await smtg_obtainPrize(prizeId);
       } else {
         console.log(`兑换失败,您目前蓝币${$.totalBlue}个,不足以兑换${$.title}所需的${$.blueCost}个`);
@@ -195,6 +172,72 @@ function smtg_queryPrize(timeout = 0){
       $.beanerr = `奖品兑换列表[${coinToBeans}]已下架`;
     }
   }
+}
+//查询白酒类奖品列表API
+function smtg_materialPrizeIndex(timeout = 0) {
+  return new Promise((resolve) => {
+    setTimeout( ()=>{
+      let url = {
+        url : `${JD_API_HOST}&functionId=smtg_materialPrizeIndex&clientVersion=8.0.0&client=m&body=%7B%22channel%22:%221%22%7D&t=${Date.now()}`,
+        headers : {
+          'Origin' : `https://jdsupermarket.jd.com`,
+          'Cookie' : cookie,
+          'Connection' : `keep-alive`,
+          'Accept' : `application/json, text/plain, */*`,
+          'Referer' : `https://jdsupermarket.jd.com/game/?tt=1597540727225`,
+          'Host' : `api.m.jd.com`,
+          'Accept-Encoding' : `gzip, deflate, br`,
+          'Accept-Language' : `zh-cn`
+        }
+      }
+      $.post(url, async (err, resp, data) => {
+        try {
+          if (safeGet(data)) {
+            data = JSON.parse(data);
+            if (data.data.bizCode !== 0) {
+              $.beanerr = `${data.data.bizMsg}`;
+              return
+            }
+            $.materialPrizeIndex = data.data.result.prizes || [];
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve()
+        }
+      })
+    },timeout)
+  })
+}
+//查询任务
+function smtg_queryPrize(timeout = 0){
+  return new Promise((resolve) => {
+    setTimeout( ()=>{
+      let url = {
+        url : `${JD_API_HOST}&functionId=smtg_queryPrize&clientVersion=8.0.0&client=m&body=%7B%7D&t=${Date.now()}`,
+        headers : {
+          'Origin' : `https://jdsupermarket.jd.com`,
+          'Cookie' : cookie,
+          'Connection' : `keep-alive`,
+          'Accept' : `application/json, text/plain, */*`,
+          'Referer' : `https://jdsupermarket.jd.com/game/?tt=1597540727225`,
+          'Host' : `api.m.jd.com`,
+          'Accept-Encoding' : `gzip, deflate, br`,
+          'Accept-Language' : `zh-cn`
+        }
+      }
+      $.post(url, async (err, resp, data) => {
+        try {
+          if (safeGet(data)) {
+            data = JSON.parse(data);
+            $.queryPrizeData = data;
+            if (data.data.bizCode !== 0) {
+              $.beanerr = `${data.data.bizMsg}`;
+              return
+            }
+            if (data.data.bizCode === 0) {
+              const { prizeList } = data.data.result;
+              $.queryPrizeData = data.data.result.prizeList || [];
             }
           }
         } catch (e) {