@pisell/pisellos 2.2.14 → 2.2.15

package/lib/modules/Order/index.js

@@ -193,31 +193,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @returns 后端返回的订单数据（包含订单ID等）
    */
   async createOrderByCheckout(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+    const onlineStorePaymentCodeList = ["WXPAY", "WECHAT", "ALIPAY", "APPLE_PAY", "CREDIT_CARD_3DS", "CREDIT_CARD_TOKEN", "GOOGLE_PAY", "GOOGLE_PAY_3DS", "CREDIT_CARD"];
+    params.payments = (_a = params.payments) == null ? void 0 : _a.filter((p) => !onlineStorePaymentCodeList.includes(p.code));
     this.logInfo("createOrderByCheckout called", {
       type: params.type,
       platform: params.platform,
       is_deposit: params.is_deposit,
       customer_id: params.customer_id,
-      bookingsCount: ((_a = params.bookings) == null ? void 0 : _a.length) || 0,
-      relationProductsCount: ((_b = params.relation_products) == null ? void 0 : _b.length) || 0,
-      paymentsCount: ((_c = params.payments) == null ? void 0 : _c.length) || 0,
+      bookingsCount: ((_b = params.bookings) == null ? void 0 : _b.length) || 0,
+      relationProductsCount: ((_c = params.relation_products) == null ? void 0 : _c.length) || 0,
+      paymentsCount: ((_d = params.payments) == null ? void 0 : _d.length) || 0,
       depositAmount: params.deposit_amount,
       productTaxFee: params.product_tax_fee,
       note: params.note,
       scheduleDate: params.schedule_date,
       hasOrderId: !!params.order_id,
       orderIdIncluded: params.order_id,
-      paymentMethods: ((_d = params.payments) == null ? void 0 : _d.map((p) => p.code)) || []
+      paymentMethods: ((_e = params.payments) == null ? void 0 : _e.map((p) => p.code)) || []
     });
     console.log("[Order] createOrderByCheckout 开始创建订单:", {
       type: params.type,
       platform: params.platform,
       is_deposit: params.is_deposit,
       customer_id: params.customer_id,
-      bookingsCount: ((_e = params.bookings) == null ? void 0 : _e.length) || 0,
-      relationProductsCount: ((_f = params.relation_products) == null ? void 0 : _f.length) || 0,
-      paymentsCount: ((_g = params.payments) == null ? void 0 : _g.length) || 0
+      bookingsCount: ((_f = params.bookings) == null ? void 0 : _f.length) || 0,
+      relationProductsCount: ((_g = params.relation_products) == null ? void 0 : _g.length) || 0,
+      paymentsCount: ((_h = params.payments) == null ? void 0 : _h.length) || 0
     });
     try {
       const orderData = {
@@ -234,7 +236,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         ...params
         // 使用传入的参数覆盖默认值
       };
-      if ((_h = orderData.payments) == null ? void 0 : _h.length) {
+      if ((_i = orderData.payments) == null ? void 0 : _i.length) {
         orderData.small_ticket_data_flag = 1;
       }
       if (!params.order_id && !orderData.schedule_date) {
@@ -246,10 +248,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         platform: orderData.platform,
         isDeposit: orderData.is_deposit,
         customerId: orderData.customer_id,
-        bookingsCount: ((_i = orderData.bookings) == null ? void 0 : _i.length) || 0,
-        relationProductsCount: ((_j = orderData.relation_products) == null ? void 0 : _j.length) || 0,
-        paymentsCount: ((_k = orderData.payments) == null ? void 0 : _k.length) || 0,
-        paymentsMethods: ((_l = orderData.payments) == null ? void 0 : _l.map((p) => p.code)) || []
+        bookingsCount: ((_j = orderData.bookings) == null ? void 0 : _j.length) || 0,
+        relationProductsCount: ((_k = orderData.relation_products) == null ? void 0 : _k.length) || 0,
+        paymentsCount: ((_l = orderData.payments) == null ? void 0 : _l.length) || 0,
+        paymentsMethods: ((_m = orderData.payments) == null ? void 0 : _m.map((p) => p.code)) || []
       });
       this.logInfo("Calling backend checkout API", {
         url: "/order/checkout",
@@ -258,10 +260,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         isDeposit: orderData.is_deposit,
         customerId: orderData.customer_id,
         depositAmount: orderData.deposit_amount,
-        bookingsCount: ((_m = orderData.bookings) == null ? void 0 : _m.length) || 0,
-        relationProductsCount: ((_n = orderData.relation_products) == null ? void 0 : _n.length) || 0,
-        paymentsCount: ((_o = orderData.payments) == null ? void 0 : _o.length) || 0,
-        paymentMethods: ((_p = orderData.payments) == null ? void 0 : _p.map((p) => ({
+        bookingsCount: ((_n = orderData.bookings) == null ? void 0 : _n.length) || 0,
+        relationProductsCount: ((_o = orderData.relation_products) == null ? void 0 : _o.length) || 0,
+        paymentsCount: ((_p = orderData.payments) == null ? void 0 : _p.length) || 0,
+        paymentMethods: ((_q = orderData.payments) == null ? void 0 : _q.map((p) => ({
           code: p.code,
           amount: p.amount,
           type: p.type,
@@ -280,7 +282,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
       console.log("[Order] 订单创建成功，后端响应:", {
         success: !!response,
-        hasOrderId: !!(((_q = response == null ? void 0 : response.data) == null ? void 0 : _q.order_id) || (response == null ? void 0 : response.order_id))
+        hasOrderId: !!(((_r = response == null ? void 0 : response.data) == null ? void 0 : _r.order_id) || (response == null ? void 0 : response.order_id))
       });
       return response;
     } catch (error) {

package/lib/modules/Payment/index.d.ts

@@ -50,6 +50,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      *
      */
     private registerNetworkHandlers;
+    private filterPayMethods;
     /**
      * 获取支付方式列表
      */

package/lib/modules/Payment/index.js

@@ -175,6 +175,20 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  async filterPayMethods(payMethods) {
+    payMethods.filter((method) => method.status === 1 && method.disable === 0);
+    const walletPassMethod = payMethods.find((method) => method.code === "WALLET_PASS");
+    if (walletPassMethod) {
+      payMethods.forEach((method) => {
+        if (method.code === "PRODUCTVOUCHER" || method.code === "GIFTCARD" || method.code === "POINTCARD") {
+          method.channel_application = walletPassMethod.channel_application;
+        }
+      });
+    } else {
+      payMethods = payMethods.filter((method) => method.code !== "PRODUCTVOUCHER" && method.code !== "GIFTCARD" && method.code !== "POINTCARD");
+    }
+    return payMethods;
+  }
   /**
    * 获取支付方式列表
    */
@@ -193,7 +207,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         return cachedMethods;
       }
       const response = await this.request.get("/pay/custom-payment/all");
-      response.data = response.data.filter((method) => method.status === 1 && method.disable === 0);
+      response.data = this.filterPayMethods(response.data);
       const payMethods = response.data || [];
       try {
         for (const method of payMethods) {
@@ -227,7 +241,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     try {
       console.log("[PaymentModule] 后台刷新支付方式列表...");
       const response = await this.request.get("/pay/custom-payment/all");
-      response.data = response.data.filter((method) => method.status === 1 && method.disable === 0);
+      response.data = this.filterPayMethods(response.data);
       const newPayMethods = response.data || [];
       const hasChanges = this.hasPaymentMethodsChanged(
         cachedMethods,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.14",
+  "version": "2.2.15",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",