修改

Scripts/elife/ofpayGrab.js

@@ -155,11 +155,13 @@ function getWillMarketBuyListAll() {
 }
 
 async function checkToBuyAll(buyList, activityData){
-    const subActivityId = activityData.activityId;
+    const activityId = activityData.activityId;
+    const subActivityId = activityData.subActivityId;
+    const subLoginType = activityData.subLoginType;
     const awardList = activityData.awardList;
     let retList = [];
     for(let i=0; i < buyList.length; i++){
-        const oneRet = await checkToBuyOne(subActivityId, buyList[i], awardList);
+        const oneRet = await checkToBuyOne(activityId, subActivityId, subLoginType, buyList[i], awardList);
         if(oneRet){
             retList.push(oneRet);
         }
@@ -167,7 +169,7 @@ async function checkToBuyAll(buyList, activityData){
     return retList;
 }
 
-async function checkToBuyOne(subActivityId, itemName, awardList){
+async function checkToBuyOne(activityId, subActivityId, subLoginType, itemName, awardList){
     let oneRet = null;
     let checkBuyRepeatKey = `lkOfPayBuyItemKey#${itemName}`;
     let nowString = lk.formatDate(new Date(), 'yyyyMMdd');
@@ -185,7 +187,7 @@ async function checkToBuyOne(subActivityId, itemName, awardList){
                 lk.log(`开始尝试抢购-${awardData.prizeName}${awardData.prizeDesc}，价格：${awardData.price}，库存：${awardData.remainStock}`);
                 if(ofpayCheckStockEnable){
                     if(awardData.remainStock > 0){
-                        oneRet = await itemBuyFast(subActivityId, awardData);
+                        oneRet = await itemBuyFast(activityId, subActivityId, subLoginType, awardData);
                         if(oneRet){
                             // 抢购成功
                             lk.setVal(checkBuyRepeatKey, nowString);
@@ -194,7 +196,7 @@ async function checkToBuyOne(subActivityId, itemName, awardList){
                         lk.log(`库存不足，跳过~`);
                     }
                 }else{
-                    oneRet = await itemBuyFast(subActivityId, awardData);
+                    oneRet = await itemBuyFast(activityId, subActivityId, subLoginType, awardData);
                     if(oneRet){
                         // 抢购成功
                         lk.setVal(checkBuyRepeatKey, nowString);
@@ -209,7 +211,7 @@ async function checkToBuyOne(subActivityId, itemName, awardList){
             if(awardData.prizeName.indexOf(itemName) > -1){
                 lk.log(`开始尝试抢购-${awardData.prizeName}${awardData.prizeDesc}，价格：${awardData.price}，库存：${awardData.remainStock}`);
                 if(awardData.remainStock > 0){
-                    oneRet = await itemBuyNormal(subActivityId, awardData);
+                    oneRet = await itemBuyNormal(activityId, subActivityId, subLoginType, awardData);
                     if(oneRet){
                         // 抢购成功
                         lk.setVal(checkBuyRepeatKey, nowString);
@@ -224,18 +226,18 @@ async function checkToBuyOne(subActivityId, itemName, awardList){
     return oneRet;
 }
 
-async function itemBuyNormal(subActivityId, awardData){
-    const activityId = awardData.activityId;
+async function itemBuyNormal(activityId, subActivityId, subLoginType, awardData){
+    // const activityId = awardData.activityId;
     const prizeName = awardData.prizeName;
     let actDataList = await getActivityItems(marketId, activityId, eventVisitorId);
     let theActData = await getActivityData(activityId, eventVisitorId);
     let desInfo = await getDesDecodeInfo(activityId, eventVisitorId);
-    let cateActType = 'choose';
-    if(desInfo){
-        if(desInfo.code == '5'){
-            cateActType = 'subChoose';
-        }
-    }
+    let cateActType = subLoginType;
+    // if(desInfo){
+    //     if(desInfo.code == '5'){
+    //         cateActType = 'subChoose';
+    //     }
+    // }
     for(let i=0; i < actDataList.length; i++){
         const actData = actDataList[i];
         //  'choose' 'subChoose' 'subPre' 'subShare'
@@ -259,10 +261,10 @@ async function itemBuyNormal(subActivityId, awardData){
     const discountPrice = getAwardExpectedDiscount(awardFaceValue, prizeName);
     lk.log(`商品${prizeName}（面值：${awardFaceValue}）\n匹配的最终价格：${awardPrice}\n预设折扣价格：${discountPrice}#${awardId}`);
     if(awardPrice <= discountPrice){
-        let payInfo = await getPayInfo(subActivityId, awardId, '', '', gameAccount, eventVisitorId);
+        let payInfo = await getPayInfo(activityId, awardId, '', '', gameAccount, eventVisitorId);
         if(payInfo){
             if(payInfo.detailId != void 0){
-                let payRet = await pay(subActivityId, eventVisitorId, payInfo.detailId);
+                let payRet = await pay(activityId, eventVisitorId, payInfo.detailId);
                 if(payRet){
                     return awardData;
                 }
@@ -274,14 +276,14 @@ async function itemBuyNormal(subActivityId, awardData){
     return null;
 }
 
-async function itemBuyFast(subActivityId, awardData){
+async function itemBuyFast(activityId, subActivityId, subLoginType, awardData){
     const gameAccount = ofpayAccountPhone;
     const thirdInfo = JSON.parse(awardData.thirdInfo);
     const awardId = awardData.awardId;
-    let payInfo = await getPayInfo(subActivityId, awardId, '', '', gameAccount, eventVisitorId);
+    let payInfo = await getPayInfo(activityId, awardId, '', '', gameAccount, eventVisitorId);
     if(payInfo){
         if(payInfo.detailId != void 0){
-            let payRet = await pay(subActivityId, eventVisitorId, payInfo.detailId);
+            let payRet = await pay(activityId, eventVisitorId, payInfo.detailId);
             if(payRet){
                 return awardData;
             }
@@ -543,13 +545,13 @@ async function getDesDecodeInfo(activityId, eventVisitorId){
     });
 }
 
-async function getPayInfo(subActivityId, awardId, goodsId, invitationCode, gameAccount, eventVisitorId){
+async function getPayInfo(activityId, awardId, goodsId, invitationCode, gameAccount, eventVisitorId){
     return new Promise((resolve, _reject) => {
         try {
             const headers = GCommonHeads;
             headers.Host = 'market-web.ofpay.com';
             const body = ``;
-            const url = `https://${CommonHost}/h5/union/api/draw/interactiveIGoChoose/${subActivityId}?awardId=${awardId}&goodsId=${goodsId}&invitationCode=${invitationCode}&gameAccount=${gameAccount}&eventVisitorId=${eventVisitorId}`;
+            const url = `https://${CommonHost}/h5/union/api/draw/interactiveIGoChoose/${activityId}?awardId=${awardId}&goodsId=${goodsId}&invitationCode=${invitationCode}&gameAccount=${gameAccount}&eventVisitorId=${eventVisitorId}`;
             let options = {
                 url: url,
                 headers: headers,
@@ -590,7 +592,7 @@ async function getPayInfo(subActivityId, awardId, goodsId, invitationCode, gameA
 }
 
 
-async function pay(subActivityId, eventVisitorId, detailId){
+async function pay(activityId, eventVisitorId, detailId){
     return new Promise((resolve, _reject) => {
         try {
             const headers = GCommonHeads;
@@ -603,7 +605,7 @@ async function pay(subActivityId, eventVisitorId, detailId){
                 appVersion: appVersion,
             };
             const body = JSON.stringify(postData);
-            const url = `https://${CommonHost}/h5/api/mobile/activity/pay/${subActivityId}?eventVisitorId=${eventVisitorId}`;
+            const url = `https://${CommonHost}/h5/api/mobile/activity/pay/${activityId}?eventVisitorId=${eventVisitorId}`;
             let options = {
                 url: url,
                 headers: headers,