From 3844f808b6139ad7140f0ea6dfbfb07c2b3e0640 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Sun, 29 Nov 2020 23:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9C=E4=B8=9C=E5=B7=A5=E5=8E=82=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=80=BB=E8=BE=91,=E5=9C=A8=E6=9C=AA=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BB=BB=E4=BD=95=E5=95=86=E5=93=81=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B,=E5=A6=82=E6=9E=9C=E6=AD=A4=E6=97=B6?=
 =?UTF-8?q?=E7=94=B5=E9=87=8F=E6=BB=A1=E8=B6=B3=E5=85=91=E6=8D=A2=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=9C=80=E5=A4=9A=E7=9A=84=E5=95=86=E5=93=81=E6=97=B6?=
 =?UTF-8?q?,=E5=8F=91=E9=80=81=E6=8F=90=E9=86=92=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_jdfactory.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/jd_jdfactory.js b/jd_jdfactory.js
index 79dcddad..1405a28c 100644
--- a/jd_jdfactory.js
+++ b/jd_jdfactory.js
@@ -198,6 +198,13 @@ async function algorithm() {
                   }
                 } else {
                   console.log(`BoxJs或环境变量暂未提供心仪商品\n如需兑换心仪商品，请提供心仪商品名称\n`);
+                  await jdfactory_getProductList(true);
+                  if ($.canMakeList[0].couponCount > 0 && $.batteryValue * 1 >= $.canMakeList[0].fullScore) {
+                    $.msg($.name, '', `京东账号${$.index}${$.nickName}\n当前总电量为：${$.batteryValue * 1}\n当前总电量为：${$.batteryValue * 1}\n【满足】兑换${$.canMakeList[0].name}所需总电量：${$.canMakeList[0].totalScore}\n请点击弹窗直达活动页面\n选择此心仪商品并手动投入电量兑换`, {'open-url': 'openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://h5.m.jd.com/babelDiy/Zeus/2uSsV2wHEkySvompfjB43nuKkcHp/index.html%22%20%7D'});
+                    await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `当前总电量为：${$.batteryValue * 1}\n【满足】兑换${$.canMakeList[0].name}所需总电量：${$.canMakeList[0].totalScore}\n请速去活动页面查看`);
+                  } else {
+                    console.log(`\n目前电量${$.batteryValue * 1},不满足兑换\n`)
+                  }
                 }
               }
             } else {
@@ -477,7 +484,7 @@ function queryVkComponent() {
           console.log(`${JSON.stringify(err)}`)
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
-          console.log('queryVkComponent', data)
+          // console.log('queryVkComponent', data)
           if (safeGet(data)) {
             data = JSON.parse(data);
           }
@@ -491,7 +498,7 @@ function queryVkComponent() {
   })
 }
 //查询当前商品列表
-function jdfactory_getProductList(flag) {
+function jdfactory_getProductList(flag = false) {
   return new Promise(resolve => {
     $.post(taskPostUrl('jdfactory_getProductList'), async (err, resp, data) => {
       try {
@@ -503,6 +510,7 @@ function jdfactory_getProductList(flag) {
             data = JSON.parse(data);
             if (data.data.bizCode === 0) {
               $.canMakeList = data.data.result.canMakeList;//当前可选商品列表 sellOut:1为已抢光，0为目前可选择
+              $.canMakeList.sort(sortCouponCount);
               if (!flag) {
                 console.log(`商品名称       可选状态    剩余量`)
                 for (let item of $.canMakeList) {
@@ -526,6 +534,9 @@ function jdfactory_getProductList(flag) {
     })
   })
 }
+function sortCouponCount(a, b) {
+  return b['couponCount'] - a['couponCount']
+}
 function jdfactory_getHomeData() {
   return new Promise(resolve => {
     $.post(taskPostUrl('jdfactory_getHomeData'), async (err, resp, data) => {
@@ -535,7 +546,7 @@ function jdfactory_getHomeData() {
           console.log(`${$.name} API请求失败，请检查网路重试`)
         } else {
           if (safeGet(data)) {
-            console.log(data);
+            // console.log(data);
             data = JSON.parse(data);
             if (data.data.bizCode === 0) {
               $.haveProduct = data.data.result.haveProduct;