feat: 新增合同审查定时任务与积分体系，重构支付模块与余额流水查询

uniCloud-tcb/cloudfunctions/router/service/admin/finance/balance/sys/getActionLog.js

@@ -8,17 +8,15 @@ module.exports = {
      * @param {String} accNo 账号
      * @param {String} reqDate 请求日期，格式：yyyyMMdd
      * @param {String} reqJournalNo 请求流水号
-     * @param {String} logId 可选，流水ID，传入后会回写状态
      */
     main: async (event) => {
         let { data = {}, util } = event;
         let { vk } = util;
-        let { accNo, reqDate, reqJournalNo, logId } = data;
+        let { accNo, reqDate, reqJournalNo } = data;
 
         accNo = String(accNo || '').trim();
         reqDate = String(reqDate || '').trim();
         reqJournalNo = String(reqJournalNo || '').trim();
-        logId = String(logId || '').trim();
 
         if (!accNo) {
             return {
@@ -48,83 +46,43 @@ module.exports = {
             };
         }
 
-        let res = await balanceUtil.requestActionLog({
-            vk,
-            accNo,
-            reqDate,
-            reqJournalNo
+        let res = await vk.request({
+            url: 'http://jjx-union-pay.gxwebsoft.com/api/union-pay-jjx/getActionLog',
+            method: 'POST',
+            dataType: 'json',
+            header: {
+                'content-type': 'application/json; charset=utf-8'
+            },
+            data: {
+                accNo,
+                reqDate,
+                reqJournalNo
+            },
+            timeout: 60000
         });
 
         if (res && typeof res === 'object' && typeof res.code === 'undefined') {
             res.code = 0;
         }
 
-        const status = balanceUtil.getActionStatus(res);
-        const statusText = balanceUtil.getActionStatusTextByStatus(status);
-
-        if (status !== null) {
-            let logInfo = null;
-            if (logId) {
-                logInfo = await vk.baseDao.findByWhereJson({
-                    dbName: 'jjx-balance-log',
-                    whereJson: {
-                        _id: logId
-                    }
-                });
-            }
-            if (!logInfo) {
-                logInfo = await vk.baseDao.findByWhereJson({
-                    dbName: 'jjx-balance-log',
-                    whereJson: {
-                        srcReqId: reqJournalNo,
-                        merchantId: accNo
-                    }
-                });
-            }
-
-            if (logInfo && logInfo._id) {
-                logId = logInfo._id;
-                const prevStatus = Number(logInfo.status);
-                const nextStatus = Number(status);
-                const updateData = {
-                    status: nextStatus
-                };
-
-                // 新提现单（balanceDeducted === false）：成功时再扣减余额缓存
-                // 旧提现单无该字段：创建时已扣减，这里只更新状态
-                const needDeductOnSuccess = logInfo.balanceDeducted === false
-                    && prevStatus === 1
-                    && nextStatus === 2;
-
-                if (needDeductOnSuccess) {
-                    const amount = balanceUtil.normalizeAmount(logInfo.amount);
-                    await balanceUtil.applyMerchantBalanceDelta({
-                        vk,
-                        merchantId: accNo,
-                        delta: -amount,
-                        lastLogId: logId
-                    });
-                    updateData.balanceDeducted = true;
-                }
-
-                await vk.baseDao.updateById({
-                    dbName: 'jjx-balance-log',
-                    id: logId,
-                    dataJson: updateData
-                });
-            }
-        }
-
         const responseObjects = balanceUtil.getRemoteResponseObjects(res);
+        const list = balanceUtil.pickFirstDefined([
+            Array.isArray(res.list) ? res.list : undefined,
+            Array.isArray(res.rows) ? res.rows : undefined,
+            Array.isArray(res.data) ? res.data : undefined,
+            Array.isArray(res.data && res.data.list) ? res.data.list : undefined,
+            Array.isArray(res.data && res.data.rows) ? res.data.rows : undefined,
+            Array.isArray(res.info && res.info.list) ? res.info.list : undefined,
+            Array.isArray(res.info && res.info.rows) ? res.info.rows : undefined,
+            Array.isArray(res.content && res.content.list) ? res.content.list : undefined,
+            Array.isArray(res.content && res.content.rows) ? res.content.rows : undefined
+        ]) || [];
+
         if (responseObjects.data && typeof responseObjects.data === 'object' && !Array.isArray(responseObjects.data)) {
-            responseObjects.data.status = status;
-            responseObjects.data.statusText = statusText;
-            responseObjects.data.logId = logId;
+            responseObjects.data.list = list;
         } else if (res && typeof res === 'object') {
             res.data = {
-                status,
-                statusText,
-                logId
+                list
             };
         }