ts-glitter 21.0.4 → 21.0.5

package/src/api-public/services/interface/payment-keys-interface.d.ts

@@ -0,0 +1,37 @@
+export interface EcEzPayKeyData {
+    HASH_IV: string;
+    HASH_KEY: string;
+    ActionURL: string;
+    NotifyURL: string;
+    ReturnURL: string;
+    MERCHANT_ID: string;
+    TYPE: 'ecPay';
+}
+export interface PayPalKeyData {
+    NotifyURL: string;
+    ReturnURL: string;
+    PAYPAL_CLIENT_ID: string;
+    PAYPAL_SECRET: string;
+    TYPE: 'PayPal';
+    BETA: string;
+}
+export interface LinePayKeyData {
+    BETA: string;
+    CLIENT_ID: string;
+    SECRET: string;
+    ReturnURL: string;
+}
+export interface JkoPayKeyData {
+    API_KEY: string;
+    NotifyURL: string;
+    ReturnURL: string;
+    SECRET_KEY: string;
+    STORE_ID: string;
+}
+export interface PayNowKeyData {
+    PublicKey: string;
+    PrivateKey: string;
+    ReturnURL: string;
+    NotifyURL: string;
+    BETA: string;
+}

package/src/api-public/services/interface/payment-keys-interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=payment-keys-interface.js.map

package/src/api-public/services/interface/payment-keys-interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"payment-keys-interface.js","sourceRoot":"","sources":["payment-keys-interface.ts"],"names":[],"mappings":""}

package/src/api-public/services/interface/payment-keys-interface.ts

@@ -0,0 +1,46 @@
+// EcPay / EzPay (藍新) 可能需要的金鑰
+export interface EcEzPayKeyData {
+  HASH_IV: string,
+  HASH_KEY: string,
+  ActionURL: string,
+  NotifyURL: string,
+  ReturnURL: string,
+  MERCHANT_ID: string,
+  TYPE: 'ecPay' ,
+}
+
+// PayPal 需要的金鑰
+export interface PayPalKeyData {
+  NotifyURL: string,
+  ReturnURL: string,
+  PAYPAL_CLIENT_ID: string,
+  PAYPAL_SECRET: string,
+  TYPE: 'PayPal',
+  BETA: string,
+}
+
+// Line Pay 需要的金鑰
+export interface LinePayKeyData {
+  BETA: string,
+  CLIENT_ID: string,
+  SECRET: string,
+  ReturnURL: string,
+}
+
+// JKO Pay 需要的金鑰
+export interface JkoPayKeyData {
+  API_KEY: string,
+  NotifyURL: string,
+  ReturnURL: string,
+  SECRET_KEY: string,
+  STORE_ID: string,
+}
+
+// PayNow (立吉付) 需要的金鑰
+export interface PayNowKeyData {
+  PublicKey:string,
+  PrivateKey:string,
+  ReturnURL:string,
+  NotifyURL:string,
+  BETA:string
+}

package/src/api-public/services/interface/payment-strategy-interface.d.ts

@@ -0,0 +1,17 @@
+import { Cart } from '../shopping.js';
+export interface PaymentResult {
+    form?: string;
+    orderId?: string;
+    approveLink?: string;
+    responseData?: any;
+    off_line?: boolean;
+    error?: string;
+}
+export interface PaymentConfig {
+    app: string;
+    id: string;
+    domain: string;
+}
+export interface IPaymentStrategy {
+    initiatePayment(orderData: Cart, config: PaymentConfig): Promise<PaymentResult>;
+}

package/src/api-public/services/interface/payment-strategy-interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=payment-strategy-interface.js.map

package/src/api-public/services/interface/payment-strategy-interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"payment-strategy-interface.js","sourceRoot":"","sources":["payment-strategy-interface.ts"],"names":[],"mappings":""}

package/src/api-public/services/interface/payment-strategy-interface.ts

