@pisell/pisellos 0.10.25 → 0.10.27

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

@@ -533,7 +533,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -294,10 +294,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }
         if (Array.isArray(product.product_bundle)) {
           product.product_bundle = product.product_bundle.map(function (bundle) {
-            var _ref11, _bundle$original_pric, _bundle$bundle_sellin;
+            var _ref11, _bundle$price, _bundle$bundle_sellin;
             var hasBundleDiscount = Array.isArray(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) && bundle.discount_list.length > 0;
             if (hasBundleDiscount) return bundle;
-            var restoredPrice = (_ref11 = (_bundle$original_pric = bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref11 !== void 0 ? _ref11 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+            var restoredPrice = (_ref11 = (_bundle$price = bundle === null || bundle === void 0 ? void 0 : bundle.price) !== null && _bundle$price !== void 0 ? _bundle$price : bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _ref11 !== void 0 ? _ref11 : bundle === null || bundle === void 0 ? void 0 : bundle.product_price;
             if (restoredPrice === undefined || restoredPrice === null || restoredPrice === '') return bundle;
             return _objectSpread(_objectSpread({}, bundle), {}, {
               price: restoredPrice,

package/dist/modules/Payment/walletpass.js

@@ -851,7 +851,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
-        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, platform, response, sortedData;
+        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -864,20 +864,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
               return _context6.abrupt("return", []);
             case 5:
-              platform = this.paymentModule.getPlatform();
-              if (!(platform === 'pc' || platform === 'h5')) {
-                _context6.next = 11;
-                break;
-              }
-              this.userIdentificationCodes = [];
-              this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
-                userIdentificationCodes: []
-              });
-              this.paymentModule.logInfo('[WalletPass] 用户端平台跳过获取用户识别码列表', {
-                platform: platform
-              });
-              return _context6.abrupt("return", []);
-            case 11:
+              // const platform = this.paymentModule.getPlatform();
+              // if (platform === 'pc' || platform === 'h5') {
+              //   this.userIdentificationCodes = [];
+              //   this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
+              //     userIdentificationCodes: [],
+              //   } as OnUserIdentificationCodesUpdatedEventData);
+              //   this.paymentModule.logInfo(
+              //     '[WalletPass] 用户端平台跳过获取用户识别码列表',
+              //     { platform },
+              //   );
+              //   return [];
+              // }
+
               if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
                 newParams.payment_order_id = undefined;
               }
@@ -888,9 +887,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
                 payment_order_id: (_this$walletParams4 = this.walletParams) === null || _this$walletParams4 === void 0 ? void 0 : _this$walletParams4.payment_order_id
               });
-              _context6.next = 15;
+              _context6.next = 9;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
-            case 15:
+            case 9:
               response = _context6.sent;
               // 对获取到的数据进行排序，将错误码为 500100、500200、500300 的项目排到最后
               sortedData = sortUserIdentificationCodeList((response === null || response === void 0 ? void 0 : response.data) || []);
@@ -911,19 +910,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context6.abrupt("return", this.userIdentificationCodes);
-            case 23:
-              _context6.prev = 23;
+            case 17:
+              _context6.prev = 17;
               _context6.t0 = _context6["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取用户识别码列表失败', _context6.t0, {
                 customer_id: params.customer_id,
                 available: params.available
               });
               return _context6.abrupt("return", []);
-            case 27:
+            case 21:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 23]]);
+        }, _callee6, this, [[0, 17]]);
       }));
       function getUserIdentificationCodeListAsync(_x7) {
         return _getUserIdentificationCodeListAsync.apply(this, arguments);

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -458,19 +458,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/model/strategy/adapter/promotion/index.js

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

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

@@ -533,7 +533,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -261,7 +261,7 @@ class OrderModule extends _BaseModule.BaseModule {
         product.product_bundle = product.product_bundle.map(bundle => {
           const hasBundleDiscount = Array.isArray(bundle?.discount_list) && bundle.discount_list.length > 0;
           if (hasBundleDiscount) return bundle;
-          const restoredPrice = bundle?.original_price ?? bundle?.product_price ?? bundle?.price;
+          const restoredPrice = bundle?.price ?? bundle?.original_price ?? bundle?.product_price;
           if (restoredPrice === undefined || restoredPrice === null || restoredPrice === '') return bundle;
           return {
             ...bundle,

package/lib/modules/Payment/walletpass.js

@@ -650,17 +650,20 @@ class WalletPassPaymentImpl {
         this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
         return [];
       }
-      const platform = this.paymentModule.getPlatform();
-      if (platform === 'pc' || platform === 'h5') {
-        this.userIdentificationCodes = [];
-        this.emitEvent(_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
-          userIdentificationCodes: []
-        });
-        this.paymentModule.logInfo('[WalletPass] 用户端平台跳过获取用户识别码列表', {
-          platform
-        });
-        return [];
-      }
+
+      // const platform = this.paymentModule.getPlatform();
+      // if (platform === 'pc' || platform === 'h5') {
+      //   this.userIdentificationCodes = [];
+      //   this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
+      //     userIdentificationCodes: [],
+      //   } as OnUserIdentificationCodesUpdatedEventData);
+      //   this.paymentModule.logInfo(
+      //     '[WalletPass] 用户端平台跳过获取用户识别码列表',
+      //     { platform },
+      //   );
+      //   return [];
+      // }
+
       if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
         newParams.payment_order_id = undefined;
       }

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -458,19 +458,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/package.json

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