shawenguan 1 жил өмнө
parent
commit
cf3b96e856

+ 2 - 2
Scripts/wubian/wubianSynthesis.js

@@ -202,7 +202,7 @@ async function getWillActivityData() {
 
     for (let hashId in activityLstMap) {
         let item = activityLstMap[hashId];
-        if ((indexName.length > 0 && item.name.indexOf(indexName) != -1) || item.activityId == activityId) {
+        if ((indexName.length > 0 && item.name.indexOf(indexName) != -1) || (item.activityId == activityId || item.hashId == activityId)) {
             activityData = item;
         }
     }
@@ -222,7 +222,7 @@ async function trySynthesize() {
     if (!activityData) {
         return;
     }
-    let retCvtData = await getCvtGoodsList(activityData.activityId, true);
+    let retCvtData = await getCvtGoodsList(activityData.hashIdId || activityData.activityId, true);
     magicJS.logger.info(`retCvtData=${JSON.stringify(retCvtData)}`);
     if (!retCvtData) {
         return;