ts-glitter 20.9.1 → 20.9.3

package/lowcode/Entry.js

@@ -144,7 +144,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_20.9.1';
+            glitter.share.editerVersion = 'V_20.9.3';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -146,7 +146,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_20.9.1';
+      glitter.share.editerVersion = 'V_20.9.3';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "20.9.1",
+  "version": "20.9.3",
   "description": "",
   "main": "index.js",
   "scripts": {

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

@@ -2177,7 +2177,9 @@ class Shopping {
             update.orderData.lineItems = update.orderData.lineItems.filter((item) => item.count > 0);
             this.writeRecord(origin, update);
             const updateData = Object.entries(update).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [key]: typeof value === 'object' ? JSON.stringify(value) : value })), {});
-            await database_js_1.default.query(`UPDATE \`${this.app}\`.t_checkout SET ? WHERE id = ?;
+            await database_js_1.default.query(`UPDATE \`${this.app}\`.t_checkout
+         SET ?
+         WHERE id = ?;
         `, [updateData, origin.id]);
             if (Array.isArray(update.orderData.tags)) {
                 await this.setOrderCustomizeTagConifg(update.orderData.tags);
@@ -2205,26 +2207,39 @@ class Shopping {
                 app_name: this.app,
             });
             const orderCountingSQL = await new user_js_1.User(this.app).getCheckoutCountingModeSQL();
-            const orderCount = await database_js_1.default.query(`SELECT * FROM \`${this.app}\`.t_checkout WHERE id = ? AND ${orderCountingSQL};
+            const orderCount = await database_js_1.default.query(`SELECT *
+         FROM \`${this.app}\`.t_checkout
+         WHERE id = ?
+           AND ${orderCountingSQL};
         `, [origin.id]);
             if (orderCount[0]) {
                 await this.shareVoucherRebate(orderCount[0]);
             }
             const invoiceCountingConfig = await new user_js_1.User(this.app).getInvoiceCountingModeSQL();
-            const invoiceCount = await database_js_1.default.query(`SELECT * FROM \`${this.app}\`.t_checkout WHERE id = ? AND ${invoiceCountingConfig.sql_string};
+            const invoiceCount = await database_js_1.default.query(`SELECT *
+         FROM \`${this.app}\`.t_checkout
+         WHERE id = ?
+           AND ${invoiceCountingConfig.sql_string};
         `, [origin.id]);
             if (invoiceCount[0]) {
                 const cart_token = invoiceCount[0].cart_token;
-                const json = {
-                    tag: 'triggerInvoice',
-                    content: JSON.stringify({ cart_token }),
-                    trigger_time: tool_js_1.default.getCurrentDateTime({
-                        inputDate: new Date().toISOString(),
-                        addSeconds: invoiceCountingConfig.invoice_mode.afterDays * 86400,
-                    }),
-                    status: 0,
-                };
-                await database_js_1.default.query(`INSERT INTO \`${this.app}\`.t_triggers SET ?;`, [json]);
+                const invoice_trigger_exists = await database_js_1.default.query(`select *
+           from \`${this.app}\`.t_triggers
+           where tag = 'triggerInvoice'
+             and content ->>'$.cart_token'='${cart_token}'`, []);
+                if (invoice_trigger_exists.length == 0) {
+                    const json = {
+                        tag: 'triggerInvoice',
+                        content: JSON.stringify({ cart_token }),
+                        trigger_time: tool_js_1.default.getCurrentDateTime({
+                            inputDate: new Date().toISOString(),
+                            addSeconds: invoiceCountingConfig.invoice_mode.afterDays * 86400,
+                        }),
+                        status: 0,
+                    };
+                    await database_js_1.default.query(`INSERT INTO \`${this.app}\`.t_triggers
+             SET ?;`, [json]);
+                }
             }
             return {
                 result: 'success',
@@ -2805,7 +2820,7 @@ class Shopping {
                     resolve({
                         data: data,
                         total: (await database_js_1.default.query(`SELECT count(1)
-                                    FROM (${sql}) as subqyery`, []))[0]['count(1)'],
+                 FROM (${sql}) as subqyery`, []))[0]['count(1)'],
                     });
                 }
             });
@@ -3151,7 +3166,8 @@ class Shopping {
                     insertObj.id = originalVariant.id;
                     sourceMap[originalVariant.id] = originalVariant.id;
                 }
-                const insertData = await database_js_1.default.query(`replace INTO \`${this.app}\`.t_variants
+                const insertData = await database_js_1.default.query(`replace
+          INTO \`${this.app}\`.t_variants
            SET ?
           `, [insertObj]);
                 return insertData;