|
|
@@ -127,9 +127,9 @@ async function tryQuickOrder() {
|
|
|
const seriesId = iData.seriesId;
|
|
|
const price = parseFloat(iData.amount || 99999.99);
|
|
|
if (seriesId == itemId) {
|
|
|
- if (price <= willPrice + priceFloatInterval) {
|
|
|
+ // if (price <= willPrice + priceFloatInterval) {
|
|
|
willBuyList.push(iData);
|
|
|
- }
|
|
|
+ // }
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -141,9 +141,9 @@ async function tryQuickOrder() {
|
|
|
const seriesName = iData.seriesName;
|
|
|
const price = parseFloat(iData.amount || 99999.99);
|
|
|
if (seriesName.indexOf(itemName) > -1) {
|
|
|
- if (price <= willPrice + priceFloatInterval) {
|
|
|
+ // if (price <= willPrice + priceFloatInterval) {
|
|
|
willBuyList.push(iData);
|
|
|
- }
|
|
|
+ // }
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -153,44 +153,47 @@ async function tryQuickOrder() {
|
|
|
}
|
|
|
for (let i = 0; i < willBuyList.length; i++) {
|
|
|
const iData = willBuyList[i];
|
|
|
- magicJS.logger.info(`开始进行【${iData.seriesName}#${iData.amount}】快捷下单`);
|
|
|
- let buyRet = await quickOrder(iData.seriesId, willPrice, iData.seriesType);
|
|
|
- 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);
|
|
|
- let bOpenRet = await browserOpenUrl(paymentInfo);
|
|
|
- let queryData = magicJS.parseQueryStr(paymentInfo);
|
|
|
- let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
|
- let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
|
- 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);
|
|
|
- }
|
|
|
+ await doQuickOrder(iData);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+async function doQuickOrder(iData){
|
|
|
+ magicJS.logger.info(`开始进行【${iData.seriesName}#${iData.amount}】快捷下单`);
|
|
|
+ let buyRet = await quickOrder(iData.seriesId, willPrice, iData.seriesType);
|
|
|
+ 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);
|
|
|
+ let bOpenRet = await browserOpenUrl(paymentInfo);
|
|
|
+ let queryData = magicJS.parseQueryStr(paymentInfo);
|
|
|
+ let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
|
+ let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
|
+ 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}】快捷下单成功，需前往支付！`, '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 {
|
|
|
- magicJS.logger.info(`发生异常或者超时，请重试！`);
|
|
|
+ magicJS.logger.info(buyRet.message);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ magicJS.logger.info(`发生异常或者超时，请重试！`);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
async function tryNormalOrder() {
|
|
|
let itemId = magicJS.data.read(HbcpreConstKey.marketSeriesId, null);
|
|
|
let itemName = magicJS.data.read(HbcpreConstKey.marketSeriesName, null);
|
|
|
@@ -234,46 +237,50 @@ async function tryNormalOrder() {
|
|
|
|
|
|
for (let i = 0; i < willBuyList.length; i++) {
|
|
|
const iData = willBuyList[i];
|
|
|
- magicJS.logger.info(`开始进行【${iData.seriesName}#${iData.amount}】普通下单`);
|
|
|
- let worksItem = await filterStableWorksData(iData.seriesId, willPrice, priceFloatInterval);
|
|
|
- if (worksItem) {
|
|
|
- let buyRet = await normalOrder(worksItem);
|
|
|
- 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);
|
|
|
- let bOpenRet = await browserOpenUrl(paymentInfo);
|
|
|
- let queryData = magicJS.parseQueryStr(paymentInfo);
|
|
|
- let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
|
- let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
|
- 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);
|
|
|
- }
|
|
|
+ await doNormalOrder(iData, willPrice, priceFloatInterval);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+async function doNormalOrder(iData, willPrice, priceFloatInterval){
|
|
|
+ magicJS.logger.info(`开始进行【${iData.seriesName}#${iData.amount}】普通下单`);
|
|
|
+ let worksItem = await filterStableWorksData(iData.seriesId, willPrice, priceFloatInterval);
|
|
|
+ if (worksItem) {
|
|
|
+ let buyRet = await normalOrder(worksItem);
|
|
|
+ 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);
|
|
|
+ let bOpenRet = await browserOpenUrl(paymentInfo);
|
|
|
+ let queryData = magicJS.parseQueryStr(paymentInfo);
|
|
|
+ let cashierInit1 = await yeepayWapRequest(queryData.token, queryData.merchantNo, 'BDbiAXHCpS5A*VlA7eDbTg%3D%3D');
|
|
|
+ let cashierInit2 = await yeepayNewWap(queryData.token);
|
|
|
+ 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}】快捷下单成功，需前往支付！`, '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 {
|
|
|
- magicJS.logger.info(`发生异常或者超时，请重试！`);
|
|
|
+ magicJS.logger.info(buyRet.message);
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
- magicJS.logger.info(`没有匹配符合价格要求的产品`);
|
|
|
+ magicJS.logger.info(`发生异常或者超时，请重试！`);
|
|
|
}
|
|
|
+
|
|
|
+ } else {
|
|
|
+ magicJS.logger.info(`没有匹配符合价格要求的产品`);
|
|
|
}
|
|
|
}
|
|
|
|
shawenguan