@pisell/pisellos 2.2.67 → 2.2.69

package/dist/modules/Payment/index.js

@@ -1535,7 +1535,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
                     case 34:
                       existingActiveVoucherKeys = new Set(orderAfterDelete.payment.filter(function (p) {
-                        return p.voucher_id && p.status !== 'voided';
+                        return p.voucher_id && p.status !== 'voided' && !p.isSynced;
                       }).map(function (p) {
                         return "".concat(p.voucher_id, "|").concat(p.order_payment_type || 'normal');
                       }));

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.js

@@ -1672,12 +1672,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                             // num: item.num, // 使用拆分后的 num
                           });
                         });
+                        debugger;
                         newBundle.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
                           _id: item._id,
                           product_id: bundleItem.product_id,
                           price: item.price,
                           num: item.num,
-                          discount_list: updatedDiscountList
+                          discount_list: updatedDiscountList,
+                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined && item.price
                         }));
                       });
                     }

package/dist/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/modules/Payment/index.js

@@ -801,7 +801,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           throw new Error(`订单不存在: ${orderUuid}`);
         }
         const existingActiveVoucherKeys = new Set(
-          orderAfterDelete.payment.filter((p) => p.voucher_id && p.status !== "voided").map((p) => `${p.voucher_id}|${p.order_payment_type || "normal"}`)
+          orderAfterDelete.payment.filter((p) => p.voucher_id && p.status !== "voided" && !p.isSynced).map((p) => `${p.voucher_id}|${p.order_payment_type || "normal"}`)
         );
         console.log("[PaymentModule] 添加新的代金券支付项:", {
           orderUuid,

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Rules/index.js

@@ -1368,13 +1368,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                           // num: item.num, // 使用拆分后的 num
                         };
                       });
+                      debugger;
                       newBundle.push({
                         ...bundleItem,
                         _id: item._id,
                         product_id: bundleItem.product_id,
                         price: item.price,
                         num: item.num,
-                        discount_list: updatedDiscountList2
+                        discount_list: updatedDiscountList2,
+                        bundle_selling_price: bundleItem.bundle_selling_price !== void 0 && item.price
                       });
                     });
                   }

package/lib/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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