@pisell/pisellos 2.2.8 → 2.2.10

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

@@ -103,6 +103,8 @@ export interface UpdateLocalOrderParams {
     cartSummary: CartSummaryItem[];
     /** total 信息（用于拆解金额） */
     totalInfo: any;
+    /** 云端已存在的支付项（可选，用于处理订单在其他设备或云端生成的场景） */
+    existPayment?: PaymentItem[];
 }
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)

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

@@ -18,7 +18,12 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private initializePlugins;
     private registerDependentModules;
     private registerEventListeners;
+    getCurrentBookingTime(): string | null;
+    private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setHolders(holders: {
+        form_record_id: number;
+    }[]): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/dist/solution/ShopDiscount/index.js

@@ -27,6 +27,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
+import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
@@ -50,7 +51,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList: [],
       discount: null,
       rules: null,
-      originalDiscountList: []
+      originalDiscountList: [],
+      currentBookingTime: "",
+      filteredDiscountList: [],
+      holders: []
     };
     return _this;
   }
@@ -207,6 +211,55 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
     // =========== 公共 API ===========
 
+    // 设置预约时间
+    // public async setBookingTime(bookingTime: string | null): Promise<void> {
+    //   if (this.store.currentBookingTime !== bookingTime) {
+    //     this.store.currentBookingTime = bookingTime;
+    //
+    //     // 更新过滤后的优惠券列表
+    //     await this.updateFilteredDiscountList();
+    //   }
+    // }
+
+    // 获取当前预约时间
+  }, {
+    key: "getCurrentBookingTime",
+    value: function getCurrentBookingTime() {
+      return this.store.currentBookingTime;
+    }
+
+    // 根据预约时间过滤优惠券列表
+  }, {
+    key: "filterDiscountListByBookingTime",
+    value: function filterDiscountListByBookingTime(discountList, bookingTime) {
+      // 如果全部是普通商品，不需要过滤，直接返回当前数据
+      if (isAllNormalProduct(this.store.productList || [])) {
+        return discountList;
+      }
+
+      // 否则使用 bookingTime 进行过滤
+      return _filterDiscountListByBookingTime(discountList, bookingTime);
+    }
+
+    // 更新过滤后的优惠券列表
+    // private async updateFilteredDiscountList(): Promise<void> {
+    //   const originalList = this.store.originalDiscountList;
+    //   const filteredList = this.filterDiscountListByBookingTime(originalList, this.store.currentBookingTime);
+    //
+    //   this.store.filteredDiscountList = filteredList;
+    //
+    //   // 更新 DiscountModule 中的优惠券列表
+    //   this.setDiscountList(filteredList);
+    //
+    //   if (this.store.productList?.length) {
+    //     const result = this.calcDiscount(this.store.productList);
+    //     await this.core.effects.emit(
+    //       ShopDiscountHooks.onLoadPrepareCalcResult,
+    //       result,
+    //     );
+    //   }
+    // }
+
     // 设置客户
   }, {
     key: "setCustomer",
@@ -233,7 +286,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }() // 计算优惠券
+    }() // 设置holders
+  }, {
+    key: "setHolders",
+    value: function setHolders(holders) {
+      this.store.holders = holders;
+    }
+
+    // 计算优惠券
   }, {
     key: "calcDiscount",
     value: function calcDiscount(productList, options) {
@@ -247,7 +307,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       }
       var _ref = rulesModule.calcDiscount({
           productList: productList,
-          discountList: this.getDiscountList()
+          discountList: this.getDiscountList(),
+          holders: this.store.holders || []
         }, options) || {
           productList: productList,
           discountList: this.getDiscountList()
@@ -385,7 +446,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
-                newDiscountList: withScanList
+                newDiscountList: withScanList,
+                holders: this.store.holders || []
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -497,7 +559,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               if (index !== -1) {
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
                   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.num) || 1).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(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
                 var _discount$discount2, _discount$discount3, _discount$discount4;
@@ -508,7 +570,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.num) || 1),
+                  savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1),
                   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,
@@ -529,17 +591,20 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         var targetProduct = productList.find(function (n) {
           return n.id === id;
         });
