ts-glitter 21.0.4 → 21.0.6

package/src/api-public/services/payment-service.js

@@ -0,0 +1,83 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaymentService = void 0;
+const redis_js_1 = __importDefault(require("../../modules/redis.js"));
+const tool_js_1 = __importDefault(require("../../modules/tool.js"));
+const private_config_1 = require("../../services/private_config");
+class PaymentService {
+    constructor(paymentStrategies, appName, payment_select) {
+        this.paymentStrategies = paymentStrategies;
+        this.paymentStrategies = paymentStrategies;
+        this.app = appName;
+        this.domain = process.env.DOMAIN || '';
+        this.payment_select = payment_select;
+        if (!process.env.DOMAIN)
+            console.warn('DOMAIN environment variable is not set! Using default.');
+    }
+    async createInstance() {
+        var _a;
+        console.info('執行 createInstance 載入金流資料...');
+        const keyData = (await private_config_1.Private_config.getConfig({
+            appName: this.app,
+            key: 'glitter_finance',
+        }))[0].value;
+        if (keyData) {
+            this.kd = (_a = keyData[this.payment_select]) !== null && _a !== void 0 ? _a : {
+                ReturnURL: '',
+                NotifyURL: '',
+            };
+            console.log('金流資料載入完成 。');
+        }
+        else {
+            console.log('金流資料載入錯誤 。');
+        }
+    }
+    async processPayment(carData, return_url, payment_select) {
+        if (!this.kd) {
+            await this.createInstance();
+        }
+        if (!this.kd) {
+            console.error('無法載入支付金鑰資料 (keyData)。');
+            return { error: '無法載入支付金鑰資料，請聯繫管理員。' };
+        }
+        const id = 'redirect_' + tool_js_1.default.randomString(6);
+        const redirect_url = new URL(return_url);
+        redirect_url.searchParams.set('cart_token', carData.orderID);
+        await redis_js_1.default.setValue(id, redirect_url.href);
+        const strategy = this.paymentStrategies.get(payment_select);
+        if (!strategy) {
+            console.warn(`找不到支付方式 "${payment_select}" 的處理策略，將使用預設線下處理。`);
+            const offlineStrategy = this.paymentStrategies.get('off_line');
+            if (offlineStrategy) {
+                const offlineConfig = {
+                    app: this.app,
+                    id: id,
+                    domain: this.domain,
+                };
+                return await offlineStrategy.initiatePayment(carData, offlineConfig);
+            }
+            else {
+                console.error(`不支援的支付方式: ${payment_select}，且找不到預設處理方式。`);
+                return { error: `不支援的支付方式: ${payment_select}` };
+            }
+        }
+        const config = {
+            app: this.app,
+            id: id,
+            domain: this.domain,
+        };
+        try {
+            return await strategy.initiatePayment(carData, config);
+        }
+        catch (paymentError) {
+            console.error(`支付方式 "${payment_select}" 處理失敗:`, paymentError);
+            const errorMessage = paymentError instanceof Error ? paymentError.message : String(paymentError);
+            return { error: `支付處理失敗: ${errorMessage}` };
+        }
+    }
+}
+exports.PaymentService = PaymentService;
+//# sourceMappingURL=payment-service.js.map

package/src/api-public/services/payment-service.js.map

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

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

