shawenguan 2 лет назад
Родитель
Сommit
d3c0bc6091
1 измененных файлов с 7 добавлено и 4 удалено
  1. 7 4
      Scripts/gandart/gandartPay.js

+ 7 - 4
Scripts/gandart/gandartPay.js

@@ -102,7 +102,7 @@ async function checkTryPayAll() {
         let orderLst = orderLstInfo.rows;
         if (orderLst.length > 0) {
             for (let info of orderLst) {
-                let isOk = checkPay(info.orderNo, info.orderNum);
+                let isOk = await checkPay(info.orderNo, info.orderNum);
                 if (isOk) {
                     paySuccCnt++;
                 }
@@ -159,6 +159,7 @@ async function getNftOrderList(status, orderType = 0, page = 1, pageSize = 6) {
 }
 
 async function checkPay(orderNum, orderTotal) {
+    let tranWalletList = await transactionWalletList(orderNum);
     let orderInfo = await getOrderEndTime(orderNum);
     if (orderInfo) {
         let endDate = new Date(orderInfo.endDate);
@@ -166,7 +167,6 @@ async function checkPay(orderNum, orderTotal) {
         lk.log(`${new Date().getTime()},${endDate.getTime()}`);
         if (new Date().getTime() < endDate.getTime()) {
             lk.log('开始检查钱包是否匹配支付');
-            let tranWalletList = await transactionWalletList();
             let myWalletList = await getMyWalletListDetail();
             if (tranWalletList && myWalletList) {
                 let isMateWallet = false;
@@ -195,6 +195,8 @@ async function checkPay(orderNum, orderTotal) {
         } else {
             lk.log(`订单[${orderNum}]已超时`);
         }
+    } else {
+        lk.log(`获取订单相关时间信息,发生异常`);
     }
     return false;
 }
@@ -210,7 +212,7 @@ async function getOrderEndTime(orderNum) {
                 headers: headers,
                 body: body
             };
-            lk.log(`请求订单[${body}]支付截止时间`);
+            lk.log(`请求订单[${orderNum}]支付截止时间`);
             lk.post(url, async (error, _response, data) => {
                 let ret;
                 try {
@@ -227,6 +229,7 @@ async function getOrderEndTime(orderNum) {
                         }
                     }
                 } catch (e) {
+                    lk.log(`获取订单支付截止时间发生错误`);
                     lk.logErr(e);
                     lk.execFail();
                 } finally {
@@ -446,7 +449,7 @@ function getPayUrlPath(walletName) {
             path = `${config.WALLET_API}/v2/wallet/sand/pay`;
             break;
         case 'C':
-            path = `${config.WALLET_API}/v2/wallet/kft/pay/kftPay`;
+            path = `${config.WALLET_API}/v2/wallet/kft/pay`;
             break;
         default:
             break;