@pisell/private-materials 6.7.9 → 6.8.1

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

@@ -53,6 +53,7 @@ var import_utils5 = require("../../../info/utils");
 var import_utils6 = require("../../../utils");
 var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils7 = require("../addService/utils");
+var import_utils8 = require("./utils");
 var import_noteModal = __toESM(require("../../../../../plus/noteModal"));
 var import_priceKeyboard = require("../../../../../pro/priceKeyboard");
 var submitLock = false;
@@ -187,7 +188,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2, _c2, _d2;
+    var _a2, _b2, _c2, _d2, _e2, _f2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -222,19 +223,27 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils3.genServiceKey)(_item);
     let _id = _item == null ? void 0 : _item._id;
+    _item = (0, import_utils8.setProductPrice)(_item, {
+      newTotal: values.total,
+      origin_total: (_c2 = _item._extend) == null ? void 0 : _c2.origin_total
+    });
     if (!_list.some((d) => d._id === _id)) {
       const detail = (0, import_utils3.addService)(_list, _item, state);
       _list = detail.list;
     } else {
       if (isChangeTotal.current) {
         delete _item.discount_list;
+        _item = (0, import_utils8.setProductPrice)(_item, {
+          newTotal: values.total,
+          origin_total: (_d2 = _item._extend) == null ? void 0 : _d2.origin_total
+        });
       }
       _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
     }
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_c2 = state.service.cacheItem) == null ? void 0 : _c2.new)) {
+    if (!!((_e2 = state.service.cacheItem) == null ? void 0 : _e2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -243,7 +252,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_d2 = window.closeBookingEditModal) == null ? void 0 : _d2.call(window);
+    (_f2 = window.closeBookingEditModal) == null ? void 0 : _f2.call(window);
     dispatch({
       type: "setService",
       payload: {

package/lib/components/booking/info2/service/editService/utils.d.ts

@@ -11,3 +11,18 @@ export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;
 }) => void;
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
+    newTotal: number;
+    origin_total: number;
+}) => any;

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,21 +16,32 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/booking/info2/service/editService/utils.tsx
 var utils_exports = {};
 __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
-  setAutoAllocationStorage: () => setAutoAllocationStorage
+  setAutoAllocationStorage: () => setAutoAllocationStorage,
+  setProductPrice: () => setProductPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
+var import_utils2 = require("@pisell/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
     const valueObj = JSON.parse(value);
-    return (0, import_utils.isBoolean)(valueObj[id]) ? valueObj[id] : true;
+    return (0, import_utils2.isBoolean)(valueObj[id]) ? valueObj[id] : true;
   }
   return true;
 };
@@ -41,8 +54,32 @@ var setAutoAllocationStorage = (data) => {
     localStorage.setItem("resource-auto-allocation", JSON.stringify({ ...data }));
   }
 };
+var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const discountRatio = new import_decimal.default(newTotal).div(new import_decimal.default(origin_total));
+  let subTotal = new import_decimal.default(0);
+  if (((_a = cacheItem._extend.other) == null ? void 0 : _a.bundle) && (0, import_utils.isArr)((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle)) {
+    (_d = (_c = cacheItem._extend.other) == null ? void 0 : _c.bundle) == null ? void 0 : _d.forEach((bundle) => {
+      const newPrice = new import_decimal.default(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+      const quantity = bundle.num ?? bundle.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
+      bundle.price = newPrice;
+    });
+  }
+  if (((_e = cacheItem._extend.other) == null ? void 0 : _e.option) && (0, import_utils.isArr)((_f = cacheItem._extend.other) == null ? void 0 : _f.option)) {
+    (_h = (_g = cacheItem._extend.other) == null ? void 0 : _g.option) == null ? void 0 : _h.forEach((option) => {
+      const newPrice = new import_decimal.default(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+      const quantity = option.num ?? option.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
+      option.price = newPrice;
+    });
+  }
+  cacheItem._extend.price = new import_decimal.default(newTotal).sub(subTotal).toNumber();
+  return cacheItem;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getAutoAllocationStorage,
-  setAutoAllocationStorage
+  setAutoAllocationStorage,
+  setProductPrice
 });

package/lib/components/booking/utils.d.ts

@@ -152,6 +152,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getMainPrice: (item: any, price?: number) => number;
 export declare const getProductTotalPrice: (item: any) => number;
 /**
  * @title: 判断 duration

package/lib/components/booking/utils.js

@@ -46,6 +46,7 @@ __export(utils_exports, {
   getIsEject: () => getIsEject,
   getIsOnlySession: () => getIsOnlySession,
   getLastServer: () => getLastServer,
+  getMainPrice: () => getMainPrice,
   getNowTime: () => getNowTime,
   getProductTotalPrice: () => getProductTotalPrice,
   getResourceTimeIsUsable: () => getResourceTimeIsUsable,
@@ -627,6 +628,15 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
   }
   return _extend;
 };
+var getMainPrice = (item, price) => {
+  var _a;
+  let newPrice = new import_decimal.default(price || item._extend.price || 0);
+  let other = (_a = item._extend) == null ? void 0 : _a.other;
+  if (other == null ? void 0 : other.product_variant_id) {
+    newPrice = new import_decimal.default((other == null ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
 var getProductTotalPrice = (item) => {
   var _a;
   let price = new import_decimal.default(item._extend.price || 0);
@@ -720,6 +730,7 @@ var getIsEdit = (state) => {
   getIsEject,
   getIsOnlySession,
   getLastServer,
+  getMainPrice,
   getNowTime,
   getProductTotalPrice,
   getResourceTimeIsUsable,

package/lib/components/checkout/PaymentModal.d.ts

@@ -15,16 +15,24 @@ interface PaymentModalProps {
     data?: PaymentModalData;
     callback?: (result: any) => void;
     onClose?: (reset?: boolean) => void;
-    dispatch?: (action: {
-        type: string;
-        payload?: any;
-    }) => void;
-    state?: any;
+    paymentResultDisplayMode?: string;
+    shopDiscount?: number;
+    client?: any;
+    currentTotalPrice?: number;
+    config?: any;
+    onChangeShopDiscount?: (discount: string) => void;
+    onChangeOrderNote?: (note: string) => void;
+    onDeleteOrderNote?: () => void;
 }
 interface PaymentModalMainProps extends PaymentModalProps {
     onClose?: (reset?: boolean) => void;
     setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
     editOrderId?: number;
+    config?: {
+        showHeaderCenter?: boolean;
+        showHeaderRightButton?: boolean;
+        disabledSwitchClient?: boolean;
+    };
 }
 declare const PaymentModal: React.FC<PaymentModalMainProps>;
 export type { PaymentModalData, PaymentModalProps };