@@ -0,0 +1,48 @@
+import { Cart } from '../shopping.js';
+import { KeyData } from '../financial-serviceV2.js';
+
+// export interface KeyData {
+//   MERCHANT_ID: string;
+//   HASH_KEY: string;
+//   HASH_IV: string;
+//   NotifyURL: string;
+//   ReturnURL: string;
+//   ActionURL: string;
+//   TYPE: string;
+//   CreditCheckCode?: string;
+// }
+
+/**
+ * 定義支付策略執行後的回傳結果結構
+ */
+export interface PaymentResult {
+  form?: string;         // For EcPay, EzPay HTML form string
+  orderId?:string;       // For PayPal redirect link
+  approveLink?:string;   // For PayPal redirect link
+  responseData?: any;    // For LinePay, JKOpay API response
+  off_line?: boolean;    // Flag for offline payment
+  error?: string;        // Optional error message
+}
+
+/**
+ * 定義傳遞給策略的通用設定物件結構
+ */
+export interface PaymentConfig {
+  app: string;              // App 名稱/ID
+  id: string;               // 產生的 redirect id (用於 ReturnURL)
+  domain: string;           // process.env.DOMAIN
+//   這裡還有line jko...的方式
+}
+
+/**
+ * 定義支付策略的通用介面 (合約)
+ */
+export interface IPaymentStrategy {
+  /**
+   * 啟動支付流程
+   * @param orderData - 訂單相關資料 (建議使用更精確的型別取代 any)
+   * @param config - 通用的支付設定檔
+   * @returns 一個 Promise，解析後為標準化的 PaymentResult
+   */
+  initiatePayment(orderData: Cart, config: PaymentConfig): Promise<PaymentResult>;
+}

package/src/api-public/services/migrate-event/public-user-config.d.ts

@@ -0,0 +1,5 @@
+export declare class MigratePublicUserConfig {
+    app_name: string;
+    constructor(app_name: string);
+    setLogisticsGroup(): Promise<void>;
+}

package/src/api-public/services/migrate-event/public-user-config.js

@@ -0,0 +1,81 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MigratePublicUserConfig = void 0;
+const database_js_1 = __importDefault(require("../../../modules/database.js"));
+const tool_js_1 = __importDefault(require("../../../modules/tool.js"));
+const user_js_1 = require("../user.js");
+class MigratePublicUserConfig {
+    constructor(app_name) {
+        this.app_name = app_name;
+    }
+    async setLogisticsGroup() {
+        var _a;
+        const app_name = this.app_name;
+        function compareArray(arr1, arr2) {
+            const slice1 = arr1.slice().sort();
+            const slice2 = arr2.slice().sort();
+            if (slice1.length !== slice2.length)
+                return false;
+            for (let i = 0; i < slice1.length; i++) {
+                if (slice1[i] !== slice2[i])
+                    return false;
+            }
+            return true;
+        }
+        const publicConfigResult = await database_js_1.default.query(`SELECT * FROM \`${app_name}\`.t_user_public_config WHERE \`key\` = 'logistics_group'
+      `, []);
+        if (publicConfigResult.length > 0) {
+            return;
+        }
+        const getData = await database_js_1.default.query(`
+        SELECT GROUP_CONCAT(DISTINCT JSON_UNQUOTE(JSON_EXTRACT(content, '$.designated_logistics.list')) SEPARATOR ',') 
+          AS unique_tags
+        FROM \`${app_name}\`.t_manager_post
+        WHERE JSON_UNQUOTE(JSON_EXTRACT(content, '$.designated_logistics')) IS NOT NULL;
+      `, []);
+        const unique_tags_string = (_a = getData[0].unique_tags) !== null && _a !== void 0 ? _a : '';
+        const unique_tags_json = JSON.parse(`[${unique_tags_string}]`);
+        const unique_tags_array = Array.isArray(unique_tags_json) ? unique_tags_json : [];
+        const groupArray = [];
+        unique_tags_array.map(list => {
+            if (list.length > 0) {
+                const isUnique = groupArray.every(group => !compareArray(group.list, list));
+                if (isUnique) {
+                    groupArray.push({
+                        key: tool_js_1.default.randomString(8),
+                        name: `物流組合${groupArray.length + 1}`,
+                        list: list,
+                    });
+                }
+            }
+        });
+        await new user_js_1.User(app_name).setConfig({
+            key: 'logistics_group',
+            user_id: 'manager',
+            value: groupArray,
+        });
+        const getProductList = await database_js_1.default.query(`
+        SELECT * FROM \`${app_name}\`.t_manager_post
+        WHERE JSON_UNQUOTE(JSON_EXTRACT(content, '$.designated_logistics')) IS NOT NULL;
+      `, []);
+        for (const product of getProductList) {
+            const data = product.content.designated_logistics;
+            if (!data.group && data.type === 'designated') {
+                const findGroup = groupArray.find(group => compareArray(group.list, data.list));
+                if (findGroup) {
+                    data.group = [findGroup.key];
+                    const updateResult = await database_js_1.default.query(`UPDATE \`${app_name}\`.t_manager_post SET ? WHERE id = ?
+            `, [{ content: JSON.stringify(product.content) }, product.id]);
+                    if (updateResult.affectedRows === 0) {
+                        console.error(`Product with ID ${product.id} not found.`);
+                    }
+                }
+            }
+        }
+    }
+}
+exports.MigratePublicUserConfig = MigratePublicUserConfig;
+//# sourceMappingURL=public-user-config.js.map

