修改

Scripts/hbcpre/hbcpreHelper.js

@@ -54,7 +54,7 @@ const HbcpreConstKey = {
     compositeActivityId: 'HbcpreCompoundActivityId',
     compositeActivityName: 'HbcpreCompoundActivityName',
 
-    // 兑换
+    // 兑换相关
     exchangeItemDataGrabEnabled: 'HbcpreExchangeItemDataGrabEnabled',
     exchangeActivityData: 'HbcpreExchangeActivityData',
     exchangeActivityId: 'HbcpreExchangeActivityId',
@@ -722,7 +722,7 @@ function handlerMySeriesList() {
     // reqData.type 0=数字资产 1=盲盒 5=我的寄售 4=已卖出
     if (reqData.type == 0 || reqData.type == 1) {
         let itemList = rspData.data.list;
-        let cntDict = readMySeriesOwnCntFakeData();
+        let itemCntDict = readMySeriesOwnCntFakeData();
 
         let existsIds = {};
         for (let i = 0; i < itemList.length; i++) {
@@ -732,10 +732,10 @@ function handlerMySeriesList() {
             existsIds[seriesId] = 1;
 
             const seriesName = item.seriesName;
-            if (cntDict[seriesId]) {
-                item.total = cntDict[seriesId];
-            } else if (cntDict[seriesName]) {
-                item.total = cntDict[seriesName];
+            if (itemCntDict[seriesId]) {
+                item.total = itemCntDict[seriesId];
+            } else if (itemCntDict[seriesName]) {
+                item.total = itemCntDict[seriesName];
             }
             item.seriesName = `${seriesName}#￥${parseFloat(item.avgPrice).toFixed(2)}`;
             item.authorName = `存量(${formatNumberWithKAndW(item.soldNum)}/${formatNumberWithKAndW(item.issueNum)})`;
@@ -1030,17 +1030,23 @@ function handlerCompositeList() {
         //         }
         //     ]
         // }
-        let ownSeriesList = iData.seriesList;
-        if(iData.num > ownSeriesList.length){
-            magicJS.logger.error("###################");
-            addCompositeFakeWorksToSeries(ownSeriesList, needList[i], iData.num - ownSeriesList.length);
-            magicJS.logger.error(JSON.stringify(ownSeriesList));
+        let ownWorksCnt = getOwnSeriesWorksCount(iData.seriesList);
+        if(iData.num > ownWorksCnt){
+            addCompositeFakeWorksToSeries(ownSeriesList, needList[i], iData.num - ownWorksCnt);
         }
     }
-    magicJS.logger.error(JSON.stringify(rspData));
     gRetBody = rspData;
 }
 
+function getOwnSeriesWorksCount(seriesList){
+    let total = 0;
+    for(let i=seriesList.length-1; i>= 0; i--){
+        let ele = seriesList[i];
+        total += ele.worksList.length;
+    }
+    return total;
+}
+
 
 function getNRandomDigits(n) {
     const min = Math.pow(10, n-1);
@@ -1061,6 +1067,7 @@ function getRandomFakeWorksData(seriesId, ctrlValue){
 
 function addCompositeFakeWorksToSeries(ownSeriesList, needData, num){
     let needSeriesList = needData.seriesList;
+    let cntDict = readMySeriesOwnCntFakeData();
     for(let i=0; i < needSeriesList.length; i++){
         let nedSeries = needSeriesList[i];
         let ownSeries = ownSeriesList[i];
@@ -1069,6 +1076,7 @@ function addCompositeFakeWorksToSeries(ownSeriesList, needData, num){
             ownSeries.worksList = [];
             ownSeriesList[i] = ownSeries;
         }
+        let sCnt = 
         while(num > 0){
             const fkWorksData = getRandomFakeWorksData(ownSeries.seriesId, num);
             ownSeries.worksList.push({
@@ -1077,7 +1085,9 @@ function addCompositeFakeWorksToSeries(ownSeriesList, needData, num){
             });
             num -= 1;
         }
-        break;
+        if(num <= 0){
+            break;
+        }
     }
 }
 

Scripts/hbcpre/hbcpreOrder.js

@@ -110,15 +110,16 @@ function updateRequestHeaders() {
 async function tryQuickOrder() {
     let itemId = magicJS.data.read(HbcpreConstKey.marketSeriesId, null);
     let itemName = magicJS.data.read(HbcpreConstKey.marketSeriesName, null);
-    if (!itemId && !itemName) {
+    if ((!itemId || itemId == '' ) && (!itemName || itemName == '')) {
         magicJS.logger.info(`缺少产品下单信息`);
         return;
     }
+    itemId = Number(itemId);
     let itemList = magicJS.data.read(HbcpreConstKey.marketSeriesList, []);
     let willPrice = Number(magicJS.data.read(HbcpreConstKey.marketOrderLimitPrice, 99999));
     let priceFloatInterval = Number(magicJS.data.read(HbcpreConstKey.marketOrderPriceInterval, 0));
     let willBuyList = [];
-    if (itemId.length > 0 && itemId > 0) {
+    if (itemId > 0) {
         magicJS.logger.info(`通过产品系列号来进行匹配`);
         for (let i = 0; i < itemList.length; i++) {
             const iData = itemList[i];