|
@@ -172,46 +172,46 @@ async function tryGrabNew() {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (buyRet) {
|
|
|
|
|
- if (buyRet.code == 200) {
|
|
|
|
|
- // magicJS.notification.appendNotifyInfo(`🎉产品【${iData.seriesName}】快捷下单成功`);
|
|
|
|
|
- if (buyRet.data.orderId) {
|
|
|
|
|
- let orderInfo = await getOrderDetail(buyRet.data.orderId);
|
|
|
|
|
- let payRet = null;
|
|
|
|
|
- if (orderInfo) {
|
|
|
|
|
- let walletPayInfo = await getPayChannels(1, orderInfo.worksId);
|
|
|
|
|
- payRet = await doOrderPay(walletPayInfo.payType,buyRet.data.orderId);
|
|
|
|
|
- }
|
|
|
|
|
- if (payRet) {
|
|
|
|
|
- let paymentInfo = encodeURI(payRet.paymentInfo);
|
|
|
|
|
- if(checkAllowAutoPay(iData, willPrice)){
|
|
|
|
|
- let browserRet = await openUrlByRemoteBrowser(paymentInfo);
|
|
|
|
|
- // let queryData = magicJS.parseQueryStr(paymentInfo);
|
|
|
|
|
- // let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
|
|
|
- // let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
|
|
|
- if(browserRet && browserRet.code == 200){
|
|
|
|
|
- let queryData = magicJS.parseQueryStr(browserRet.data.url);
|
|
|
|
|
- let paySuccFlag = await doYeepay(queryData.token, parseFloat(iData.pay_price) + priceFloatInterval);
|
|
|
|
|
- if (paySuccFlag) {
|
|
|
|
|
- magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,并支付成功!`);
|
|
|
|
|
- } else {
|
|
|
|
|
- magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, paymentInfo);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (!buyRet) {
|
|
|
|
|
+ magicJS.logger.info(`发生异常或者超时,请重试!`);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (buyRet.code == 200) {
|
|
|
|
|
+ // magicJS.notification.appendNotifyInfo(`🎉产品【${iData.seriesName}】首发下单成功`);
|
|
|
|
|
+ if (buyRet.data.orderId) {
|
|
|
|
|
+ let orderInfo = await getOrderDetail(buyRet.data.orderId);
|
|
|
|
|
+ let payRet = null;
|
|
|
|
|
+ if (orderInfo) {
|
|
|
|
|
+ let walletPayInfo = await getPayChannels(1, orderInfo.worksId);
|
|
|
|
|
+ payRet = await doOrderPay(walletPayInfo.payType,buyRet.data.orderId);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (payRet) {
|
|
|
|
|
+ let paymentInfo = encodeURI(payRet.paymentInfo);
|
|
|
|
|
+ if(checkAllowAutoPay(iData, willPrice)){
|
|
|
|
|
+ let browserRet = await openUrlByRemoteBrowser(paymentInfo);
|
|
|
|
|
+ // let queryData = magicJS.parseQueryStr(paymentInfo);
|
|
|
|
|
+ // let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
|
|
|
+ // let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
|
|
|
+ if(browserRet && browserRet.code == 200){
|
|
|
|
|
+ let queryData = magicJS.parseQueryStr(browserRet.data.url);
|
|
|
|
|
+ let paySuccFlag = await doYeepay(queryData.token, parseFloat(iData.pay_price) + priceFloatInterval);
|
|
|
|
|
+ if (paySuccFlag) {
|
|
|
|
|
+ magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】首发下单成功,并支付成功!`);
|
|
|
} else {
|
|
} else {
|
|
|
- magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, paymentInfo);
|
|
|
|
|
|
|
+ magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】首发下单成功,需前往支付!`, paymentInfo);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, paymentInfo);
|
|
|
|
|
|
|
+ magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】首发下单成功,需前往支付!`, paymentInfo);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】快捷下单成功,需前往支付!`, 'https://luanshu.hbcpre.com/order/ls/?id=2');
|
|
|
|
|
|
|
+ magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】首发下单成功,需前往支付!`, paymentInfo);
|
|
|
}
|
|
}
|
|
|
|
|
+ } else {
|
|
|
|
|
+ magicJS.notification.post(scriptName, "", `🎉产品【${iData.seriesName}】首发下单成功,需前往支付!`, 'https://luanshu.hbcpre.com/order/ls/?id=2');
|
|
|
}
|
|
}
|
|
|
- } else {
|
|
|
|
|
- magicJS.logger.info(buyRet.message);
|
|
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- magicJS.logger.info(`发生异常或者超时,请重试!`);
|
|
|
|
|
|
|
+ magicJS.logger.info(buyRet.message);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|