|
|
@@ -206,7 +206,7 @@ async function tryToExecCompositeTask(taskId, taskInfo = {}) {
|
|
|
}
|
|
|
return;
|
|
|
}
|
|
|
- let materialSelLst = await getCompositeMaterial(taskId);
|
|
|
+ let materialSelLst = await getCompositeMaterial(taskId, taskInfo);
|
|
|
if (materialSelLst && materialSelLst.length > 0) {
|
|
|
let ret = calcCompositeGroups(materialSelLst);
|
|
|
let materialGroups = ret[0];
|
|
|
@@ -460,7 +460,7 @@ async function getCompositeTaskListByServer(status, pageSize = 10, page = 1) {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-async function getCompositeMaterial(taskId) {
|
|
|
+async function getCompositeMaterial(taskId, taskInfo) {
|
|
|
return new Promise((resolve, _reject) => {
|
|
|
try {
|
|
|
const headers = GCommonGandartHeads;
|
|
|
@@ -472,7 +472,7 @@ async function getCompositeMaterial(taskId) {
|
|
|
headers: headers,
|
|
|
body: body
|
|
|
};
|
|
|
- let taskTitleName = ''; //合成标题
|
|
|
+ let taskTitleName = taskInfo.collectionName || ''; //合成标题
|
|
|
lk.log(`获取合成任务[${taskTitleName}#${taskId}]材料详情:${body}`);
|
|
|
lk.post(url, async (error, _response, data) => {
|
|
|
let retItemLst = [];
|
|
|
@@ -488,7 +488,7 @@ async function getCompositeMaterial(taskId) {
|
|
|
retItemLst = obj;
|
|
|
lk.log(`获取合成任务材料详情成功`);
|
|
|
} else {
|
|
|
-
|
|
|
+ lk.log(`获取合成任务材料详情失败,响应:${data}`);
|
|
|
}
|
|
|
}
|
|
|
} catch (e) {
|
|
|
@@ -542,7 +542,7 @@ async function getDetailByCasting(castingId, collectionName, pageSize = 50, page
|
|
|
retItemLst = obj.list;
|
|
|
lk.log(`获取个人产品拥有详情成功`);
|
|
|
} else {
|
|
|
-
|
|
|
+ lk.log(`获取个人产品拥有详情失败,响应:${data}`);
|
|
|
}
|
|
|
}
|
|
|
} catch (e) {
|
|
|
@@ -595,7 +595,7 @@ async function confirmCompositeV2(taskId, taskInfo, materialDetailList) {
|
|
|
retOrder = ret.obj;
|
|
|
lk.appendNotifyInfo(`🎉合成任务[${taskId}]成功,订单号:${obj}`);
|
|
|
} else {
|
|
|
- lk.log(`合成失败,msg=${ret.msg}`);
|
|
|
+ lk.log(`合成失败,响应:${data}`);
|
|
|
}
|
|
|
}
|
|
|
} catch (e) {
|
|
|
@@ -645,7 +645,7 @@ async function checkCompositeResult(orderNum) {
|
|
|
cName = cName.substring(0, cName.length - 1);
|
|
|
lk.appendNotifyInfo(`🎉合成产品:${cName}`);
|
|
|
} else {
|
|
|
- lk.log(`获取合成结果失败,msg=${ret.msg}`);
|
|
|
+ lk.log(`获取合成结果失败,响应:${data}`);
|
|
|
}
|
|
|
}
|
|
|
} catch (e) {
|