修改

BoxJsSub/wubian.json

@@ -352,7 +352,7 @@
         },
         {
             "id": "lkWubianRevokeEntrust",
-            "name": "无边一键下架",
+            "name": "无边一键取消委托",
             "author": "@jojo",
             "repo": "https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/wubian/wubianRevokeEntrust.js",
             "script": "https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/wubian/wubianRevokeEntrust.js",

Scripts/wubian/wubianConsignSale.js

@@ -177,7 +177,7 @@ async function tryToSale() {
             } else {
                 msgTipsText += `[${artData.title}]#(${artTotalList[i].ver})寄售失败，原因：${retOrder?.msg || '未知'}！\n`;
             }
-            await magicJS.utils.sleep(100);
+            await magicJS.utils.sleep(200);
         }
         magicJS.notification.appendNotifyInfo(msgTipsText);
     } else {
@@ -239,11 +239,11 @@ async function queryUserAllCollectList(tenantId, type, state) {
 }
 
 /**
- * 
- * @param {*} type 
+ *
+ * @param {*} type
  * @param {*} state 1=收藏中 2=转让中 3=已转让
- * @param {*} page 
- * @returns 
+ * @param {*} page
+ * @returns
  */
 async function queryUserCollectList(tenantId, type, state, page) {
     const url = `https://api.wubian.pro/vmf/app/user/collect/list`;

Scripts/wubian/wubianSynthesis.js

@@ -218,8 +218,7 @@ async function getWillActivityData() {
     let activityLstMap = await getActivityList(activityType);
     let activityData = null;
     magicJS.logger.info(`activityType=${activityType} activityId=${activityId}`);
-    magicJS.logger.info(`${JSON.stringify(activityLstMap)}`);
-
+    // magicJS.logger.info(`${JSON.stringify(activityLstMap)}`);
     for (let hashId in activityLstMap) {
         let item = activityLstMap[hashId];
         if ((item.activityId == activityId || item.hashId == activityId) || (indexName.length > 0 && item.name.indexOf(indexName) != -1)) {
@@ -276,10 +275,22 @@ function setSynthesisAmount(amount) {
     magicJS.data.write(WuBianConstKey.SynthesisAmount, amount);
 }
 
+function checkActivityAutoDisable(activityId) {
+    for (let retData of gSynthesizeResultList) {
+        if (retData && retData.code == 500) {
+            if (retData.msg && (retData.msg.indexOf('库存不足') != -1 || retData.msg.indexOf('次数不足') != -1)) {
+                setActivityDisabled(activityId, true);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 async function trySynthesize() {
     magicJS.logger.info(`[0]活动任务开始执行...`);
     let activityData = await getWillActivityData();
-    magicJS.logger.info(`activityData=${JSON.stringify(activityData)}`);
+    // magicJS.logger.info(`activityData=${JSON.stringify(activityData)}`);
     if (!activityData) {
         return;
     }
@@ -292,7 +303,7 @@ async function trySynthesize() {
         retCvtData = await doGetConvertGoodsList(activityId, checkConvertGoodsListReqForceNeed());
     }
     magicJS.logger.info(`[3]活动任务开始执行...`);
-    magicJS.logger.info(`retCvtData=${JSON.stringify(retCvtData)}`);
+    // magicJS.logger.info(`retCvtData=${JSON.stringify(retCvtData)}`);
     if (!retCvtData) {
         return;
     }
@@ -303,7 +314,7 @@ async function trySynthesize() {
     let willCount = getActivityWillCount();
     willCount = getSynthesisAmount();
     let combinationLst = getSynthesizeCombination(retCvtData);
-    magicJS.logger.info(`combinationLst=${JSON.stringify(combinationLst)}`);
+    // magicJS.logger.info(`combinationLst=${JSON.stringify(combinationLst)}`);
     let nExcuteCount = Math.min(willCount, combinationLst.length);
     let tipsText = `[${activityData.activityType}]${activityData.name}，执行结果如下：\n`;
 
@@ -333,6 +344,9 @@ async function trySynthesize() {
                 if (costTime < ctrlMillSec) {
                     await magicJS.utils.sleep(ctrlMillSec - costTime);
                 }
+                if (checkActivityAutoDisable()) {
+                    break;
+                }
             }
             let nSuccCount = 0;
             let nFailCount = 0;
@@ -436,17 +450,17 @@ function getSynthesizeCombination(retCvtData) {
     let isContinus = true;
     while (isContinus) {
         let retOneList = [];
-        magicJS.logger.info(`ruleList${JSON.stringify(ruleList)}`);
-        magicJS.logger.info(`goodsList:${JSON.stringify(goodsList)}`);
+        // magicJS.logger.info(`ruleList${JSON.stringify(ruleList)}`);
+        // magicJS.logger.info(`goodsList:${JSON.stringify(goodsList)}`);
         for (let i = 0; i < ruleList.length; i++) {
             let limitCount = ruleList[i].num;
             let matchArtIdList = ruleList[i].matchArtIdList;
-            magicJS.logger.info(`limitCount:${limitCount}`);
-            magicJS.logger.info(`matchArtIdList:${JSON.stringify(matchArtIdList)}`);
+            // magicJS.logger.info(`limitCount:${limitCount}`);
+            // magicJS.logger.info(`matchArtIdList:${JSON.stringify(matchArtIdList)}`);
             let oneData = goodsList[i];
             let matchArtList = getSubGoodsList(goodsList, matchArtIdList, limitCount);
             if (matchArtList && matchArtList.length == limitCount) {
-                magicJS.logger.info(`matchArtList:${JSON.stringify(matchArtList)}`);
+                // magicJS.logger.info(`matchArtList:${JSON.stringify(matchArtList)}`);
                 for (let j = 0; j < matchArtList.length; j++) {
                     retOneList.push(matchArtList[j]);
                 }