@pisell/pisellos 2.2.152 → 2.2.154

package/lib/solution/Sales/index.js

@@ -254,6 +254,37 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     var _a;
     return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
   }
+  countBookingOrders(bookings) {
+    const orderIds = /* @__PURE__ */ new Set();
+    bookings.forEach((booking) => {
+      var _a;
+      const orderId = booking.order_id ?? ((_a = booking.order) == null ? void 0 : _a.order_id);
+      if (orderId === void 0 || orderId === null)
+        return;
+      orderIds.add(String(orderId));
+    });
+    return orderIds.size;
+  }
+  countCompletedBookings(bookings) {
+    return bookings.filter((booking) => this.getBookingAppointmentStatus(booking) === "completed").length;
+  }
+  groupBookingsByResource(bookingList) {
+    const bookingMap = /* @__PURE__ */ new Map();
+    bookingList.forEach((booking) => {
+      if (!Array.isArray(booking.resources))
+        return;
+      booking.resources.forEach((resource) => {
+        const relationId = resource == null ? void 0 : resource.relation_id;
+        if (relationId === void 0 || relationId === null)
+          return;
+        const key = String(relationId);
+        const list = bookingMap.get(key) || [];
+        list.push(booking);
+        bookingMap.set(key, list);
+      });
+    });
+    return bookingMap;
+  }
   isBookingMatchedResource(booking, resourceId) {
     if (!Array.isArray(booking.resources))
       return false;
@@ -534,27 +565,22 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     if (!Array.isArray(resourceList) || resourceList.length === 0)
       return [];
     const normalizedBookings = this.normalizeResourceBookings(current, deviceCurrent, bookingList);
-    const bookingMap = /* @__PURE__ */ new Map();
-    normalizedBookings.forEach((booking) => {
-      if (!Array.isArray(booking.resources))
-        return;
-      booking.resources.forEach((resource) => {
-        const relationId = resource == null ? void 0 : resource.relation_id;
-        if (relationId === void 0 || relationId === null)
-          return;
-        const key = String(relationId);
-        const list2 = bookingMap.get(key) || [];
-        list2.push(booking);
-        bookingMap.set(key, list2);
-      });
-    });
+    const rawBookingMap = this.groupBookingsByResource(bookingList);
+    const bookingMap = this.groupBookingsByResource(normalizedBookings);
     const list = resourceList.map((resource) => {
       const resourceId = this.getResourceId(resource);
+      const rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
       const matchedBookings = bookingMap.get(String(resourceId)) || [];
+      const orderCount = this.countBookingOrders(rawMatchedBookings);
+      const bookingCount = rawMatchedBookings.length;
+      const compeleteBookingCount = this.countCompletedBookings(rawMatchedBookings);
       const bookings = this.pickBookingsForCurrentPoint(current, matchedBookings);
       return {
         ...resource,
         resource_id: resourceId,
+        orderCount,
+        bookingCount,
+        compeleteBookingCount,
         bookings
       };
     });
@@ -616,6 +642,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       current,
       this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList)
     );
+    const orderCount = this.countBookingOrders(matchedBookingList);
+    const bookingCount = matchedBookingList.length;
+    const compeleteBookingCount = completedBookingList.length;
     this.logger.addLog({
       type: "info",
       title: "getResourceBookingItem",
@@ -626,12 +655,18 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
         bookingList: (_b = params.bookingList) == null ? void 0 : _b.length,
         bookings: bookings.length,
         completedBookings: completedBookings.length,
-        unpaidBookings: unpaidBookings.length
+        unpaidBookings: unpaidBookings.length,
+        orderCount,
+        bookingCount,
+        compeleteBookingCount
       }
     });
     return {
       ...targetResource,
       resource_id: resourceId,
+      orderCount,
+      bookingCount,
+      compeleteBookingCount,
       bookings,
       completedBookings,
       unpaidBookings

package/lib/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/lib/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/lib/solution/ScanOrder/utils.js

@@ -349,13 +349,13 @@ function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
 function buildProductLineFingerprint(productOptionItem, productBundle) {
   const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
   const normalizedOpts = optArr.map((item) => ({
-    product_option_item_id: Number(item == null ? void 0 : item.product_option_item_id) || 0,
+    option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
     option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
     num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
     price: String((item == null ? void 0 : item.price) ?? "")
   })).sort((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;

package/lib/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/lib/solution/ShopDiscount/index.js

@@ -57,7 +57,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       currentBookingTime: "",
       filteredDiscountList: [],
       bookingSubject: void 0,
-      orderTotalAmount: 0
+      orderTotalAmount: 0,
+      orderId: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -205,6 +206,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setBookingSubject(bookingSubject) {
     this.store.bookingSubject = bookingSubject;
   }
+  setOrderId(id) {
+    this.store.orderId = id;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
     var _a;
@@ -270,7 +274,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async scanCode(code, customerId) {
     var _a, _b, _c;
     try {
-      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
+      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId, orderId: this.store.orderId })) || [];
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {
@@ -497,14 +501,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d, _e;
     try {
+      const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         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
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        ...orderId ? { order_id: orderId } : {}
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/lib/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/package.json

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