|
@@ -227,7 +227,7 @@ async function checkToBuyOne(activityId, subActivityId, subLoginType, itemName,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async function itemBuyNormal(activityId, subActivityId, subLoginType, awardData){
|
|
async function itemBuyNormal(activityId, subActivityId, subLoginType, awardData){
|
|
|
- // const activityId = awardData.activityId;
|
|
|
|
|
|
|
+ activityId = awardData.activityId;
|
|
|
const prizeName = awardData.prizeName;
|
|
const prizeName = awardData.prizeName;
|
|
|
let actDataList = await getActivityItems(marketId, activityId, eventVisitorId);
|
|
let actDataList = await getActivityItems(marketId, activityId, eventVisitorId);
|
|
|
let theActData = await getActivityData(activityId, eventVisitorId);
|
|
let theActData = await getActivityData(activityId, eventVisitorId);
|
|
@@ -261,6 +261,7 @@ async function itemBuyNormal(activityId, subActivityId, subLoginType, awardData)
|
|
|
const discountPrice = getAwardExpectedDiscount(awardFaceValue, prizeName);
|
|
const discountPrice = getAwardExpectedDiscount(awardFaceValue, prizeName);
|
|
|
lk.log(`商品${prizeName}(面值:${awardFaceValue})\n匹配的最终价格:${awardPrice}\n预设折扣价格:${discountPrice}#${awardId}`);
|
|
lk.log(`商品${prizeName}(面值:${awardFaceValue})\n匹配的最终价格:${awardPrice}\n预设折扣价格:${discountPrice}#${awardId}`);
|
|
|
if(awardPrice <= discountPrice){
|
|
if(awardPrice <= discountPrice){
|
|
|
|
|
+ activityId = awardData.activityId;
|
|
|
let payInfo = await getPayInfo(activityId, awardId, '', '', gameAccount, eventVisitorId);
|
|
let payInfo = await getPayInfo(activityId, awardId, '', '', gameAccount, eventVisitorId);
|
|
|
if(payInfo){
|
|
if(payInfo){
|
|
|
if(payInfo.detailId != void 0){
|
|
if(payInfo.detailId != void 0){
|
|
@@ -277,6 +278,7 @@ async function itemBuyNormal(activityId, subActivityId, subLoginType, awardData)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async function itemBuyFast(activityId, subActivityId, subLoginType, awardData){
|
|
async function itemBuyFast(activityId, subActivityId, subLoginType, awardData){
|
|
|
|
|
+ activityId = awardData.activityId;
|
|
|
const gameAccount = ofpayAccountPhone;
|
|
const gameAccount = ofpayAccountPhone;
|
|
|
const thirdInfo = JSON.parse(awardData.thirdInfo);
|
|
const thirdInfo = JSON.parse(awardData.thirdInfo);
|
|
|
const awardId = awardData.awardId;
|
|
const awardId = awardData.awardId;
|