package/src/api-public/services/migrate-event/public-user-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public-user-config.js","sourceRoot":"","sources":["public-user-config.ts"],"names":[],"mappings":"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"}

package/src/api-public/services/migrate-event/public-user-config.ts

@@ -0,0 +1,106 @@
+import db from '../../../modules/database.js';
+import tool from '../../../modules/tool.js';
+import { User } from '../user.js';
+
+export class MigratePublicUserConfig {
+  app_name: string;
+
+  constructor(app_name: string) {
+    this.app_name = app_name;
+  }
+
+  async setLogisticsGroup() {
+    const app_name = this.app_name;
+
+    function compareArray(arr1: string[], arr2: string[]) {
+      const slice1 = arr1.slice().sort();
+      const slice2 = arr2.slice().sort();
+      if (slice1.length !== slice2.length) return false;
+
+      for (let i = 0; i < slice1.length; i++) {
+        if (slice1[i] !== slice2[i]) return false;
+      }
+
+      return true;
+    }
+
+    const publicConfigResult = await db.query(
+      `SELECT * FROM \`${app_name}\`.t_user_public_config WHERE \`key\` = 'logistics_group'
+      `,
+      []
+    );
+
+    if (publicConfigResult.length > 0) {
+      return;
+    }
+
+    const getData = await db.query(
+      `
+        SELECT GROUP_CONCAT(DISTINCT JSON_UNQUOTE(JSON_EXTRACT(content, '$.designated_logistics.list')) SEPARATOR ',') 
+          AS unique_tags
+        FROM \`${app_name}\`.t_manager_post
+        WHERE JSON_UNQUOTE(JSON_EXTRACT(content, '$.designated_logistics')) IS NOT NULL;
+      `,
+      []
+    );
+
+    // if (getData.length === 0) {
+    //   return;
+    // }
+
+    const unique_tags_string = getData[0].unique_tags ?? '';
+    const unique_tags_json = JSON.parse(`[${unique_tags_string}]`);
+    const unique_tags_array: string[][] = Array.isArray(unique_tags_json) ? unique_tags_json : [];
+    const groupArray: { key: string; name: string; list: string[] }[] = [];
+
+    unique_tags_array.map(list => {
+      if (list.length > 0) {
+        const isUnique = groupArray.every(group => !compareArray(group.list, list));
+
+        if (isUnique) {
+          groupArray.push({
+            key: tool.randomString(8),
+            name: `物流組合${groupArray.length + 1}`,
+            list: list,
+          });
+        }
+      }
+    });
+
+    await new User(app_name).setConfig({
+      key: 'logistics_group',
+      user_id: 'manager',
+      value: groupArray,
+    });
+
+    const getProductList = await db.query(
+      `
+        SELECT * FROM \`${app_name}\`.t_manager_post
+        WHERE JSON_UNQUOTE(JSON_EXTRACT(content, '$.designated_logistics')) IS NOT NULL;
+      `,
+      []
+    );
+
+    for (const product of getProductList) {
+      const data = product.content.designated_logistics;
+
+      if (!data.group && data.type === 'designated') {
+        const findGroup = groupArray.find(group => compareArray(group.list, data.list));
+
+        if (findGroup) {
+          data.group = [findGroup.key];
+
+          const updateResult = await db.query(
+            `UPDATE \`${app_name}\`.t_manager_post SET ? WHERE id = ?
+            `,
+            [{ content: JSON.stringify(product.content) }, product.id]
+          );
+
+          if (updateResult.affectedRows === 0) {
+            console.error(`Product with ID ${product.id} not found.`);
+          }
+        }
+      }
+    }
+  }
+}

