@pisell/private-materials 6.6.73 → 6.6.74

package/es/components/booking/info2/service/editService/index.js

@@ -52,6 +52,20 @@ import { useShopDiscountModule } from "../../../../ticketBooking/hooks/pisellos/
 import DiscountChangeModal from "./DiscountChangeModal";
 import Decimal from "decimal.js";
 var submitLock = false;
+
+/**
+ * 判断 list 项是否与当前编辑项为同一条已存在预约（_id 失配时的 fallback）
+ * 仅当 booking_id、order_detail_id 均有效时成立，避免新建预约误匹配
+ */
+var isSameBookingServiceItem = function isSameBookingServiceItem(listItem, editItem) {
+  var _editItem$_extend, _listItem$_extend;
+  var bookingId = editItem === null || editItem === void 0 ? void 0 : editItem.booking_id;
+  var orderDetailId = editItem === null || editItem === void 0 || (_editItem$_extend = editItem._extend) === null || _editItem$_extend === void 0 ? void 0 : _editItem$_extend.order_detail_id;
+  if (!bookingId || !orderDetailId) {
+    return false;
+  }
+  return (listItem === null || listItem === void 0 ? void 0 : listItem.booking_id) === bookingId && (listItem === null || listItem === void 0 || (_listItem$_extend = listItem._extend) === null || _listItem$_extend === void 0 ? void 0 : _listItem$_extend.order_detail_id) === orderDetailId;
+};
 var Info = function Info(_, ref) {
   var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI17, _state$client2;
   var _Form$useForm = Form.useForm(),
@@ -437,22 +451,44 @@ var Info = function Info(_, ref) {
         newTotal: values.total,
         origin_total: origin_total !== null && origin_total !== void 0 ? origin_total : (_item$_extend6 = _item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.origin_total
       });
-      // 判断是新增还是编辑
-      if (!_list.some(function (d) {
+      // 判断是新增还是编辑：优先 _id；失配时用 booking_id + order_detail_id fallback 并去重
+      var matchById = _list.some(function (d) {
         return d._id === _id;
-      })) {
-        var detail = addService(_list, _item, state);
-        _list = detail.list;
-      } else {
-        // 手动改价时移除优惠券使用
+      });
+      var matchByBooking = !matchById && _list.some(function (d) {
+        return isSameBookingServiceItem(d, _item);
+      });
+      if (matchById || matchByBooking) {
         if (isChangeTotal.current) {
           _item = deleteDiscountList(_item);
         }
-        _list = _list.map(function (d) {
-          return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
-            new: 0
-          }) : d;
-        });
+        if (matchById) {
+          _list = _list.map(function (d) {
+            return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
+              new: 0
+            }) : d;
+          });
+        } else {
+          // fallback：合并同预约重复项，沿用 list 内 _id 避免再次失配
+          var replaced = false;
+          _list = _list.reduce(function (acc, d) {
+            if (isSameBookingServiceItem(d, _item)) {
+              if (!replaced) {
+                acc.push(_objectSpread(_objectSpread({}, _item), {}, {
+                  new: 0,
+                  _id: d._id
+                }));
+                replaced = true;
+              }
+            } else {
+              acc.push(d);
+            }
+            return acc;
+          }, []);
+        }
+      } else {
+        var detail = addService(_list, _item, state);
+        _list = detail.list;
       }
     }
     deleteCacheParams();

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -299,8 +299,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/booking/info2/service/editService/index.js

@@ -65,6 +65,15 @@ var import_useShopDiscountModule = require("../../../../ticketBooking/hooks/pise
 var import_DiscountChangeModal = __toESM(require("./DiscountChangeModal"));
 var import_decimal = __toESM(require("decimal.js"));
 var submitLock = false;
+var isSameBookingServiceItem = (listItem, editItem) => {
+  var _a, _b;
+  const bookingId = editItem == null ? void 0 : editItem.booking_id;
+  const orderDetailId = (_a = editItem == null ? void 0 : editItem._extend) == null ? void 0 : _a.order_detail_id;
+  if (!bookingId || !orderDetailId) {
+    return false;
+  }
+  return (listItem == null ? void 0 : listItem.booking_id) === bookingId && ((_b = listItem == null ? void 0 : listItem._extend) == null ? void 0 : _b.order_detail_id) === orderDetailId;
+};
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K;
   const [form] = import_antd.Form.useForm();
@@ -330,14 +339,31 @@ var Info = (_, ref) => {
         newTotal: values.total,
         origin_total: origin_total ?? ((_o2 = _item._extend) == null ? void 0 : _o2.origin_total)
       });
-      if (!_list.some((d) => d._id === _id)) {
-        const detail = (0, import_utils3.addService)(_list, _item, state);
-        _list = detail.list;
-      } else {
+      const matchById = _list.some((d) => d._id === _id);
+      const matchByBooking = !matchById && _list.some((d) => isSameBookingServiceItem(d, _item));
+      if (matchById || matchByBooking) {
         if (isChangeTotal.current) {
           _item = deleteDiscountList(_item);
         }
-        _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
+        if (matchById) {
+          _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
+        } else {
+          let replaced = false;
+          _list = _list.reduce((acc, d) => {
+            if (isSameBookingServiceItem(d, _item)) {
+              if (!replaced) {
+                acc.push({ ..._item, new: 0, _id: d._id });
+                replaced = true;
+              }
+            } else {
+              acc.push(d);
+            }
+            return acc;
+          }, []);
+        }
+      } else {
+        const detail = (0, import_utils3.addService)(_list, _item, state);
+        _list = detail.list;
       }
     }
     (0, import_utils6.deleteCacheParams)();

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -299,8 +299,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.73",
+  "version": "6.6.74",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,10 +61,10 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.6.17",
     "@pisell/date-picker": "3.0.7",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",