@pisell/pisellos 2.1.91 → 2.1.93

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

@@ -28,6 +28,7 @@ export interface RulesModuleAPI {
     calcDiscount: (params: {
         discountList: any[];
         productList: any[];
+        orderTotalAmount: number;
         holders: {
             form_record_id: number;
         }[];

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

@@ -6,6 +6,8 @@ export interface ISummaryState {
         subtotal: string | number;
         /** 最终总价 */
         total: string | number;
+        /** 最终原始价格 不包含折扣卡商品券折扣 */
+        originTotal: string | number;
         /** 税率标题 */
         taxTitle?: string;
         /** 商品总费率 */

package/dist/modules/Summary/utils.d.ts

@@ -58,6 +58,12 @@ export declare const getTax: ({ service, addons, bookingDetail, bookingId }: {
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
+ * @param items - 购物车商品数组
+ * @returns 商品总价字符串，保留2位小数
+ */
+export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
 /**
  * @title: 单个商品的税费
  * @description:

package/dist/modules/Summary/utils.js

@@ -20,6 +20,7 @@ import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items, isInScheduleByDate, surchargeList, scheduleById) {
   var subtotal = new Decimal(calculateSubtotal(items));
+  var subOriginTotal = new Decimal(calculateOriginSubtotal(items));
   var totalTaxFee = new Decimal(calculateTaxFee(shopInfo, items));
   // 订单附加费列表
   var surcharge = getSurcharge({
@@ -58,11 +59,15 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     originTax = _getTax.originTax;
   var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal.plus(surchargeAmount) : subtotal.plus(tax).plus(surchargeAmount);
 
+  // 计算总价 不包含折扣卡商品券折扣信息价格
+  var originTotal = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
+
   // 计算定金
   var deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
+    originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
     taxRate: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_rate,
     totalTaxFee: tax,
@@ -572,6 +577,22 @@ export var calculateSubtotal = function calculateSubtotal(items) {
   return subtotal.toFixed(2);
 };
 
+/**
+ * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
+ * @param items - 购物车商品数组
+ * @returns 商品总价字符串，保留2位小数
+ */
+export var calculateOriginSubtotal = function calculateOriginSubtotal(items) {
+  if (!(items !== null && items !== void 0 && items.length)) {
+    return '0.00';
+  }
+  var subtotal = items.reduce(function (sum, item) {
+    var cartItemTotalPrice = new Decimal(item.summaryOriginTotal || 0);
+    return sum.plus(cartItemTotalPrice);
+  }, new Decimal(0));
+  return subtotal.toFixed(2);
+};
+
 /**
  * @title: 单个商品的税费
  * @description:

package/dist/plugins/window.d.ts

@@ -1,3 +1,4 @@
+import { WalletPassEvaluator } from '../model';
 import { Plugin } from '../types';
 /**
  * WindowPlugin 接口定义
@@ -14,6 +15,7 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
+    getWalletPassEvaluator?: () => WalletPassEvaluator;
 }
 /**
  * 简单的 Storage 接口实现

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

@@ -144,6 +144,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getSummary(): Promise<{
         subtotal: string | number;
         total: string | number;
+        originTotal: string | number;
         taxTitle?: string | undefined;
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;
@@ -310,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/Checkout/index.js

@@ -403,6 +403,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             product_id: item.product_id,
             product_variant_id: item.product_variant_id,
             quantity: item.num,
+            is_price_include_tax: item.is_price_include_tax,
             // 商品是否含税：1；0
             is_charge_tax: (_item$is_charge_tax = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
             // 若商品不含税，计算得到的税费，单位（元）
@@ -427,6 +428,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             },
             product_bundle: item.product_bundle.map(function (bundle) {
               return {
+                is_price_include_tax: item.is_price_include_tax,
                 bundle_id: bundle.bundle_id,
                 bundle_product_id: bundle.bundle_product_id,
                 bundle_variant_id: bundle.bundle_variant_id,

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

@@ -22,6 +22,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setOriginTotalAmount(amount: number): void;
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
@@ -38,6 +39,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
+    batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];

package/dist/solution/ShopDiscount/index.js

@@ -56,7 +56,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      bookingSubject: undefined
+      bookingSubject: undefined,
+      orderTotalAmount: 0
     };
     return _this;
   }
@@ -288,7 +289,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }() // 设置holders
+    }()
+  }, {
+    key: "setOriginTotalAmount",
+    value: function setOriginTotalAmount(amount) {
+      this.store.orderTotalAmount = amount;
+    }
+
+    // 设置holders
   }, {
     key: "setHolders",
     value: function setHolders(holders) {
@@ -316,6 +324,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var _ref = rulesModule.calcDiscount({
           productList: productList,
           discountList: this.getDiscountList(),
+          orderTotalAmount: this.store.orderTotalAmount || 0,
           holders: this.store.holders || [],
           isFormSubject: ((_this$store$bookingSu = this.store.bookingSubject) === null || _this$store$bookingSu === void 0 ? void 0 : _this$store$bookingSu.type) === 'form'
         }, options) || {
@@ -384,34 +393,72 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setProductList(productList) {
       this.store.productList = productList;
     }
-
-    // 扫码输入code
   }, {
-    key: "scanCode",
+    key: "batchSearchByProductIds",
     value: function () {
-      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
+      var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(productIds) {
+        var _this$store$discount3;
+        var resultDiscountList, currentDiscountList, newDiscountList;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context5.prev = 0;
-              _context5.next = 3;
-              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code, customerId);
-            case 3:
+              _context5.next = 2;
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearchByProductIds(productIds);
+            case 2:
               _context5.t0 = _context5.sent;
               if (_context5.t0) {
-                _context5.next = 6;
+                _context5.next = 5;
                 break;
               }
               _context5.t0 = [];
-            case 6:
+            case 5:
               resultDiscountList = _context5.t0;
+              resultDiscountList = resultDiscountList.map(function (item) {
+                return _objectSpread(_objectSpread({}, item), {}, {
+                  discount_rule_uncheck_flag: true
+                });
+              });
+              currentDiscountList = this.getDiscountList() || [];
+              newDiscountList = [].concat(_toConsumableArray(currentDiscountList), _toConsumableArray(resultDiscountList));
+              this.setDiscountList(newDiscountList);
+              return _context5.abrupt("return", newDiscountList);
+            case 11:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function batchSearchByProductIds(_x4) {
+        return _batchSearchByProductIds.apply(this, arguments);
+      }
+      return batchSearchByProductIds;
+    }() // 扫码输入code
+  }, {
+    key: "scanCode",
+    value: function () {
+      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
+        var _this$store$discount4, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.prev = 0;
+              _context6.next = 3;
+              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.batchSearch(code, customerId);
+            case 3:
+              _context6.t0 = _context6.sent;
+              if (_context6.t0) {
+                _context6.next = 6;
+                break;
+              }
+              _context6.t0 = [];
+            case 6:
+              resultDiscountList = _context6.t0;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context5.next = 10;
+                _context6.next = 10;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -420,10 +467,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 10:
               if (resultDiscountList.length) {
-                _context5.next = 12;
+                _context6.next = 12;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: "server",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -443,10 +490,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   return m.id === n.id;
                 });
               }))) {
-                _context5.next = 16;
+                _context6.next = 16;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: true,
                 productList: this.store.productList || [],
@@ -457,6 +504,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
+                orderTotalAmount: this.store.orderTotalAmount || 0,
                 holders: this.store.holders || [],
                 isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
               }) || {
@@ -465,20 +513,20 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
               if (!isAvailable) {
-                _context5.next = 24;
+                _context6.next = 24;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 24;
+                _context6.next = 24;
                 break;
               }
-              _context5.next = 24;
+              _context6.next = 24;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
             case 24:
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
@@ -486,10 +534,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 unavailableReason: unavailableReason
               });
             case 27:
-              _context5.prev = 27;
-              _context5.t1 = _context5["catch"](0);
-              console.error('[ShopDiscount] 扫码出错:', _context5.t1);
-              return _context5.abrupt("return", {
+              _context6.prev = 27;
+              _context6.t1 = _context6["catch"](0);
+              console.error('[ShopDiscount] 扫码出错:', _context6.t1);
+              return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -498,11 +546,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 31:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this, [[0, 27]]);
+        }, _callee6, this, [[0, 27]]);
       }));
-      function scanCode(_x4, _x5) {
+      function scanCode(_x5, _x6) {
         return _scanCode.apply(this, arguments);
       }
       return scanCode;
@@ -510,8 +558,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscountApplicableProductTotalPrice",
     value: function calcDiscountApplicableProductTotalPrice(discount) {
-      var _this$store$discount4;
-      return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.calcDiscountApplicableProductTotalPrice(discount);
+      var _this$store$discount5;
+      return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.calcDiscountApplicableProductTotalPrice(discount);
     }
 
     // =========== 私有辅助方法 ===========
@@ -535,19 +583,19 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "emitDiscountListChange",
     value: function () {
-      var _emitDiscountListChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(discountList) {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _emitDiscountListChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(discountList) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onDiscountListChange"), discountList);
             case 2:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function emitDiscountListChange(_x6) {
+      function emitDiscountListChange(_x7) {
         return _emitDiscountListChange.apply(this, arguments);
       }
       return emitDiscountListChange;
@@ -556,7 +604,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountList",
     value: function setDiscountList(discountList) {
       var _this3 = this,
-        _this$store$discount5;
+        _this$store$discount6;
       var productList = this.store.productList || [];
       var editModeDiscountList = [];
       productList.forEach(function (item) {
@@ -570,21 +618,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
               });
               if (index !== -1) {
-                var _discount$metadata;
+                var _editModeDiscountList, _discount$metadata, _discount$metadata2;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
+                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
+                    num: ((editModeDiscountList === null || editModeDiscountList === void 0 || (_editModeDiscountList = editModeDiscountList[index]) === null || _editModeDiscountList === void 0 || (_editModeDiscountList = _editModeDiscountList.metadata) === null || _editModeDiscountList === void 0 ? void 0 : _editModeDiscountList.num) || 1) + (((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || 1)
+                  }),
                   amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata3, _discount$metadata4, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
+                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
+                    num: ((_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.num) || 1
+                  }),
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.product_discount_difference) || 0).toNumber(),
                   isAvailable: true,
                   id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
                   format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
@@ -639,7 +693,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           item.isDisabledForProductUsed = false;
         }
       });
-      (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
+      (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || _this$store$discount6.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;
     }
@@ -648,48 +702,48 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDiscountList",
     value: function getDiscountList() {
-      var _this$store$discount6;
-      return ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.getDiscountList()) || [];
+      var _this$store$discount7;
+      return ((_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.getDiscountList()) || [];
     }
 
     // 获取客户钱包信息
   }, {
     key: "getCustomerWallet",
     value: function () {
-      var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
+      var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id) {
         var _result, customer;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.prev = 0;
-              _context7.next = 3;
+              _context8.prev = 0;
+              _context8.next = 3;
               return this.request.get("/customer/info/".concat(id), {
                 with_trashed: 1
               });
             case 3:
-              _result = _context7.sent;
+              _result = _context8.sent;
               if (!(_result !== null && _result !== void 0 && _result.data)) {
-                _context7.next = 9;
+                _context8.next = 9;
                 break;
               }
               customer = Object.assign({}, (_objectDestructuringEmpty(_result.data), _result.data));
               this.setCustomer(customer);
-              _context7.next = 9;
+              _context8.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onScanCustomerChange"), customer);
             case 9:
-              _context7.next = 14;
+              _context8.next = 14;
               break;
             case 11:
-              _context7.prev = 11;
-              _context7.t0 = _context7["catch"](0);
-              console.error('[ShopDiscount] 获取客户钱包信息出错:', _context7.t0);
+              _context8.prev = 11;
+              _context8.t0 = _context8["catch"](0);
+              console.error('[ShopDiscount] 获取客户钱包信息出错:', _context8.t0);
             case 14:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this, [[0, 11]]);
+        }, _callee8, this, [[0, 11]]);
       }));
-      function getCustomerWallet(_x7) {
+      function getCustomerWallet(_x8) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
@@ -697,32 +751,32 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "bestDiscount",
     value: function () {
-      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(cb) {
+      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(cb) {
         var _this$store$productLi;
         var newDiscountList, _result2;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               newDiscountList = this.store.originalDiscountList;
               this.setDiscountList(newDiscountList);
               if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 7;
+                _context9.next = 7;
                 break;
               }
               _result2 = this.calcDiscount(this.store.productList);
               cb === null || cb === void 0 || cb(_result2);
-              _context8.next = 7;
+              _context9.next = 7;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result2);
             case 7:
-              _context8.next = 9;
+              _context9.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
             case 9:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function bestDiscount(_x8) {
+      function bestDiscount(_x9) {
         return _bestDiscount.apply(this, arguments);
       }
       return bestDiscount;
@@ -730,17 +784,17 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadPrepareConfig",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
+        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _context9.prev = 0;
+              _context10.prev = 0;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context9.next = 4;
-              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
+              _context10.next = 4;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
                 with_good_pass: 1,
@@ -749,7 +803,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               });
             case 4:
-              goodPassList = _context9.sent;
+              goodPassList = _context10.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
@@ -761,37 +815,37 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context9.next = 12;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
+              _context10.next = 12;
+              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
             case 12:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context9.next = 19;
+                _context10.next = 19;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 19;
+              _context10.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 19:
-              _context9.next = 21;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+              _context10.next = 21;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
             case 21:
-              _context9.next = 26;
+              _context10.next = 26;
               break;
             case 23:
-              _context9.prev = 23;
-              _context9.t0 = _context9["catch"](0);
-              console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
+              _context10.prev = 23;
+              _context10.t0 = _context10["catch"](0);
+              console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
             case 26:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[0, 23]]);
+        }, _callee10, this, [[0, 23]]);
       }));
-      function loadPrepareConfig(_x9) {
+      function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;

package/dist/solution/ShopDiscount/types.d.ts

@@ -23,6 +23,7 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    orderTotalAmount?: number;
     holders?: {
         form_record_id: number;
         form_id?: number;

package/dist/solution/ShopDiscount/types.js

@@ -8,4 +8,5 @@ export var ShopDiscountHooks = /*#__PURE__*/function (ShopDiscountHooks) {
   ShopDiscountHooks["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";
   return ShopDiscountHooks;
-}({});
+}({});
+;