package/src/api-public/services/model/handlePaymentTransaction.js

@@ -1,36 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const process_1 = __importDefault(require("process"));
-const financial_service_js_1 = __importStar(require("../financial-service.js"));
 const private_config_js_1 = require("../../../services/private_config.js");
-const tool_js_1 = __importDefault(require("../../../modules/tool.js"));
-const redis_1 = __importDefault(require("../../../modules/redis"));
 const mime = require('mime');
 class PaymentTransaction {
     constructor(app, payment_select) {
@@ -57,44 +27,6 @@ class PaymentTransaction {
         if (!this.kd) {
             await this.createInstance();
         }
-        const id = 'redirect_' + tool_js_1.default.randomString(6);
-        await redis_1.default.setValue(id, return_url);
-        switch (this.payment_select) {
-            case 'ecPay':
-            case 'newWebPay':
-                const subMitData = await new financial_service_js_1.default(this.app, {
-                    HASH_IV: this.kd.HASH_IV,
-                    HASH_KEY: this.kd.HASH_KEY,
-                    ActionURL: this.kd.ActionURL,
-                    NotifyURL: `${process_1.default.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${carData.customer_info.payment_select}`,
-                    ReturnURL: `${process_1.default.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
-                    MERCHANT_ID: this.kd.MERCHANT_ID,
-                    TYPE: this.payment_select,
-                }).createOrderPage(carData);
-                return { form: subMitData };
-            case 'paypal':
-                this.kd.ReturnURL = `${process_1.default.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`;
-                this.kd.NotifyURL = `${process_1.default.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${carData.customer_info.payment_select}`;
-                return await new financial_service_js_1.PayPal(this.app, this.kd).checkout(carData);
-            case 'line_pay':
-                this.kd.ReturnURL = `${process_1.default.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${this.payment_select}`;
-                this.kd.NotifyURL = `${process_1.default.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${this.payment_select}`;
-                return await new financial_service_js_1.LinePay(this.app, this.kd).createOrder(carData);
-            case 'paynow': {
-                this.kd.ReturnURL = `${process_1.default.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${carData.customer_info.payment_select}`;
-                this.kd.NotifyURL = `${process_1.default.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&paynow=true&type=${carData.customer_info.payment_select}`;
-                return await new financial_service_js_1.PayNow(this.app, this.kd).createOrder(carData);
-            }
-            case 'jkopay': {
-                this.kd.ReturnURL = `${process_1.default.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&jkopay=true&return=${id}`;
-                this.kd.NotifyURL = `${process_1.default.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=jkopay&return=${id}`;
-                return await new financial_service_js_1.JKO(this.app, this.kd).createOrder(carData);
-            }
-            default: {
-                carData.method = 'off_line';
-                return ``;
-            }
-        }
     }
 }
 exports.default = PaymentTransaction;

package/src/api-public/services/model/handlePaymentTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlePaymentTransaction.js","sourceRoot":"","sources":["handlePaymentTransaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handlePaymentTransaction.js","sourceRoot":"","sources":["handlePaymentTransaction.ts"],"names":[],"mappings":";;AAOA,2EAAqE;AAKrE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAG7B,MAAM,kBAAkB;IAKtB,YAAY,GAAW,EAAE,cAAsB;QAC7C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,cAAc;;QAClB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,CACd,MAAM,kCAAc,CAAC,SAAS,CAAC;gBAC7B,OAAO,EAAE,IAAI,CAAC,GAAG;gBACjB,GAAG,EAAE,iBAAiB;aACvB,CAAC,CACH,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACX,IAAI,CAAC,EAAE,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,mCAAI;gBACxC,SAAS,EAAE,EAAE;gBACb,SAAS,EAAE,EAAE;aACd,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEf,MAAM,IAAI,KAAK,CAAC,sCAAsC,KAAK,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAW,EAAG,UAAiB;QAClD,IAAI,CAAC,IAAI,CAAC,EAAE,EAAC,CAAC;YACZ,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9B,CAAC;IAgEH,CAAC;CACF;AAED,kBAAe,kBAAkB,CAAC"}

package/src/api-public/services/model/handlePaymentTransaction.ts

@@ -5,10 +5,10 @@ import {App} from '../../../services/app.js';
 import process from "process";
 import {User} from "../user";
 import { CustomerSessions } from '../customer-sessions';
-import FinancialService, { JKO, LinePay, PayNow, PayPal } from '../financial-service.js';
 import { Private_config } from '../../../services/private_config.js';
 import Tool from '../../../modules/tool.js';
 import redis from '../../../modules/redis';
+import {  JKOV2, LinePayV2, PayNowV2, PayPalV2 } from '../financial-serviceV2.js';
 
 const mime = require('mime');
 
@@ -45,61 +45,69 @@ class PaymentTransaction {
     if (!this.kd){
       await this.createInstance();
     }
-    const id = 'redirect_' + Tool.randomString(6);
-    await redis.setValue(id, return_url);
 
-    switch (this.payment_select) {
-      case 'ecPay':
-      case 'newWebPay':
-        const subMitData = await new FinancialService(this.app, {
-          HASH_IV: this.kd.HASH_IV,
-          HASH_KEY: this.kd.HASH_KEY,
-          ActionURL: this.kd.ActionURL,
-          NotifyURL: `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${carData.customer_info.payment_select}`,
-          ReturnURL: `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
-          MERCHANT_ID: this.kd.MERCHANT_ID,
-          TYPE: this.payment_select,
-        }).createOrderPage(carData);
-        return { form: subMitData };
-      case 'paypal':
-        this.kd.ReturnURL = `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`;
-        this.kd.NotifyURL = `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${carData.customer_info.payment_select}`;
-        return await new PayPal(this.app, this.kd).checkout(carData);
-      case 'line_pay':
-        this.kd.ReturnURL = `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${this.payment_select}`;
-        this.kd.NotifyURL = `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${this.payment_select}`;
-        return await new LinePay(this.app, this.kd).createOrder(carData);
-      case 'paynow': {
-        this.kd.ReturnURL = `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${carData.customer_info.payment_select}`;
-        this.kd.NotifyURL = `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&paynow=true&type=${carData.customer_info.payment_select}`;
-        return await new PayNow(this.app , this.kd).createOrder(carData);
-      }
-      case 'jkopay': {
-        this.kd.ReturnURL = `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&jkopay=true&return=${id}`;
-        this.kd.NotifyURL = `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=jkopay&return=${id}`;
-        return await new JKO(this.app, this.kd).createOrder(carData);
-      }
 
-      default: {
-        carData.method = 'off_line';
-        return ``;
-      }
-      //
-      //   if (carData.customer_info.lineID) {
-      //     await this.lineMessage.sendCustomerLine('auto-line-order-create', carData.orderID, carData.customer_info.lineID);
-      //     console.info('訂單line訊息寄送成功');
-      //   }
-      //
-      //   for (const email of new Set([carData.customer_info, carData.user_info].map(dd => dd && dd.email))) {
-      //     if (email) {
-      //       this.autoSendEmail.customerOrder(this.app, 'auto-email-order-create', carData.orderID, email, carData.language!!);
-      //     }
-      //   }
-      //
-      //   await this.releaseVoucherHistory(carData.orderID, 1);
-      //   this.checkPoint('default release checkout');
-      //   return { off_line: true, return_url: `${this.processEnvDomain}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}` };
-    }
+    // switch (this.payment_select) {
+    //   case 'ecPay':
+    //     return await new EzPayV2(this.app, {
+    //       HASH_IV: this.kd.HASH_IV,
+    //       HASH_KEY: this.kd.HASH_KEY,
+    //       ActionURL: this.kd.ActionURL,
+    //       NotifyURL: `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${carData.customer_info.payment_select}`,
+    //       ReturnURL: `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
+    //       MERCHANT_ID: this.kd.MERCHANT_ID,
+    //       TYPE: this.payment_select,
+    //     }).initiatePayment(carData) ;
+    //   case 'newWebPay':
+    //     return { form: await new EzPayV2(this.app, {
+    //         HASH_IV: this.kd.HASH_IV,
+    //         HASH_KEY: this.kd.HASH_KEY,
+    //         ActionURL: this.kd.ActionURL,
+    //         NotifyURL: `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${carData.customer_info.payment_select}`,
+    //         ReturnURL: `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`,
+    //         MERCHANT_ID: this.kd.MERCHANT_ID,
+    //         TYPE: this.payment_select,
+    //       }).createOrderPage(carData) };
+    //
+    //   case 'paypal':
+    //     this.kd.ReturnURL = `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}`;
+    //     this.kd.NotifyURL = `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${carData.customer_info.payment_select}`;
+    //     return await new PayPalV2(this.app, this.kd).checkout(carData);
+    //   case 'line_pay':
+    //     this.kd.ReturnURL = `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${this.payment_select}`;
+    //     this.kd.NotifyURL = `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=${this.payment_select}`;
+    //     return await new LinePayV2(this.app, this.kd).createOrder(carData);
+    //   case 'paynow': {
+    //     this.kd.ReturnURL = `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${carData.customer_info.payment_select}`;
+    //     this.kd.NotifyURL = `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&paynow=true&type=${carData.customer_info.payment_select}`;
+    //     return await new PayNowV2(this.app , this.kd).createOrder(carData);
+    //   }
+    //   case 'jkopay': {
+    //     this.kd.ReturnURL = `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&jkopay=true&return=${id}`;
+    //     this.kd.NotifyURL = `${process.env.DOMAIN}/api-public/v1/ec/notify?g-app=${this.app}&type=jkopay&return=${id}`;
+    //     return await new JKOV2(this.app, this.kd).createOrder(carData);
+    //   }
+    //
+    //   default: {
+    //     carData.method = 'off_line';
+    //     return ``;
+    //   }
+    //   //
+    //   //   if (carData.customer_info.lineID) {
+    //   //     await this.lineMessage.sendCustomerLine('auto-line-order-create', carData.orderID, carData.customer_info.lineID);
+    //   //     console.info('訂單line訊息寄送成功');
+    //   //   }
+    //   //
+    //   //   for (const email of new Set([carData.customer_info, carData.user_info].map(dd => dd && dd.email))) {
+    //   //     if (email) {
+    //   //       this.autoSendEmail.customerOrder(this.app, 'auto-email-order-create', carData.orderID, email, carData.language!!);
+    //   //     }
+    //   //   }
+    //   //
+    //   //   await this.releaseVoucherHistory(carData.orderID, 1);
+    //   //   this.checkPoint('default release checkout');
+    //   //   return { off_line: true, return_url: `${this.processEnvDomain}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}` };
+    // }
   }
 }
 

package/src/api-public/services/monitor.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="cookie-parser" />
 import express from "express";
 import { IToken } from "../models/Auth.js";
 export declare class Monitor {

package/src/api-public/services/payment-service.d.ts

@@ -0,0 +1,12 @@
+import { IPaymentStrategy, PaymentResult } from './interface/payment-strategy-interface.js';
+import { Cart } from './shopping.js';
+export declare class PaymentService {
+    private paymentStrategies;
+    private kd;
+    private app;
+    private domain;
+    private payment_select;
+    constructor(paymentStrategies: Map<string, IPaymentStrategy>, appName: string, payment_select: string);
+    private createInstance;
+    processPayment(carData: Cart, return_url: string, payment_select: string): Promise<PaymentResult>;
+}