ts-glitter 22.4.0 → 22.4.4

package/src/api-public/services/schedule.ts

@@ -92,7 +92,7 @@ export class Schedule {
                                     AND created_time < NOW() - INTERVAL ${config.auto_cancel_order_timer} HOUR
                  AND (orderData->>'$.proof_purchase' IS NULL)
                ORDER BY id DESC;`,
-              []
+              [],
             );
             await Promise.all(
               orders.map(async (order: any) => {
@@ -103,7 +103,7 @@ export class Schedule {
                   orderData: order.orderData,
                   status: '0',
                 });
-              })
+              }),
             );
           }
         }
@@ -125,7 +125,7 @@ export class Schedule {
             const users = await db.query(
               `select *
                from \`${app}\`.t_user  `,
-              []
+              [],
             );
             for (const user of users) {
               //更新會籍
@@ -181,7 +181,7 @@ export class Schedule {
                 `SELECT *
                  FROM \`${app}\`.t_user
                  WHERE MONTH (JSON_EXTRACT(userData, '$.birth')) = MONTH (CURDATE());`,
-                []
+                [],
               );
 
               if (rgs.type === 'base') {
@@ -197,7 +197,7 @@ export class Schedule {
                 const usersLevel = await userClass.getUserLevel(
                   users.map((item: { userID: number }) => {
                     return { userId: item.userID };
-                  })
+                  }),
                 );
                 for (const user of users) {
                   const member = usersLevel.find(item => item.id == user.userID);
@@ -246,7 +246,7 @@ export class Schedule {
               `SELECT *
                FROM \`${app}\`.t_user
                WHERE MONTH (JSON_EXTRACT(userData, '$.birth')) = MONTH (CURDATE());`,
-              []
+              [],
             );
 
             // 篩選出一年內曾寄信過的顧客
@@ -316,7 +316,7 @@ export class Schedule {
              WHERE tag = 'triggerInvoice'
                AND status = 0
                AND DATE_FORMAT(trigger_time, '%Y-%m-%d %H') = DATE_FORMAT(NOW(), '%Y-%m-%d %H');`,
-            []
+            [],
           );
           for (const order of orders) {
             if (order.content.cart_token) {
@@ -344,7 +344,7 @@ export class Schedule {
              WHERE tag = 'sendFCM'
                AND status = 0
                AND DATE_FORMAT(trigger_time, '%Y-%m-%d %H:%i') = DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i');`,
-            []
+            [],
           );
           for (const email of emails) {
             if (email.status === 0) {
@@ -373,7 +373,7 @@ export class Schedule {
              WHERE tag = 'sendMailBySchedule'
                AND status = 0
                AND DATE_FORMAT(trigger_time, '%Y-%m-%d %H:%i') = DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i');`,
-            []
+            [],
           );
           for (const email of emails) {
             if (email.status === 0) {
@@ -400,7 +400,7 @@ export class Schedule {
              FROM \`${app}\`.t_triggers
              WHERE tag = 'sendLineBySchedule'
                AND DATE_FORMAT(trigger_time, '%Y-%m-%d %H:%i') = DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i');`,
-            []
+            [],
           );
 
           for (const email of emails) {
@@ -412,7 +412,7 @@ export class Schedule {
                     text: email.content,
                   },
                 },
-                email.id
+                email.id,
               );
             }
           }
@@ -442,7 +442,7 @@ export class Schedule {
           `select count(1)
            from \`${saasConfig.SAAS_NAME}\`.currency_config
            where updated = '${date_index}'`,
-          []
+          [],
         )
       )[0]['count(1)'] === 0
     ) {
@@ -459,7 +459,7 @@ export class Schedule {
           await db.query(
             `insert into \`${saasConfig.SAAS_NAME}\`.currency_config (\`json\`, updated)
              values (?, ?)`,
-            [JSON.stringify(response.data), date_index]
+            [JSON.stringify(response.data), date_index],
           );
           setTimeout(() => this.currenciesUpdate(sec), sec * 1000);
         })
@@ -489,15 +489,21 @@ export class Schedule {
              FROM ${process.env.GLITTER_DB}.t_monitor
              WHERE app_name = ${db.escape(app)}
                AND req_type = 'file'
-               and CONVERT_TZ(created_time, '+00:00', '+08:00') BETWEEN
-                 (CONVERT_TZ(CURDATE(), '+00:00', '+08:00'))
-               and (CONVERT_TZ(CURDATE(), '+00:00', '+08:00') +  INTERVAL 1 DAY);`,
-            []
+               and CONVERT_TZ(created_time
+                 , '+00:00'
+                 , '+08:00') BETWEEN
+                 (CONVERT_TZ(CURDATE()
+                 , '+00:00'
+                 , '+08:00'))
+               and (CONVERT_TZ(CURDATE()
+                 , '+00:00'
+                 , '+08:00') + INTERVAL 1 DAY);`,
+            [],
           );
           await db.query(
             `replace
-          into \`${app}\`.visit_logs (date, count,tag_name) values (?, ? , ?)`,
-            [count[0]['now'], count[0]['count'], `${count[0]['now'].toISOString()}`.substring(0, 10)]
+            into \`${app}\`.visit_logs (date, count,tag_name) values (?, ? , ?)`,
+            [count[0]['now'], count[0]['count'], `${count[0]['now'].toISOString()}`.substring(0, 10)],
           );
         }
       } catch (e) {
@@ -532,36 +538,62 @@ export class Schedule {
                 return dd[key];
               });
             })
