@pisell/pisellos 2.2.152 → 2.2.154

package/dist/solution/BookingTicket/utils/orderCustomer.js

@@ -0,0 +1,31 @@
+/** 从 ICustomer 富字段解析展示名（与 SalesSdk getClientName 语义对齐）。 */
+function resolveCustomerDisplayName(customer) {
+  var _customer$name;
+  var c = customer;
+  var displayName = c.display_name;
+  if (typeof displayName === 'string' && displayName) return displayName;
+  var nickname = c.nickname;
+  if (typeof nickname === 'string' && nickname) return nickname;
+  var firstName = c.first_name;
+  var lastName = c.last_name;
+  if (typeof firstName === 'string' && firstName || typeof lastName === 'string' && lastName) {
+    return "".concat(typeof firstName === 'string' ? firstName : '', " ").concat(typeof lastName === 'string' ? lastName : '').trim();
+  }
+  var customerName = c.customer_name;
+  if (typeof customerName === 'string' && customerName) return customerName;
+  return (_customer$name = customer.name) !== null && _customer$name !== void 0 ? _customer$name : '';
+}
+
+/** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
+export function formatOrderCustomerPatch(customer) {
+  var _customer$phone, _customer$email, _country_calling_code, _country_calling_code2;
+  var rawId = customer.id;
+  var numericId = typeof rawId === 'number' ? rawId : rawId !== undefined && rawId !== null && rawId !== '' ? Number(rawId) : null;
+  return {
+    customer_id: Number.isFinite(numericId) ? numericId : null,
+    customer_name: resolveCustomerDisplayName(customer),
+    phone: (_customer$phone = customer.phone) !== null && _customer$phone !== void 0 ? _customer$phone : '',
+    email: (_customer$email = customer.email) !== null && _customer$email !== void 0 ? _customer$email : '',
+    country_calling_code: (_country_calling_code = (_country_calling_code2 = customer.country_calling_code) === null || _country_calling_code2 === void 0 ? void 0 : _country_calling_code2.toString()) !== null && _country_calling_code !== void 0 ? _country_calling_code : ''
+  };
+}

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

@@ -82,6 +82,9 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getResourceId;
     private getBookingAppointmentStatus;
     private getBookingOrderPaymentStatus;
+    private countBookingOrders;
+    private countCompletedBookings;
+    private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
     /**

package/dist/solution/Sales/index.js

@@ -409,6 +409,43 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _booking$order$paymen, _booking$order;
       return String((_booking$order$paymen = (_booking$order = booking.order) === null || _booking$order === void 0 ? void 0 : _booking$order.payment_status) !== null && _booking$order$paymen !== void 0 ? _booking$order$paymen : '');
     }
+  }, {
+    key: "countBookingOrders",
+    value: function countBookingOrders(bookings) {
+      var orderIds = new Set();
+      bookings.forEach(function (booking) {
+        var _order_id, _booking$order2;
+        var orderId = (_order_id = booking.order_id) !== null && _order_id !== void 0 ? _order_id : (_booking$order2 = booking.order) === null || _booking$order2 === void 0 ? void 0 : _booking$order2.order_id;
+        if (orderId === undefined || orderId === null) return;
+        orderIds.add(String(orderId));
+      });
+      return orderIds.size;
+    }
+  }, {
+    key: "countCompletedBookings",
+    value: function countCompletedBookings(bookings) {
+      var _this2 = this;
+      return bookings.filter(function (booking) {
+        return _this2.getBookingAppointmentStatus(booking) === 'completed';
+      }).length;
+    }
+  }, {
+    key: "groupBookingsByResource",
+    value: function groupBookingsByResource(bookingList) {
+      var bookingMap = new Map();
+      bookingList.forEach(function (booking) {
+        if (!Array.isArray(booking.resources)) return;
+        booking.resources.forEach(function (resource) {
+          var relationId = resource === null || resource === void 0 ? void 0 : resource.relation_id;
+          if (relationId === undefined || relationId === null) return;
+          var key = String(relationId);
+          var list = bookingMap.get(key) || [];
+          list.push(booking);
+          bookingMap.set(key, list);
+        });
+      });
+      return bookingMap;
+    }
   }, {
     key: "isBookingMatchedResource",
     value: function isBookingMatchedResource(booking, resourceId) {
@@ -422,10 +459,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sortMatchedBookings",
     value: function sortMatchedBookings(bookings) {
-      var _this2 = this;
+      var _this3 = this;
       return _toConsumableArray(bookings).sort(function (left, right) {
-        var leftStartAt = _this2.toBookingDateTime(left.start_date, left.start_time).valueOf();
-        var rightStartAt = _this2.toBookingDateTime(right.start_date, right.start_time).valueOf();
+        var leftStartAt = _this3.toBookingDateTime(left.start_date, left.start_time).valueOf();
+        var rightStartAt = _this3.toBookingDateTime(right.start_date, right.start_time).valueOf();
         return leftStartAt - rightStartAt;
       });
     }
@@ -440,17 +477,17 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pickBookingsForCurrentPoint",
     value: function pickBookingsForCurrentPoint(current, bookings) {
-      var _this3 = this;
+      var _this4 = this;
       if (bookings.length === 0) return [];
       var currentDayStart = current.startOf('day');
       var currentDayEnd = current.endOf('day');
 
       // 仅保留与 current 当天有时间交集的预约，避免跨天误命中
       var dayScopedBookings = bookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this3.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this3.isSameOrBefore(startAt, currentDayEnd) && _this3.isSameOrAfter(endAt, currentDayStart);
+        return _this4.isSameOrBefore(startAt, currentDayEnd) && _this4.isSameOrAfter(endAt, currentDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
@@ -460,21 +497,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (!shouldAppendNextGroup) return selectedBookings;
         var selectedStartValues = new Set(selectedBookings.map(function (booking) {
-          return _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          return _this4.toBookingDateTime(booking.start_date, booking.start_time);
         }).filter(function (startAt) {
           return startAt.isValid();
         }).map(function (startAt) {
           return startAt.valueOf();
         }));
         var futureCandidates = dayScopedBookings.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           if (!startAt.isValid()) return false;
           return startAt.isAfter(current) && !selectedStartValues.has(startAt.valueOf());
         });
         if (futureCandidates.length === 0) return selectedBookings;
-        var nextStartAt = _this3.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
+        var nextStartAt = _this4.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
         var nextStartGroup = futureCandidates.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
@@ -486,10 +523,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // active: current 处于 [startAt, endAt] 区间
       var activeBookings = dayScopedBookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this3.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this3.isSameOrAfter(current, startAt) && _this3.isSameOrBefore(current, endAt);
+        return _this4.isSameOrAfter(current, startAt) && _this4.isSameOrBefore(current, endAt);
       });
       if (activeBookings.length > 0) return appendNextStartGroupIfNeeded(activeBookings);
 
@@ -501,13 +538,13 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
         return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
       });
       if (upcoming.length > 0) {
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
         var upcomingStartGroup = upcoming.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.valueOf() === firstStartAt;
         });
         return appendNextStartGroupIfNeeded(upcomingStartGroup);
@@ -560,10 +597,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeResourceBookings",
     value: function normalizeResourceBookings(current, deviceCurrent, bookingList) {
-      var _this4 = this;
+      var _this5 = this;
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var normalizedBookings = bookingList.map(function (booking) {
-        return _this4.normalizeMatchedBooking(current, deviceCurrent, booking, options);
+        return _this5.normalizeMatchedBooking(current, deviceCurrent, booking, options);
       }).filter(function (booking) {
         return Boolean(booking);
       }).filter(function (booking) {
@@ -693,7 +730,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(currentTime) {
         var _resourceResponse$dat,
           _resourceResponse$dat2,
-          _this5 = this;
+          _this6 = this;
         var bookingList,
           deviceTime,
           current,
@@ -701,6 +738,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           resourceResponse,
           resourceList,
           normalizedBookings,
+          rawBookingMap,
           bookingMap,
           list,
           _args5 = arguments;
@@ -745,26 +783,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 14:
               // 全局先做 booking 标准化 + start_time 升序，后续映射直接复用
               normalizedBookings = this.normalizeResourceBookings(current, deviceCurrent, bookingList); // 建立 resourceId -> bookings[] 倒排索引，加速资源匹配
-              bookingMap = new Map();
-              normalizedBookings.forEach(function (booking) {
-                if (!Array.isArray(booking.resources)) return;
-                booking.resources.forEach(function (resource) {
-                  var relationId = resource === null || resource === void 0 ? void 0 : resource.relation_id;
-                  if (relationId === undefined || relationId === null) return;
-                  var key = String(relationId);
-                  var list = bookingMap.get(key) || [];
-                  list.push(booking);
-                  bookingMap.set(key, list);
-                });
-              });
-
-              // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
+              rawBookingMap = this.groupBookingsByResource(bookingList);
+              bookingMap = this.groupBookingsByResource(normalizedBookings); // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
               list = resourceList.map(function (resource) {
-                var resourceId = _this5.getResourceId(resource);
+                var resourceId = _this6.getResourceId(resource);
+                var rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
-                var bookings = _this5.pickBookingsForCurrentPoint(current, matchedBookings);
+                var orderCount = _this6.countBookingOrders(rawMatchedBookings);
+                var bookingCount = rawMatchedBookings.length;
+                var compeleteBookingCount = _this6.countCompletedBookings(rawMatchedBookings);
+                var bookings = _this6.pickBookingsForCurrentPoint(current, matchedBookings);
                 return _objectSpread(_objectSpread({}, resource), {}, {
                   resource_id: resourceId,
+                  orderCount: orderCount,
+                  bookingCount: bookingCount,
+                  compeleteBookingCount: compeleteBookingCount,
                   bookings: bookings
                 });
               });
@@ -796,9 +829,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var _resourceResponse$dat3,
           _resourceResponse$dat4,
-          _this6 = this,
+          _this7 = this,
           _params$bookingList;
-        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings;
+        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -836,7 +869,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context6.abrupt("return", null);
             case 12:
               targetResource = resourceList.find(function (resource) {
-                return String(_this6.getResourceId(resource)) === String(params.resourceId);
+                return String(_this7.getResourceId(resource)) === String(params.resourceId);
               });
               if (targetResource) {
                 _context6.next = 15;
@@ -846,19 +879,22 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 15:
               resourceId = this.getResourceId(targetResource);
               matchedBookingList = params.bookingList.filter(function (booking) {
-                return _this6.isBookingMatchedResource(booking, resourceId);
+                return _this7.isBookingMatchedResource(booking, resourceId);
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
-                return _this6.getBookingAppointmentStatus(booking) === 'completed';
+                return _this7.getBookingAppointmentStatus(booking) === 'completed';
               });
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this6.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this6.getBookingOrderPaymentStatus(booking) === 'payment_processing';
+                return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
               completedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, completedBookingList, {
                 includeCompleted: true
               }));
               unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList));
+              orderCount = this.countBookingOrders(matchedBookingList);
+              bookingCount = matchedBookingList.length;
+              compeleteBookingCount = completedBookingList.length;
               this.logger.addLog({
                 type: 'info',
                 title: 'getResourceBookingItem',
@@ -869,16 +905,22 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   bookingList: (_params$bookingList = params.bookingList) === null || _params$bookingList === void 0 ? void 0 : _params$bookingList.length,
                   bookings: bookings.length,
                   completedBookings: completedBookings.length,
-                  unpaidBookings: unpaidBookings.length
+                  unpaidBookings: unpaidBookings.length,
+                  orderCount: orderCount,
+                  bookingCount: bookingCount,
+                  compeleteBookingCount: compeleteBookingCount
                 }
               });
               return _context6.abrupt("return", _objectSpread(_objectSpread({}, targetResource), {}, {
                 resource_id: resourceId,
+                orderCount: orderCount,
+                bookingCount: bookingCount,
+                compeleteBookingCount: compeleteBookingCount,
                 bookings: bookings,
                 completedBookings: completedBookings,
                 unpaidBookings: unpaidBookings
               }));
-            case 24:
+            case 27:
             case "end":
               return _context6.stop();
           }

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

@@ -30,6 +30,9 @@ export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'>
 }
 export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {
     resource_id: ResourceId;
+    orderCount: number;
+    bookingCount: number;
+    compeleteBookingCount: number;
     bookings: SalesResourceMatchedBooking[];
 }
 export interface SalesResourceBookingItemWithGroups extends SalesResourceBookingItem {

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

@@ -85,13 +85,13 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
+ * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
+ *   出站保留 `{ option_group_item_id, option_group_id, num }`
  *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 export interface ScanOrderSubmitProduct extends Omit<ScanOrderOrderProduct, '_origin' | 'identity_key'> {
     /**

package/dist/solution/ScanOrder/types.js

@@ -14,13 +14,13 @@ export var ScanOrderHooks = /*#__PURE__*/function (ScanOrderHooks) {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
+ * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
+ *   出站保留 `{ option_group_item_id, option_group_id, num }`
  *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 
 /**

package/dist/solution/ScanOrder/utils.js

@@ -381,14 +381,14 @@ export function buildProductLineFingerprint(productOptionItem, productBundle) {
   var normalizedOpts = optArr.map(function (item) {
     var _item$price;
     return {
-      product_option_item_id: Number(item === null || item === void 0 ? void 0 : item.product_option_item_id) || 0,
+      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
       option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
       num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
       price: String((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : '')
     };
   }).sort(function (p, q) {
-    if (p.product_option_item_id !== q.product_option_item_id) {
-      return p.product_option_item_id - q.product_option_item_id;
+    if (p.option_group_item_id !== q.option_group_item_id) {
+      return p.option_group_item_id - q.option_group_item_id;
     }
     if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
     if (p.num !== q.num) return p.num - q.num;

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

@@ -30,6 +30,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
+    setOrderId(id?: number): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
@@ -56,7 +57,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private bestDiscount;
     loadPrepareConfig(params: {
         customerId: number;
-        action?: 'create' | 'update';
+        action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
     }): Promise<void>;

package/dist/solution/ShopDiscount/index.js

@@ -57,7 +57,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       currentBookingTime: "",
       filteredDiscountList: [],
       bookingSubject: undefined,
-      orderTotalAmount: 0
+      orderTotalAmount: 0,
+      orderId: undefined
     };
     return _this;
   }
@@ -307,6 +308,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setBookingSubject(bookingSubject) {
       this.store.bookingSubject = bookingSubject;
     }
+  }, {
+    key: "setOrderId",
+    value: function setOrderId(id) {
+      this.store.orderId = id;
+    }
 
     // 计算优惠券
   }, {
@@ -406,7 +412,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             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);
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code, {
+                customerId: customerId,
+                orderId: this.store.orderId
+              });
             case 3:
               _context5.t0 = _context5.sent;
               if (_context5.t0) {
@@ -742,24 +751,27 @@ 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;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.prev = 0;
+              orderId = this.store.orderId;
               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({
+              _context9.next = 5;
+              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig(_objectSpread({
                 customer_id: customerId,
-                action: 'create',
+                action: orderId ? 'edit' : 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              });
-            case 4:
+              }, orderId ? {
+                order_id: orderId
+              } : {}));
+            case 5:
               goodPassList = _context9.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
@@ -772,35 +784,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context9.next = 12;
+              _context9.next = 13;
               return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
-            case 12:
+            case 13:
               // 根据当前预约时间过滤优惠券列表
               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;
+                _context9.next = 20;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 19;
+              _context9.next = 20;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 19:
-              _context9.next = 21;
+            case 20:
+              _context9.next = 22;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 21:
-              _context9.next = 26;
+            case 22:
+              _context9.next = 27;
               break;
-            case 23:
-              _context9.prev = 23;
+            case 24:
+              _context9.prev = 24;
               _context9.t0 = _context9["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
-            case 26:
+            case 27:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 23]]);
+        }, _callee9, this, [[0, 24]]);
       }));
       function loadPrepareConfig(_x9) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -36,6 +36,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/lib/core/index.js

@@ -50,6 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/modules/Cart/utils/cartProduct.js

@@ -289,7 +289,7 @@ var formatOptionsToOrigin = (options) => {
   return options.map((d) => {
     return {
       num: d.num,
-      option_group_item_id: d.product_option_item_id,
+      option_group_item_id: d.option_group_item_id,
       option_group_id: d.option_group_id
     };
   });

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

@@ -17,14 +17,18 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: 'create';
+        action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
         request_timezone: string;
+        order_id?: number;
+    }): Promise<Discount[]>;
+    batchSearch(code: string, options?: {
+        customerId?: number;
+        orderId?: number;
     }): Promise<Discount[]>;
-    batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -102,7 +102,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     ) || [];
     return goodPassList;
   }
-  async batchSearch(code, customerId) {
+  async batchSearch(code, options) {
+    const { customerId, orderId } = options || {};
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
@@ -112,6 +113,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
       order_behavior_count_customer_id: customerId || 1,
+      ...orderId ? { order_behavior_count_order_id: orderId } : {},
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];

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

@@ -18,6 +18,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private cacheId;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
+    private orderHooks?;
     private otherParams?;
     /**
      * Populate `savedAmount` on each discount based on product-level discount details.
@@ -143,6 +144,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 视为 wallet pass；其它支付项保持不变。
      */
     updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private shouldMergeProductToOrder;
     addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
     private hasGoodPassDiscount;
     updateProductInOrder(params: UpdateProductInOrderParams): Promise<OrderProduct[]>;