@@ -0,0 +1,112 @@
+import { IPaymentStrategy, PaymentConfig, PaymentResult } from './interface/payment-strategy-interface.js';
+import { KeyData } from './financial-serviceV2.js';
+import { Cart } from './shopping.js';
+import redis from '../../modules/redis.js';
+import Tool from '../../modules/tool.js';
+import { Private_config } from '../../services/private_config';
+import { OrderEvent } from './order-event';
+
+export class PaymentService {
+  private kd: KeyData | undefined; // KeyData 型別來自 interface 檔案
+  private app: string;
+  private domain: string;
+  private payment_select: string;
+  // **** 依賴注入：透過建構子傳入所有可用的策略 Map ****
+  constructor(
+    private paymentStrategies: Map<string, IPaymentStrategy>,
+    appName: string,
+    payment_select: string
+  ) {
+    this.paymentStrategies = paymentStrategies;
+    this.app = appName;
+    // 實際應用中 DOMAIN 應來自環境變數
+    this.domain = process.env.DOMAIN || ''; //
+    this.payment_select = payment_select;
+    if (!process.env.DOMAIN) console.warn('DOMAIN environment variable is not set! Using default.');
+  }
+
+  // 載入 keyData 的方法
+  private async createInstance() {
+    console.info('執行 createInstance 載入金流資料...');
+    const keyData = (
+      await Private_config.getConfig({
+        appName: this.app,
+        key: 'glitter_finance',
+      })
+    )[0].value;
+    if (keyData) {
+      this.kd = keyData[this.payment_select] ?? {
+        ReturnURL: '',
+        NotifyURL: '',
+      };
+      console.log('金流資料載入完成 。');
+    } else {
+      console.log('金流資料載入錯誤 。');
+    }
+  }
+
+  /**
+   * 處理支付流程（重構後）
+   * @param carData 訂單/購物車資料
+   * @param return_url
+   * @param payment_select 使用者選擇的支付方式 key (例如 'ecPay', 'line_pay')
+   * @returns 標準化的支付結果 PaymentResult
+   */
+  async processPayment(carData: Cart, return_url: string, payment_select: string): Promise<PaymentResult> {
+    // 1. 確保 keyData 已載入
+    if (!this.kd) {
+      await this.createInstance();
+    }
+    if (!this.kd) {
+      console.error('無法載入支付金鑰資料 (keyData)。');
+      return { error: '無法載入支付金鑰資料，請聯繫管理員。' }; // 回傳錯誤結果
+    }
+
+    // 2. 產生並儲存 Redis ID 並且把前端指定的return_url塞進去
+    // Generate notify redirect id
+    const id = 'redirect_' + Tool.randomString(6);
+    //前端希望跳轉的頁面
+    const redirect_url = new URL(return_url);
+    redirect_url.searchParams.set('cart_token', carData.orderID);
+    await redis.setValue(id, redirect_url.href);
+
+    // 3. 從注入的 Map 中查找對應的策略物件
+    const strategy = this.paymentStrategies.get(payment_select);
+
+    // 4. 如果找不到策略，處理預設情況或錯誤
+    if (!strategy) {
+      console.warn(`找不到支付方式 "${payment_select}" 的處理策略，將使用預設線下處理。`);
+      const offlineStrategy = this.paymentStrategies.get('off_line');
+      if (offlineStrategy) {
+        const offlineConfig: PaymentConfig = {
+          app: this.app,
+          id: id,
+          domain: this.domain,
+        };
+        // 委派給線下策略
+        return await offlineStrategy.initiatePayment(carData, offlineConfig);
+      } else {
+        console.error(`不支援的支付方式: ${payment_select}，且找不到預設處理方式。`);
+        return { error: `不支援的支付方式: ${payment_select}` };
+      }
+    }
+
+    // 5. 準備通用的設定物件傳給策略
+    const config: PaymentConfig = {
+      app: this.app,
+      id: id,
+      domain: this.domain,
+    };
+
+
+
+    // 6. 呼叫選中策略的 initiatePayment 方法，並回傳結果
+    try {
+      return await strategy.initiatePayment(carData, config);
+    } catch (paymentError) {
+      console.error(`支付方式 "${payment_select}" 處理失敗:`, paymentError);
+      const errorMessage = paymentError instanceof Error ? paymentError.message : String(paymentError);
+      return { error: `支付處理失敗: ${errorMessage}` };
+    }
+  }
+}

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

@@ -374,7 +374,7 @@ export declare class Shopping {
         value: string;
     }[], value: number | string): number;
     getShipmentFee(user_info: any, lineItems: CartItem[], shipment: any): number;
