|
|
@@ -32,6 +32,8 @@ let gAppToken = `02z/K0Xp4ItXMROQyjLv+2PYeo7V55zbL5/ojIRYKE4=`;
|
|
|
let gUserPhoneNum = `13430389115`;
|
|
|
let gUserId = 95388;
|
|
|
|
|
|
+let gItemCntRwDict = {};
|
|
|
+
|
|
|
const gCommonHeaders = {
|
|
|
'Sec-Fetch-Dest': `empty`,
|
|
|
'x-cloudbase-phone': gUserPhoneNum,
|
|
|
@@ -80,11 +82,11 @@ async function tryComposite() {
|
|
|
saveActivitDataCache(activityId, activityData);
|
|
|
}
|
|
|
if(activityData){
|
|
|
- magicJS.logger.error(JSON.stringify(activityData));
|
|
|
+ // magicJS.logger.error(JSON.stringify(activityData));
|
|
|
// 固定材料
|
|
|
let needList = activityData.needList;
|
|
|
// 个人拥有材料列表
|
|
|
- let ownList = activityData.ownList;
|
|
|
+ let ownList = checkHandleMyOwnList(activityData.ownList);
|
|
|
let isEnough = true;
|
|
|
for (let i = 0; i < ownList.length; i++) {
|
|
|
let iData = ownList[i];
|
|
|
@@ -117,6 +119,52 @@ async function tryComposite() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+function readMySeriesOwnCntFakeData() {
|
|
|
+ gItemCntRwDict = {};
|
|
|
+ let text = magicJS.data.read(HbcpreConstKey.myOwnSeriesCntFakeData, null);
|
|
|
+ if (text) {
|
|
|
+ let segments = text.split('|');
|
|
|
+ for (let i = segments.length - 1; i >= 0; i--) {
|
|
|
+ let kvArr = segments[i].trim().split('#');
|
|
|
+ if (kvArr.length == 2) {
|
|
|
+ const key = kvArr[0].trim();
|
|
|
+ const value = parseInt(kvArr[1].trim());
|
|
|
+ gItemCntRwDict[key] = value;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return gItemCntRwDict;
|
|
|
+}
|
|
|
+
|
|
|
+function checkHandleMyOwnList(ownList){
|
|
|
+ let seriesCntDict = readMySeriesOwnCntFakeData();
|
|
|
+ for(let i=0; i < ownList.length; i++){
|
|
|
+ let iData = ownList[i];
|
|
|
+ let seriesList = iData.seriesList;
|
|
|
+ for(let j=0; j < seriesList.length; j++){
|
|
|
+ let ownSeries = seriesList[j];
|
|
|
+ let sCnt = seriesCntDict[ownSeries.seriesId];
|
|
|
+ if(!sCnt){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ let worksList = ownSeries.worksList;
|
|
|
+ if(!worksList){
|
|
|
+ worksList = [];
|
|
|
+ ownSeries.worksList = worksList;
|
|
|
+ }
|
|
|
+ while(sCnt > 0){
|
|
|
+ const fkWorksData = getRandomFakeWorksData(ownSeries.seriesId, j+sCnt);
|
|
|
+ ownSeries.worksList.push({
|
|
|
+ worksId: fkWorksData.worksId,
|
|
|
+ worksNo: fkWorksData.worksNo,
|
|
|
+ });
|
|
|
+ sCnt -= 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return ownList;
|
|
|
+}
|
|
|
+
|
|
|
function pickMaterials(needList, ownList){
|
|
|
let retList = [];
|
|
|
let isEnough = true;
|