|
|
@@ -285,8 +285,14 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
}
|
|
|
lk.setVal(GandartConstKey.CompositeTaskFinalList, '{}');
|
|
|
} else {
|
|
|
+ let simpleTaskInfo = {
|
|
|
+ id: taskInfo.id,
|
|
|
+ compositeLabel: taskInfo.compositeLabel,
|
|
|
+ compositeTaskName: taskInfo.compositeTaskName,
|
|
|
+ surplus: info.surplus,
|
|
|
+ }
|
|
|
let finalCacheData = {
|
|
|
- taskName: `${taskInfo.compositeLabel}#${taskInfo.compositeTaskName}`,
|
|
|
+ taskInfo: simpleTaskInfo,
|
|
|
finalGroups: finalGroups,
|
|
|
};
|
|
|
lk.setVal(GandartConstKey.CompositeTaskFinalList, JSON.stringify(finalCacheData, null, 2));
|
|
|
@@ -369,13 +375,10 @@ function checkPickMaterialForComposite(materialGroup, materialDetails, wantCount
|
|
|
}
|
|
|
minCount = Math.min(minCount, wantCount);
|
|
|
let nCompositeGroup = [];
|
|
|
- lk.log(`test###########2##${minCount}`)
|
|
|
for (let n = 0; n < minCount; n++) {
|
|
|
let resultMaterialLst = [];
|
|
|
let interrupt = false;
|
|
|
- lk.log(`test###########for##${n}`)
|
|
|
for (let i = 0; i < materialGroup.length; i++) {
|
|
|
- lk.log(`test###########materialGroup##${i}`)
|
|
|
const materialObj = materialGroup[i];
|
|
|
const castingId = materialObj.castingId;
|
|
|
let ownLst = materialDetails[castingId];
|
|
|
@@ -404,7 +407,6 @@ function checkPickMaterialForComposite(materialGroup, materialDetails, wantCount
|
|
|
}
|
|
|
nCompositeGroup.push(resultMaterialLst);
|
|
|
}
|
|
|
- lk.log(`test###########3##`)
|
|
|
return nCompositeGroup;
|
|
|
}
|
|
|
|
|
|
@@ -661,30 +663,31 @@ async function confirmCompositeV2(taskId, taskInfo, materialDetailList) {
|
|
|
};
|
|
|
let taskName = taskInfo.compositeTaskName || ''; //合成标题
|
|
|
lk.log(`请求合成任务[${taskName}#${taskId}]：${body}`);
|
|
|
- lk.post(url, async (error, _response, data) => {
|
|
|
- let retOrder;
|
|
|
- try {
|
|
|
- if (error) {
|
|
|
- lk.log(`合成发生错误`);
|
|
|
- lk.execFail();
|
|
|
- lk.appendNotifyInfo(`❌合成失败，请稍后再试`);
|
|
|
- } else {
|
|
|
- let ret = JSON.parse(data);
|
|
|
- if (ret.success) {
|
|
|
- retOrder = ret.obj;
|
|
|
- lk.appendNotifyInfo(`🎉合成任务[${taskId}]成功，订单号：${obj}`);
|
|
|
- } else {
|
|
|
- lk.log(`合成失败，响应：${data}`);
|
|
|
- }
|
|
|
- }
|
|
|
- } catch (e) {
|
|
|
- lk.log(`合成发生错误`);
|
|
|
- lk.logErr(e);
|
|
|
- lk.execFail();
|
|
|
- } finally {
|
|
|
- resolve(retOrder);
|
|
|
- }
|
|
|
- });
|
|
|
+ // lk.post(url, async (error, _response, data) => {
|
|
|
+ // let retOrder;
|
|
|
+ // try {
|
|
|
+ // if (error) {
|
|
|
+ // lk.log(`合成发生错误`);
|
|
|
+ // lk.execFail();
|
|
|
+ // lk.appendNotifyInfo(`❌合成失败，请稍后再试`);
|
|
|
+ // } else {
|
|
|
+ // let ret = JSON.parse(data);
|
|
|
+ // if (ret.success) {
|
|
|
+ // retOrder = ret.obj;
|
|
|
+ // lk.appendNotifyInfo(`🎉合成任务[${taskId}]成功，订单号：${obj}`);
|
|
|
+ // } else {
|
|
|
+ // lk.log(`合成失败，响应：${data}`);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // } catch (e) {
|
|
|
+ // lk.log(`合成发生错误`);
|
|
|
+ // lk.logErr(e);
|
|
|
+ // lk.execFail();
|
|
|
+ // } finally {
|
|
|
+ // resolve(retOrder);
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ resolve();
|
|
|
} catch (e) {
|
|
|
lk.log(`合成发生错误`);
|
|
|
lk.logErr(e);
|
shawenguan