-            .flat()
+            .flat(),
         );
       }
       Monitor.insert_stack.splice(0, readAdd.length);
       setTimeout(() => this.insertHistory(sec), sec * 1000);
       console.log(`insertHistory-Stop`, (new Date().getTime() - clock.getTime()) / 1000);
-    } catch (e) {}
+    } catch (e) {
+    }
+  }
+
+  async insertOnlineTime(sec: number) {
+    let clock = new Date();
+    try {
+      console.log(`insertOnlineTime`);
+      for (const key in Monitor.online_time) {
+        const updateID=Monitor.online_time[key];
+        if(!updateID.length) {continue}
+        Monitor.online_time[key]=[];
+        await db.query(
+          `update \`${key}\`.t_user
+             set online_time=NOW()
+             where userID in (${[...new Set(updateID)].join(',')})`,
+          []
+        );
+      }
+      setTimeout(() => this.insertOnlineTime(sec), sec * 1000);
+      console.log(`insertOnlineTime-Stop`, (new Date().getTime() - clock.getTime()) / 1000);
+    } catch (e) {
+      console.log(e)
+      setTimeout(() => this.insertOnlineTime(sec), sec * 1000);
+    }
   }
 
   main() {
     const scheduleList: ScheduleItem[] = ConfigSetting.is_local
       ? //線下測試環境
-        [{ second: 2 * 10, status: true, func: 'insertHistory', desc: '插入瀏覽筆數' }]
+      [{ second: 10, status: true, func: 'insertHistory', desc: '插入瀏覽筆數' },
+        { second: 5 , status: true, func: 'insertOnlineTime', desc: '上線時間' }]
       : //線上環境
-        [
-          // { second: 10, status: false, func: 'example', desc: '排程啟用範例' },
-          { second: 3600, status: true, func: 'birthRebate', desc: '生日禮發放購物金' },
-          { second: 3600, status: true, func: 'birthBlessMail', desc: '生日祝福信件' },
-          { second: 600, status: true, func: 'renewMemberLevel', desc: '更新會員分級' },
-          { second: 30, status: true, func: 'resetVoucherHistory', desc: '未付款歷史優惠券重設' },
-          { second: 30, status: true, func: 'autoSendMail', desc: '自動排程寄送信件' },
-          { second: 30, status: true, func: 'autoSendFCM', desc: '自動排程寄送FCM' },
-          { second: 30, status: true, func: 'autoSendLine', desc: '自動排程寄送line訊息' },
-          { second: 3600 * 24, status: true, func: 'currenciesUpdate', desc: '多國貨幣的更新排程' },
-          // { second: 3600 * 24, status: false, func: 'initialSampleApp', desc: '重新刷新示範商店' },
-          { second: 30 * 100, status: true, func: 'autoCancelOrder', desc: '自動取消未付款未出貨訂單' },
-          { second: 30, status: true, func: 'autoTriggerInvoice', desc: '自動開立發票' },
-          { second: 60 * 5, status: true, func: 'visitLogs', desc: '更新每天造訪人數' },
-          { second: 5 * 10, status: true, func: 'insertHistory', desc: '插入瀏覽筆數' },
-        ];
+      [
+        // { second: 10, status: false, func: 'example', desc: '排程啟用範例' },
+        { second: 3600, status: true, func: 'birthRebate', desc: '生日禮發放購物金' },
+        { second: 3600, status: true, func: 'birthBlessMail', desc: '生日祝福信件' },
+        { second: 600, status: true, func: 'renewMemberLevel', desc: '更新會員分級' },
+        { second: 30, status: true, func: 'resetVoucherHistory', desc: '未付款歷史優惠券重設' },
+        { second: 30, status: true, func: 'autoSendMail', desc: '自動排程寄送信件' },
+        { second: 30, status: true, func: 'autoSendFCM', desc: '自動排程寄送FCM' },
+        { second: 30, status: true, func: 'autoSendLine', desc: '自動排程寄送line訊息' },
+        { second: 3600 * 24, status: true, func: 'currenciesUpdate', desc: '多國貨幣的更新排程' },
+        // { second: 3600 * 24, status: false, func: 'initialSampleApp', desc: '重新刷新示範商店' },
+        { second: 30 * 100, status: true, func: 'autoCancelOrder', desc: '自動取消未付款未出貨訂單' },
+        { second: 30, status: true, func: 'autoTriggerInvoice', desc: '自動開立發票' },
+        { second: 60 * 5, status: true, func: 'visitLogs', desc: '更新每天造訪人數' },
+        { second: 10, status: true, func: 'insertHistory', desc: '插入瀏覽筆數' },
+        { second: 5, status: true, func: 'insertOnlineTime', desc: '上線時間' },
+      ];
     try {
       scheduleList.forEach(schedule => {
         if (schedule.status && typeof this[schedule.func] === 'function') {

package/src/api-public/services/user.js

@@ -450,9 +450,9 @@ class User {
               or (userData ->>'$.lineID' = ?)
               or (userData ->>'$.phone' = ?)
            ORDER BY CASE
-                        WHEN (userData ->>'$.lineID' = ?) THEN 1
-                        ELSE 3
-                        END
+                      WHEN (userData ->>'$.lineID' = ?) THEN 1
+                      ELSE 3
+                      END
           `, [line_profile.email, userData.sub, (_a = line_profile.phone_number) !== null && _a !== void 0 ? _a : 'alkms', userData.sub]));
             }
             let findList = await getUsData();
@@ -468,7 +468,7 @@ class User {
                         name: userData.name || '未命名',
                         lineID: userData.sub,
                         email: line_profile.email,
-                        phone: line_profile.phone
+                        phone: line_profile.phone,
                     },
                     1,
                 ]);
@@ -1016,22 +1016,22 @@ class User {
         const limitClause = obj.page !== undefined && obj.limit !== undefined ? `LIMIT ${obj.page * obj.limit}, ${obj.limit}` : '';
         const orderCountingSQL = await this.getCheckoutCountingModeSQL();
         const sql = `
-        SELECT ${obj.select}
-        FROM (SELECT email,
-                     COUNT(*)   AS order_count,
-                     SUM(total) AS total_amount
-              FROM \`${this.app}\`.t_checkout
-              WHERE ${orderCountingSQL}
-              GROUP BY email) AS o
-                 RIGHT JOIN \`${this.app}\`.t_user u ON o.email = u.account
-                 LEFT JOIN (SELECT email,
-                                   total        AS last_order_total,
-                                   created_time AS last_order_time,
-                                   ROW_NUMBER()    OVER(PARTITION BY email ORDER BY created_time DESC) AS rn
-                            FROM \`${this.app}\`.t_checkout
-                            WHERE ${orderCountingSQL}) AS lo ON o.email = lo.email AND lo.rn = 1
-        WHERE (${whereClause})
-        ORDER BY ${orderByClause} ${limitClause}
+      SELECT ${obj.select}
+      FROM (SELECT email,
+                   COUNT(*)   AS order_count,
+                   SUM(total) AS total_amount
+            FROM \`${this.app}\`.t_checkout
+            WHERE ${orderCountingSQL}
+            GROUP BY email) AS o
+             RIGHT JOIN \`${this.app}\`.t_user u ON o.email = u.account
+             LEFT JOIN (SELECT email,
+                               total        AS last_order_total,
+                               created_time AS last_order_time,
+                               ROW_NUMBER()    OVER(PARTITION BY email ORDER BY created_time DESC) AS rn
+                        FROM \`${this.app}\`.t_checkout
+                        WHERE ${orderCountingSQL}) AS lo ON o.email = lo.email AND lo.rn = 1
+      WHERE (${whereClause})
+      ORDER BY ${orderByClause} ${limitClause}
     `;
         return sql;
     }
@@ -1417,7 +1417,7 @@ class User {
             if (pass('subscriber')) {
                 const subscriberList = await database_1.default.query(`SELECT DISTINCT u.userID, s.email
            FROM \`${this.app}\`.t_subscribe AS s
-                    LEFT JOIN
+                  LEFT JOIN
                 \`${this.app}\`.t_user AS u ON s.email = JSON_EXTRACT(u.userData, '$.email');`, []);
                 dataList.push({ type: 'subscriber', title: '電子郵件訂閱者', users: subscriberList });
             }
@@ -1425,7 +1425,7 @@ class User {
                 const buyingList = [];
                 const buyingData = await database_1.default.query(`SELECT u.userID, c.email, JSON_UNQUOTE(JSON_EXTRACT(c.orderData, '$.email')) AS order_email
            FROM \`${this.app}\`.t_checkout AS c
-                    JOIN
+                  JOIN
                 \`${this.app}\`.t_user AS u ON c.email = JSON_EXTRACT(u.userData, '$.email')
            WHERE c.status = 1;`, []);
                 buyingData.map((item1) => {
@@ -1467,22 +1467,15 @@ class User {
                         users: [],
                     });
                 }
-                const users = await database_1.default.query(`SELECT userID
-           FROM \`${this.app}\`.t_user;`, []);
-                const levelItems = await this.getUserLevel(users.map((item) => {
-                    return { userId: item.userID };
-                }));
-                for (const levelItem of levelItems) {
-                    const n = dataList.findIndex(item => item.tag === levelItem.data.id);
-                    if (n > -1) {
-                        dataList[n].users.push({
-                            userID: levelItem.id,
-                            email: levelItem.email,
-                            count: 0,
-                        });
-                    }
-                }
             }
+            await Promise.all(dataList.map(async (item) => {
+                return new Promise(async (resolve, reject) => {
+                    item.users = await database_1.default.query(`select userID, email
+                                       from \`${this.app}\`.t_user
+                                       where member_level = ${database_1.default.escape(item.tag)}`, []);
+                    resolve(true);
+                });
+            }));
             if (type) {
                 dataList = dataList.filter(item => type.includes(item.type));
             }
@@ -1543,10 +1536,10 @@ class User {
                     const slice = idList.slice(i, i + batchSize);
                     const placeholders = slice.map(() => '?').join(',');
                     const query = `
-              SELECT *
-              FROM \`${this.app}\`.t_user_public_config
-              WHERE \`key\` = 'member_update'
-                AND user_id IN (${placeholders});
+            SELECT *
+            FROM \`${this.app}\`.t_user_public_config
+            WHERE \`key\` = 'member_update'
+              AND user_id IN (${placeholders});
           `;
                     batches.push({ query, params: slice });
                 }
@@ -1587,7 +1580,7 @@ class User {
         }
         if (quickPass) {
             const index = user.member_level ? levelList.findIndex((level) => level.id === user.member_level) : 0;
-            const getLevel = levelList[index];
+            const getLevel = levelList[index] || normalMember;
             const formatData = {
                 id: getLevel.id,
                 og: {
@@ -1640,10 +1633,10 @@ class User {
             .map(item => `"${item.email}"`)
             .concat(['-1111']);
         const users = await database_1.default.query(`
-          SELECT *
-          FROM \`${this.app}\`.t_user
-          WHERE userID in (${idList.join(',')})
-             OR email in (${emailList.join(',')})
+        SELECT *
+        FROM \`${this.app}\`.t_user
+        WHERE userID in (${idList.join(',')})
+           OR email in (${emailList.join(',')})
       `, []);
         if (!users || users.length == 0)
             return [];
@@ -1724,16 +1717,16 @@ class User {
             }
             const subData = await database_1.default.query(`SELECT s.*, u.account
          FROM \`${this.app}\`.t_subscribe AS s
-                  LEFT JOIN \`${this.app}\`.t_user AS u
-                            ON s.email = u.account
+                LEFT JOIN \`${this.app}\`.t_user AS u
+                          ON s.email = u.account
          WHERE ${querySql.length > 0 ? querySql.join(' AND ') : '1 = 1'} LIMIT ${query.page * query.limit}
              , ${query.limit}
 
         `, []);
             const subTotal = await database_1.default.query(`SELECT count(*) as c
          FROM \`${this.app}\`.t_subscribe AS s
-                  LEFT JOIN \`${this.app}\`.t_user AS u
-                            ON s.email = u.account
+                LEFT JOIN \`${this.app}\`.t_user AS u
+                          ON s.email = u.account
          WHERE ${querySql.length > 0 ? querySql.join(' AND ') : '1 = 1'}
 
         `, []);
@@ -2061,9 +2054,9 @@ class User {
         try {
             if (user_id_and_account.includes('@')) {
                 await database_1.default.query(`update \`${this.app}\`.t_user
-         SET ?
-         WHERE 1 = 1
-           and ((userData ->>'$.email' = ?))`, [
+           SET ?
+           WHERE 1 = 1
+             and ((userData ->>'$.email' = ?))`, [
                     {
                         pwd: await tool_1.default.hashPwd(newPwd),
                     },
@@ -2072,9 +2065,9 @@ class User {
             }
             else {
                 await database_1.default.query(`update \`${this.app}\`.t_user
-         SET ?
-         WHERE 1 = 1
-           and ((userData ->>'$.phone' = ?))`, [
+           SET ?
+           WHERE 1 = 1
+             and ((userData ->>'$.phone' = ?))`, [
                     {
                         pwd: await tool_1.default.hashPwd(newPwd),
                     },
@@ -2331,7 +2324,7 @@ class User {
                     });
                 }
             })();
-            if ((typeof return_Data === 'string')) {
+            if (typeof return_Data === 'string') {
                 return JSON.parse(return_Data);
             }
             return return_Data;
@@ -2445,14 +2438,14 @@ class User {
             const result = await database_1.default.query(`select count(1)
          from ${process_1.default.env.GLITTER_DB}.app_config
          where (appName = ?
-             and user = ?)
+           and user = ?)
             OR appName in (
-             (SELECT appName
-              FROM \`${config_1.saasConfig.SAAS_NAME}\`.app_auth_config
-              WHERE user = ?
-                AND status = 1
-                AND invited = 1
-                AND appName = ?));`, [this.app, (_a = this.token) === null || _a === void 0 ? void 0 : _a.userID, (_b = this.token) === null || _b === void 0 ? void 0 : _b.userID, this.app]);
+           (SELECT appName
+            FROM \`${config_1.saasConfig.SAAS_NAME}\`.app_auth_config
+            WHERE user = ?
+              AND status = 1
+              AND invited = 1
+              AND appName = ?));`, [this.app, (_a = this.token) === null || _a === void 0 ? void 0 : _a.userID, (_b = this.token) === null || _b === void 0 ? void 0 : _b.userID, this.app]);
             return {
                 result: result[0]['count(1)'] === 1,
             };