@pisell/pisellos 0.0.319 → 0.0.321

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

@@ -14,6 +14,8 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setDiscountList(discountList: Discount[]): Promise<void>;
     getDiscountList(): Discount[];
+    setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
+    getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;

package/dist/modules/Discount/index.js

@@ -46,7 +46,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _options$initialState, _options$otherParams, _options$otherParams2;
+        var _options$initialState, _options$initialState2, _options$otherParams, _options$otherParams2;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -57,6 +57,11 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               } else {
                 this.store.discountList = [];
               }
+              if (Array.isArray(options === null || options === void 0 || (_options$initialState2 = options.initialState) === null || _options$initialState2 === void 0 ? void 0 : _options$initialState2.originalDiscountList)) {
+                this.store.originalDiscountList = options === null || options === void 0 ? void 0 : options.initialState.originalDiscountList;
+              } else {
+                this.store.originalDiscountList = [];
+              }
               if (options !== null && options !== void 0 && (_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
                 this.openCache = options.otherParams.openCache;
                 this.cacheId = options.otherParams.cacheId;
@@ -69,17 +74,17 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               this.request = core.getPlugin('request');
               this.window = core.getPlugin('window');
               if (this.request) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
               throw new Error('discount模块需要 request 插件支持');
-            case 9:
+            case 10:
               if (this.window) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
               throw new Error('discount模块需要 window 插件支持');
-            case 11:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -116,28 +121,54 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     value: function getDiscountList() {
       return this.store.discountList;
     }
+
+    // 设置原始优惠券列表
+  }, {
+    key: "setOriginalDiscountList",
+    value: function () {
+      var _setOriginalDiscountList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(originalDiscountList) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              this.store.originalDiscountList = originalDiscountList;
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function setOriginalDiscountList(_x4) {
+        return _setOriginalDiscountList.apply(this, arguments);
+      }
+      return setOriginalDiscountList;
+    }() // 获取原始优惠券列表
+  }, {
+    key: "getOriginalDiscountList",
+    value: function getOriginalDiscountList() {
+      return this.store.originalDiscountList || [];
+    }
   }, {
     key: "loadPrepareConfig",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
         var _prepareConfig$data, _prepareConfig$data2;
         var prepareConfig, goodPassList;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return this.request.post("/order/prepare/config", params);
             case 2:
-              prepareConfig = _context3.sent;
+              prepareConfig = _context4.sent;
               goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || []; // this.setDiscountList(goodPassList);
-              return _context3.abrupt("return", goodPassList);
+              return _context4.abrupt("return", goodPassList);
             case 5:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function loadPrepareConfig(_x4) {
+      function loadPrepareConfig(_x5) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;
@@ -145,12 +176,12 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "batchSearch",
     value: function () {
-      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(code, customerId) {
+      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
         var result, resultDiscountList;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return this.request.get("/machinecode/batch-search", {
                 code: code,
                 translate_flag: 1,
@@ -162,16 +193,16 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 order_behavior_count_customer_id: customerId || 1
               });
             case 2:
-              result = _context4.sent;
+              result = _context5.sent;
               resultDiscountList = this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || [];
-              return _context4.abrupt("return", resultDiscountList);
+              return _context5.abrupt("return", resultDiscountList);
             case 5:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function batchSearch(_x5, _x6) {
+      function batchSearch(_x6, _x7) {
         return _batchSearch.apply(this, arguments);
       }
       return batchSearch;
@@ -276,21 +307,21 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
-              _context5.next = 4;
+              _context6.next = 4;
               return this.core.effects.emit(DiscountHooks.OnDestroy, {});
             case 4:
               console.log('[Discount] 已销毁');
             case 5:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -300,17 +331,18 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.discountList = [];
+              this.store.originalDiscountList = [];
               console.log('[Discount] clear');
-            case 2:
+            case 3:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

package/dist/modules/Discount/types.d.ts

@@ -72,6 +72,7 @@ export interface Discount {
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
+        validity_type?: "custom_schedule_validity" | "fixed_validity";
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -98,9 +99,13 @@ export interface Discount {
     week_order_behavior_count?: number;
     month_order_behavior_count?: number;
     customer_order_behavior_count?: number;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
 }
 export interface DiscountState {
     discountList: Discount[];
+    originalDiscountList?: Discount[];
 }
 export interface DiscountModuleAPI {
     setDiscountList: (discountList: Discount[]) => Promise<void>;

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/solution/BookingTicket/index.d.ts

@@ -111,7 +111,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/dist/solution/Checkout/index.d.ts

@@ -310,6 +310,10 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 计算剩余未支付金额（从 Payment 模块获取最新数据）
      */
     private calculateRemainingAmountAsync;
+    /**
+     * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
+     */
+    private calculateRemainingTotalAmountAsync;
     /**
      * 更新 balanceDueAmount 为当前剩余未支付金额（系统内部计算）
      */