|
|
@@ -297,9 +297,12 @@ async function tryOneComposite(activityId){
|
|
|
activityData = getActivitDataCache(1, activityId);
|
|
|
if(!isCompositeOnlyUseCache()){
|
|
|
magicJS.logger.info(`请求活动[${activityId}]数据[${i}]`);
|
|
|
- activityData = await getCompositeList(activityId);
|
|
|
- saveActivitDataCache(1, activityData, false);
|
|
|
- if(activityData && (activityData.code == 200 || activityData.code == 415)){
|
|
|
+ let result = await getCompositeList(activityId);
|
|
|
+ if(result.code == 200){
|
|
|
+ activityData = result.data;
|
|
|
+ saveActivitDataCache(1, activityData, false);
|
|
|
+ }
|
|
|
+ if(result.code == 200 || activityData.code == 415){
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -567,11 +570,10 @@ async function getCompositeList(id){
|
|
|
// 无资格
|
|
|
result.code = 200;
|
|
|
}
|
|
|
- if(result.code != 200){
|
|
|
- return null;
|
|
|
- }
|
|
|
- result.data.code = result.code;
|
|
|
- return result.data;
|
|
|
+ // if(result.code != 200){
|
|
|
+ // return null;
|
|
|
+ // }
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
async function startComposite(id, materials){
|