-    repayOrder(orderID: string, return_url: string): Promise<any>;
+    repayOrder(orderID: string, return_url: string): Promise<import("./interface/payment-strategy-interface.js").PaymentResult | undefined>;
     getReturnOrder(query: {
         page: number;
         limit: number;
@@ -522,6 +522,7 @@ export declare class Shopping {
     sortCollection(data: Collection[]): Promise<boolean>;
     checkVariantDataType(variants: any[]): void;
     postProduct(content: any): Promise<any>;
+    removeLogisticGroup(group_key: string): Promise<boolean>;
     updateCollectionFromUpdateProduct(collection: string[]): Promise<void>;
     postMulProduct(content: any): Promise<any>;
     promisesProducts(productArray: any, insertIDStart: any): Promise<void>;

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

@@ -10,6 +10,7 @@ const express_1 = __importDefault(require("express"));
 const moment_1 = __importDefault(require("moment"));
 const axios_1 = __importDefault(require("axios"));
 const app_1 = __importDefault(require("../../app"));
+const redis_js_1 = __importDefault(require("../../modules/redis.js"));
 const tool_js_1 = __importDefault(require("../../modules/tool.js"));
 const financial_service_js_1 = require("./financial-service.js");
 const private_config_js_1 = require("../../services/private_config.js");
@@ -34,8 +35,9 @@ const checkout_js_1 = require("./checkout.js");
 const product_initial_js_1 = require("./product-initial.js");
 const ut_timer_js_1 = require("../utils/ut-timer.js");
 const auto_fcm_js_1 = require("../../public-config-initial/auto-fcm.js");
-const handlePaymentTransaction_js_1 = __importDefault(require("./model/handlePaymentTransaction.js"));
 const Language_js_1 = require("../../Language.js");
+const payment_strategy_factory_js_1 = require("./factories/payment-strategy-factory.js");
+const payment_service_js_1 = require("./payment-service.js");
 const checkout_event_js_1 = require("./checkout-event.js");
 class OrderDetail {
     constructor(subtotal, shipment) {
@@ -1355,7 +1357,7 @@ class Shopping {
         return (this.calculateShipment(shipment.volume, total_volume) + this.calculateShipment(shipment.weight, total_weight));
     }
     async repayOrder(orderID, return_url) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const app = this.app;
         async function getOrder(orderID) {
             try {
@@ -1398,21 +1400,17 @@ class Shopping {
                     return [];
                 }
             })();
-            let kd = (_a = keyData[orderData.customer_info.payment_select]) !== null && _a !== void 0 ? _a : {
-                ReturnURL: '',
-                NotifyURL: '',
-            };
-            const newOrderID = Date.now();
+            const newOrderID = 'repay' + Date.now();
             const carData = {
                 orderID: `${newOrderID}`,
-                discount: (_b = orderData.discount) !== null && _b !== void 0 ? _b : 0,
+                discount: (_a = orderData.discount) !== null && _a !== void 0 ? _a : 0,
                 customer_info: orderData.customer_info || {},
-                lineItems: (_c = orderData.lineItems) !== null && _c !== void 0 ? _c : [],
-                total: (_d = orderData.total) !== null && _d !== void 0 ? _d : 0,
-                email: (_g = (_e = sqlData.email) !== null && _e !== void 0 ? _e : (_f = orderData.user_info) === null || _f === void 0 ? void 0 : _f.email) !== null && _g !== void 0 ? _g : '',
+                lineItems: (_b = orderData.lineItems) !== null && _b !== void 0 ? _b : [],
+                total: (_c = orderData.total) !== null && _c !== void 0 ? _c : 0,
+                email: (_f = (_d = sqlData.email) !== null && _d !== void 0 ? _d : (_e = orderData.user_info) === null || _e === void 0 ? void 0 : _e.email) !== null && _f !== void 0 ? _f : '',
                 user_info: orderData.user_info,
-                shipment_fee: (_h = orderData.shipment_fee) !== null && _h !== void 0 ? _h : 0,
-                rebate: (_j = orderData.rebate) !== null && _j !== void 0 ? _j : 0,
+                shipment_fee: (_g = orderData.shipment_fee) !== null && _g !== void 0 ? _g : 0,
+                rebate: (_h = orderData.rebate) !== null && _h !== void 0 ? _h : 0,
                 goodsWeight: 0,
                 use_rebate: orderData.use_rebate || 0,
                 shipment_support: shipment_setting.support,
@@ -1422,7 +1420,7 @@ class Shopping {
                         name: dd.title,
                         value: dd.value,
                     })),
-                    ...((_k = shipment_setting.custom_delivery) !== null && _k !== void 0 ? _k : []).map((dd) => ({
+                    ...((_j = shipment_setting.custom_delivery) !== null && _j !== void 0 ? _j : []).map((dd) => ({
                         form: dd.form,
                         name: dd.name,
                         value: dd.id,
@@ -1430,8 +1428,8 @@ class Shopping {
                     })),
                 ].filter(option => shipment_setting.support.includes(option.value)),
                 use_wallet: 0,
-                method: (_l = sqlData.user_info) === null || _l === void 0 ? void 0 : _l.method,
-                user_email: (_p = (_m = sqlData.email) !== null && _m !== void 0 ? _m : (_o = orderData.user_info) === null || _o === void 0 ? void 0 : _o.email) !== null && _p !== void 0 ? _p : '',
+                method: (_k = sqlData.user_info) === null || _k === void 0 ? void 0 : _k.method,
+                user_email: (_o = (_l = sqlData.email) !== null && _l !== void 0 ? _l : (_m = orderData.user_info) === null || _m === void 0 ? void 0 : _m.email) !== null && _o !== void 0 ? _o : '',
                 useRebateInfo: sqlData.useRebateInfo,
                 custom_form_format: sqlData.custom_form_format,
                 custom_form_data: sqlData.custom_form_data,
@@ -1447,13 +1445,19 @@ class Shopping {
                 fbp: sqlData.fbp,
                 editRecord: [],
             };
-            await order_event_js_1.OrderEvent.insertOrder({
-                cartData: orderData,
-                status: 0,
-                app: this.app,
-            });
-            const result = await new handlePaymentTransaction_js_1.default(this.app, orderData.customer_info.payment_select).processPayment(carData, return_url);
-            return result;
+            await redis_js_1.default.setValue(newOrderID, `${orderData.orderID}`);
+            const strategyFactory = new payment_strategy_factory_js_1.PaymentStrategyFactory(keyData);
+            const allPaymentStrategies = strategyFactory.createStrategyRegistry();
+            const appName = this.app;
+            const paymentService = new payment_service_js_1.PaymentService(allPaymentStrategies, appName, carData.customer_info.payment_select);
+            try {
+                const paymentResult = await paymentService.processPayment(carData, return_url, carData.customer_info.payment_select);
+                console.log("Controller 收到 Payment Result:", paymentResult);
+                return paymentResult;
+            }
+            catch (error) {
+                console.error("Controller 捕獲到錯誤:", error);
+            }
         }
     }
     async getReturnOrder(query) {
@@ -3650,6 +3654,39 @@ class Shopping {
             throw exception_js_1.default.BadRequestError('BAD_REQUEST', 'postProduct Error:' + e, null);
         }
     }
+    async removeLogisticGroup(group_key) {
+        try {
+            const getProducts = await database_js_1.default.query(`SELECT * FROM \`${this.app}\`.t_manager_post 
+         WHERE JSON_CONTAINS(JSON_EXTRACT(content, '$.designated_logistics.group'), JSON_QUOTE(?))`, [group_key]);
+            const chunk = 10;
+            const chunkLength = Math.ceil(getProducts.length / chunk);
+            for (let i = 0; i < chunkLength; i++) {
+                const promisesArray = getProducts.slice(i * chunk, (i + 1) * chunk);
+                setTimeout(async () => {
+                    await Promise.all(promisesArray.map(async (product) => {
+                        product.content.designated_logistics.group = product.content.designated_logistics.group.filter((item) => {
+                            return item !== group_key;
+                        });
+                        if (product.content.designated_logistics.group.length === 0) {
+                            delete product.content.designated_logistics.group;
+                            product.content.designated_logistics.type = 'all';
+                        }
+                        await database_js_1.default.query(`UPDATE \`${this.app}\`.\`t_manager_post\` SET ? WHERE id = ?`, [
+                            {
+                                content: JSON.stringify(product.content),
+                            },
+                            product.id,
+                        ]);
+                    }));
+                }, 200);
+            }
+            return true;
+        }
+        catch (e) {
+            console.error(e);
+            throw exception_js_1.default.BadRequestError('BAD_REQUEST', 'removeLogisticGroup Error:' + e, null);
+        }
+    }
     async updateCollectionFromUpdateProduct(collection) {
         var _a;
         collection = Array.from(new Set(collection.map(dd => {