+        if (!targetProduct) return false;
         var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
         // 如果 product.total 是小于等于0有可能是她已经用过商品券或者折扣卡导致的，或者本身就是负数价格，所以此时还需要判断 origin_total 是否小于等于0
         // 如果 product.vouchersApplicable是布尔值，并且是 false，也当做免费商品处理，此商品不可用优惠券或折扣卡
         return Number(product === null || product === void 0 ? void 0 : product.total) <= 0 && (Number(product === null || product === void 0 ? void 0 : product.origin_total) <= 0 || !(product !== null && product !== void 0 && product.origin_total)) || isBoolean(product === null || product === void 0 ? void 0 : product.vouchersApplicable) && !(product !== null && product !== void 0 && product.vouchersApplicable);
       };
-      var allUsedProductIds = newDiscountList.map(function (n) {
+      var allUsedProductIds = newDiscountList.filter(function (item) {
+        return !(item !== null && item !== void 0 && item.isEditMode);
+      }).map(function (n) {
         var _n$appliedProductDeta;
-        return n.isSelected ? (_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
+        return n.isSelected ? ((_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
           var _n$discount;
           return (_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.product_id;
-        }) : [];
+        })) || n.product_id : [];
       }).flat();
       newDiscountList.forEach(function (item) {
         var _item$applicableProdu;
@@ -652,7 +717,7 @@ 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$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, _result3;
+        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) {
             case 0:
@@ -665,7 +730,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 customer_id: customerId,
                 action: 'create',
                 with_good_pass: 1,
-                with_discount_card: 1
+                with_discount_card: 1,
+                with_wallet_pass_holder: 1
               });
             case 4:
               goodPassList = _context9.sent;
@@ -678,31 +744,37 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
                 return !scanDiscountIds.includes(n.id);
               });
-              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || []));
+              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              this.setDiscountList(newDiscountList || []);
+              _context9.next = 12;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.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 = 15;
+                _context9.next = 19;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 15;
+              _context9.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 15:
-              _context9.next = 17;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
-            case 17:
-              _context9.next = 22;
-              break;
             case 19:
-              _context9.prev = 19;
+              _context9.next = 21;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+            case 21:
+              _context9.next = 26;
+              break;
+            case 23:
+              _context9.prev = 23;
               _context9.t0 = _context9["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
-            case 22:
+            case 26:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 19]]);
+        }, _callee9, this, [[0, 23]]);
       }));
       function loadPrepareConfig(_x9) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -1,5 +1,6 @@
-import { DiscountModule, Discount } from '../../modules/Discount';
+import { DiscountModule } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
+import { Discount } from "../../modules/Discount/types";
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
     onDestroy = "shopDiscount:onDestroy",
@@ -23,6 +24,13 @@ export interface ShopDiscountState {
     rules: RulesModule | null;
     productList: Record<string, any>[];
     originalDiscountList: Discount[];
+    holders?: {
+        form_record_id: number;
+        form_id?: number;
+        main_field?: string;
+    }[];
+    currentBookingTime: string | null;
+    filteredDiscountList: Discount[];
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

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

@@ -1,5 +1,7 @@
 import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
+export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
+export declare const isAllNormalProduct: (items: any[]) => boolean;
 /**
  * 获取折扣金额 基于折扣卡类型计算
  * 商品券：直接返回商品价格
@@ -10,3 +12,56 @@ export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
+export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
+/**
+ * 获取折扣金额 计算每个折扣的金额
+ * @param discount
+ * @returns
+ */
+export declare const getDiscountListAmount: (discount: Discount[]) => any;
+export interface ScheduleItem {
+    id: number;
+    name: string | {
+        [key: string]: string;
+    };
+    type: 'standard' | 'time-slots' | 'designation';
+    start_time: string | null;
+    end_time: string | null;
+    repeat_type: 'none' | 'daily' | 'weekly';
+    repeat_rule: {
+        end: {
+            type: 'never' | 'date' | 'occurrence';
+            end_date: string | null;
+            occurrence: number | null;
+        };
+        frequency: number;
+        excluded_date: Array<{
+            start: string;
+            end: string;
+        }>;
+        included_date: Array<{
+            start: string;
+            end: string;
+        }>;
+        frequency_date: number[];
+    } | null;
+    designation: Array<{
+        start_date: string;
+        start_time: string;
+        end_date: string;
+        end_time: string;
+    }> | null;
+    is_all: number;
+    time_slot: Array<{
+        start_time: string;
+        end_time: string;
+    }>;
+}
+export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
+/**
+ * 根据预约时间过滤优惠券列表
+ * @param discountList 优惠券列表
+ * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @returns 过滤后的优惠券列表
+ */
+export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];