From d00716e09dee5285327b155641f126e057c50de7 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Thu, 26 Nov 2020 17:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E5=96=9C=E5=B7=A5=E5=8E=82=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=94=9F=E4=BA=A7=E5=AE=8C=E6=AF=95=E5=8F=AF=E5=85=91?=
 =?UTF-8?q?=E6=8D=A2=E6=97=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8F=8A=E5=BC=B9=E7=AA=97=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_dreamFactory.js | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index 20cdfcb3..9511a625 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -414,7 +414,7 @@ function doTask(taskId) {
 function userInfo() {
   return new Promise(async resolve => {
     const url = `/dreamfactory/userinfo/GetUserInfo?zone=dream_factory&pin=&sharePin=&shareType=&materialTuanPin=&materialTuanId=&sceneval=2`;
-    $.get(taskurl(url), (err, resp, data) => {
+    $.get(taskurl(url), async (err, resp, data) => {
       data = JSON.parse(data);
       if (data['ret'] === 0) {
         data = data['data'];
@@ -424,21 +424,46 @@ function userInfo() {
           factoryId = factory.factoryId;//工厂ID
           productionId = production.productionId;//商品ID
           subTitle = data.user.pin;
+          await GetCommodityDetails(production.commodityDimId);
           console.log(`当前电力：${data.user.electric}`)
           console.log(`分享码: ${data.user.encryptPin}`);
           console.log(`生产进度：${(production.investedElectric / production.needElectric).toFixed(2) * 100}%`);
+          message += `【京东账号${$.index}】${$.nickName}\n`
+          message += `【生产商品】${$.productName}\n`;
           message += `【生产进度】${((production.investedElectric / production.needElectric) * 100).toFixed(2)}%\n`;
+          if (production.investedElectric >= production.needElectric) {
+            $.msg($.name, ``, `【京东账号${$.index}】${$.nickName}\n【生产商品】${$.productName}\n已生产完,毕请速去兑换`, {'open-url': 'openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://wqsd.jd.com/pingou/dream_factory/index.html%22%20%7D'})
+            await notify.sendNotify(`${$.name} - 京东账号${$.index} - ${$.nickName}`, `【京东账号${$.index}】${$.nickName}\n【生产商品】${$.productName}\n已生产完,毕请速去兑换`)
+          }
         } else {
-          $.unActive = true;//标记是否开启了此活动
-          console.log('【提示】此账号京喜工厂活动未开始\n请手动去京东APP->游戏与互动->查看更多->京喜工厂 开启活动\n');
-          $.msg($.name, '', `【提示】此账号[${$.nickName}]京喜工厂活动未开始\n请手动去京东APP->游戏与互动->查看更多->京喜工厂 开启活动`);
+          $.unActive = true;//标记是否开启了京喜活动或者选购了商品进行生产
+          if (!data.factoryList) {
+            console.log('【提示】此账号京喜工厂活动未开始\n请手动去京东APP->游戏与互动->查看更多->京喜工厂 开启活动\n');
+            $.msg($.name, '', `【提示】此账号[${$.nickName}]京喜工厂活动未开始\n请手动去京东APP->游戏与互动->查看更多->京喜工厂 开启活动`);
+          } else if (data.factoryList && !data.productionList) {
+            console.log(`【提示】此账号京喜工厂未选购商品\n请手动去京东APP->游戏与互动->查看更多->京喜工厂 选购\n`)
+            $.msg($.name, '', `【提示】此账号[${$.nickName}]京喜工厂未选择商品\n请手动去京东APP->游戏与互动->查看更多->京喜工厂 选择商品`);
+          }
         }
       }
       resolve()
     })
   })
 }
-
+//查询当前生产的商品名称
+function GetCommodityDetails(commodityDimId) {
+  return new Promise(async resolve => {
+    const url = `/dreamfactory/diminfo/GetCommodityDetails?zone=dream_factory&sceneval=2&g_login_type=1&commodityId=${commodityDimId}`;
+    $.get(taskurl(url), (err, resp, data) => {
+      data = JSON.parse(data);
+      if (data['ret'] === 0) {
+        data = data['data'];
+        $.productName = data['commodityList'][0].name;
+      }
+      resolve()
+    })
+  })
+}
 
 function stealFriend() {
   return new Promise(async resolve => {