@pisell/private-materials 6.9.2 → 6.9.4

package/lib/components/booking/info/client/index.js

@@ -48,13 +48,17 @@ var import_utils3 = require("../clientVariant/utils");
 var import_useGetHolderList = __toESM(require("../hooks/useGetHolderList"));
 var isLoadClient = false;
 var Client = () => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
   const modalRef = (0, import_react.useRef)();
   const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [franchiseeLoading, setFranchiseeLoading] = (0, import_react.useState)(0);
   const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
+  const boardConfig = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
+  }, [(_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic]);
   const [params, setParams] = (0, import_react.useState)({
     skip: 1,
     num: 10,
@@ -95,10 +99,14 @@ var Client = () => {
     if (!withKey.includes("contactsInfo")) {
       withKey.push("contactsInfo");
     }
+    if (!(withKey == null ? void 0 : withKey.includes("formRecord"))) {
+      withKey.push("formRecord");
+    }
     const data = await api({
       ...resetParams,
       with: withKey,
-      ...!state.isFranchisee ? { _config: { abort: true } } : {}
+      ...!state.isFranchisee ? { _config: { abort: true } } : {},
+      relation_form_id: (boardConfig == null ? void 0 : boardConfig.form_id) || void 0
     });
     const list = ((data == null ? void 0 : data.list) || []).map((d) => {
       return {
@@ -268,7 +276,7 @@ var Client = () => {
   const isWalkIn = (0, import_react.useMemo)(() => {
     var _a2;
     return (0, import_utils2.isWalkIn)((_a2 = state.client.value) == null ? void 0 : _a2.id);
-  }, [(_a = state.client.value) == null ? void 0 : _a.id]);
+  }, [(_c = state.client.value) == null ? void 0 : _c.id]);
   (0, import_react.useEffect)(() => {
     if (state.action) {
       state.action({
@@ -379,7 +387,7 @@ var Client = () => {
         }
       }
     );
-  }, [state.isTerminal, state.modalOpen, (_b = state.client) == null ? void 0 : _b.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
+  }, [state.isTerminal, state.modalOpen, (_d = state.client) == null ? void 0 : _d.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -396,17 +404,17 @@ var Client = () => {
       import_antd.Avatar,
       {
         className: "pisell-lowcode__booking-client-list-item-avatar",
-        src: import_utils.image.ali((_c = state.client.value) == null ? void 0 : _c.cover, 100),
+        src: import_utils.image.ali((_e = state.client.value) == null ? void 0 : _e.cover, 100),
         icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
       }
     ),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_d = state.client.value) == null ? void 0 : _d.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_e = state.client.value) == null ? void 0 : _e.email) : null, ((_f = state.client.value) == null ? void 0 : _f.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_g = state.client.value) == null ? void 0 : _g.phone) : null, !!((_i = (_h = state.client.value) == null ? void 0 : _h.waiver_form) == null ? void 0 : _i.length) && /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_f = state.client.value) == null ? void 0 : _f.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_g = state.client.value) == null ? void 0 : _g.email) : null, ((_h = state.client.value) == null ? void 0 : _h.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_i = state.client.value) == null ? void 0 : _i.phone) : null, !!((_k = (_j = state.client.value) == null ? void 0 : _j.waiver_form) == null ? void 0 : _k.length) && /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "pisell-lowcode__booking-client-waiver",
-        title: (0, import_utils3.getWaiverTitle)((_j = state.client.value) == null ? void 0 : _j.waiver_form)
+        title: (0, import_utils3.getWaiverTitle)((_l = state.client.value) == null ? void 0 : _l.waiver_form)
       },
-      (_m = (_l = (_k = state.client.value) == null ? void 0 : _k.waiver_form) == null ? void 0 : _l.map) == null ? void 0 : _m.call(_l, (item) => {
+      (_o = (_n = (_m = state.client.value) == null ? void 0 : _m.waiver_form) == null ? void 0 : _n.map) == null ? void 0 : _o.call(_n, (item) => {
         return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement(
           "span",
           {

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/lib/components/booking/info/header/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const header: ({ state, dispatch }: any) => JSX.Element;
 export default header;

package/lib/components/booking/info/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/lib/components/booking/info/model.d.ts

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/booking/info/service2/Group/utils.js

@@ -68,7 +68,7 @@ var concatBookings = (items) => {
   };
 };
 var createBookingItemsByGroup = (item, isBatchEdit) => {
-  var _a, _b;
+  var _a, _b, _c;
   const groupId = item._extend.groupId || (0, import_utils.getUniqueId)("bookingGroup_");
   let bookings = [];
   for (let i = 0; i < item._extend.duration; i++) {
@@ -97,7 +97,7 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
     };
     const totalPrice = (0, import_utils2.getProductTotalPrice)(cacheItem);
     cacheItem._extend.total = totalPrice;
-    cacheItem._extend.origin_total = totalPrice;
+    cacheItem._extend.origin_total = ((_c = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _c.origin_total) ?? totalPrice;
     cacheItem._extend.items = void 0;
     cacheItem._serviceKey = (0, import_utils3.genServiceKey)(cacheItem);
     bookings.push(cacheItem);

package/lib/components/booking/info/service2/utils.js

@@ -174,12 +174,14 @@ var currentResource = (state, useResource, cacheItem) => {
 };
 var handleChangeHolder = (products, currentItem, other) => {
   return products.map((item) => {
-    if (item._id === currentItem._id) {
+    var _a, _b, _c, _d;
+    const isSameGroup = ((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId) && ((_b = item._extend) == null ? void 0 : _b.groupId) === ((_d = (_c = currentItem == null ? void 0 : currentItem._origin) == null ? void 0 : _c._extend) == null ? void 0 : _d.groupId);
+    if (item._id === currentItem._id || isSameGroup) {
       return {
         ...item,
         _extend: {
           ...item._extend,
-          holder_id: (0, import_utils2.isArr)(other) ? other.map((item2) => item2.id) : item._extend.quantity > 1 ? [other.id] : other.id
+          holder_id: (0, import_utils2.isArr)(other) ? other.map((item2) => item2.id) : item._extend.quantity > 1 ? [other.id] : other == null ? void 0 : other.id
         }
       };
     }
@@ -531,6 +533,7 @@ var getGeneralParams = (item, state, isParallelResource) => {
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
     isShowAction: (0, import_utils4.isShowAddTime)(state, item),
+    allowClearHolder: true,
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
     actionIcon: "pisell2-clock-plus",
     isMultipleResource: true,
@@ -578,6 +581,7 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       title: item == null ? void 0 : item.title,
       // 购物车显示需要 title 字段
       price: (_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.price,
+      totalDifference: (0, import_amount.getProductDiscountProductDiscountDifference)(item),
       total: calcAddTimeTotalPrice((_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.total, (_i = item == null ? void 0 : item._extend) == null ? void 0 : _i.relation_details),
       origin_total: calcAddTimeTotalPrice((_j = item == null ? void 0 : item._extend) == null ? void 0 : _j.origin_total, (_k = item == null ? void 0 : item._extend) == null ? void 0 : _k.relation_details),
       num: item == null ? void 0 : item._extend.quantity,

package/lib/components/booking/info2/cartClientCard/index.js

@@ -55,7 +55,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
   beforeSwitchModalOpen,
   onClientChange
 }, ref) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const clientSearchRef = (0, import_react.useRef)(null);
   const [searchModalVisible, setSearchModalVisible] = (0, import_react.useState)(false);
   const [switchModalVisible, setSwitchModalVisible] = (0, import_react.useState)(false);
@@ -75,6 +75,10 @@ var CartClientCard = (0, import_react.forwardRef)(({
     import_locales.default,
     ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.storage) == null ? void 0 : _c.get("umi_locale")) || "en"
   );
+  const boardConfig = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
+  }, [(_e = (_d = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _d.config) == null ? void 0 : _e.basic]);
   const {
     customers,
     loading,
@@ -86,23 +90,23 @@ var CartClientCard = (0, import_react.forwardRef)(({
     hasMore,
     loadMore
   } = (0, import_useCustomer.useCustomer)({});
-  const selectedCustomer = (_d = state.client) == null ? void 0 : _d.value;
+  const selectedCustomer = (_f = state.client) == null ? void 0 : _f.value;
   const handleSearchClient = async (keyword2) => {
     var _a2, _b2;
-    await initLoad(keyword2);
+    await initLoad(keyword2, boardConfig == null ? void 0 : boardConfig.form_id);
     (_b2 = (_a2 = clientSearchRef.current) == null ? void 0 : _a2.resetScrollPosition) == null ? void 0 : _b2.call(_a2);
   };
   const _debouncedSearch = (0, import_ahooks.useDebounceFn)(
-    async (_keyword) => {
+    async (_keyword, formId) => {
       var _a2, _b2;
-      await initLoad(keyword);
+      await initLoad(keyword, formId);
       (_b2 = (_a2 = clientSearchRef.current) == null ? void 0 : _a2.resetScrollPosition) == null ? void 0 : _b2.call(_a2);
     },
     { wait: 500 }
   );
   (0, import_react.useEffect)(() => {
-    _debouncedSearch.run(keyword);
-  }, [keyword]);
+    _debouncedSearch.run(keyword, boardConfig == null ? void 0 : boardConfig.form_id);
+  }, [keyword, boardConfig == null ? void 0 : boardConfig.form_id]);
   (0, import_react.useEffect)(() => {
     if (state.action) {
       state.action({
@@ -195,7 +199,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
     };
   }, [pagination, loading]);
   const handleSetClient = (0, import_ahooks.useMemoizedFn)(async (record, options) => {
-    var _a2, _b2, _c2, _d2, _e;
+    var _a2, _b2, _c2, _d2, _e2;
     if ((0, import_utils2.isWalkIn)(selectedCustomer == null ? void 0 : selectedCustomer.id) && ((_a2 = options == null ? void 0 : options.fullData) == null ? void 0 : _a2.searchType) === "walletPass" && ((_b2 = options == null ? void 0 : options.fullData) == null ? void 0 : _b2.scanCode)) {
       window.dispatchEvent(
         new CustomEvent("onScanWallPassCode", {
@@ -214,7 +218,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
     }
     if ((selectedCustomer == null ? void 0 : selectedCustomer.id) === (record == null ? void 0 : record.id)) {
       if (options == null ? void 0 : options.sameClientTip) {
-        (_e = Toast == null ? void 0 : Toast.info) == null ? void 0 : _e.call(Toast, options.sameClientTip);
+        (_e2 = Toast == null ? void 0 : Toast.info) == null ? void 0 : _e2.call(Toast, options.sameClientTip);
       }
       setSearchModalVisible(false);
       return;
@@ -308,13 +312,15 @@ var CartClientCard = (0, import_react.forwardRef)(({
         open: searchModalVisible,
         onCancel: handleModalCancel,
         // 同时存在两个搜索弹窗时，内部的无限滚动组件会发生冲突
-        destroyOnClose: true
+        destroyOnClose: true,
+        width: 880
       },
       isShowNewButton: false,
       resultProps,
       onAddClient: handleAddClientSuccess,
       onLoadMore: loadMore,
-      hasMore
+      hasMore,
+      state
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,

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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info2/service/contactInfoMode/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const ContactInfoMode: () => JSX.Element;
 export default ContactInfoMode;

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

@@ -39,6 +39,7 @@ var import_model = require("../../../info/model");
 var import_utils = require("../editService/utils");
 var import_utils2 = require("../../../../ticketBooking/components/addServiceVariant/utils");
 var import_utils3 = require("../../../utils");
+var import_lodash = require("lodash");
 var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const modalRef = (0, import_react.useRef)(null);
@@ -81,7 +82,7 @@ var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
     });
   });
   const handleConfirm = (0, import_ahooks.useMemoizedFn)((data) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (createPayloadRef.current) {
       const payload = createPayloadRef.current;
       createPayloadRef.current = null;
@@ -92,40 +93,42 @@ var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
         option: []
       };
       const quantity = Number(((_b = data == null ? void 0 : data._extend) == null ? void 0 : _b.quantity) || 1);
-      const detail = {
+      let detail = {
         ...data || {},
         id: payload.productId,
         product_id: payload.productId,
         _extend: {
           ...(data == null ? void 0 : data._extend) || {},
-          origin_total: (_c = data == null ? void 0 : data._extend) == null ? void 0 : _c.total,
-          quantity
-        },
-        origin_total: data.total
+          origin_total: ((_c = data == null ? void 0 : data._extend) == null ? void 0 : _c.origin_total) ?? ((_d = data == null ? void 0 : data._extend) == null ? void 0 : _d.total),
+          quantity,
+          skuValue: (0, import_lodash.cloneDeep)(((_e = data == null ? void 0 : data._extend) == null ? void 0 : _e.skuValue) || {})
+        }
       };
+      data._extend.total = (0, import_utils3.getProductTotalPrice)(data);
+      detail = (0, import_utils.setProductPrice)(detail, {
+        newTotal: (_f = data == null ? void 0 : data._extend) == null ? void 0 : _f.total,
+        origin_total: (_g = data._extend) == null ? void 0 : _g.origin_total
+      });
       let e = {
-        product_id: payload.productId,
-        price: skuValue.price || 0,
-        product_variant_id: skuValue.product_variant_id || 0,
-        bundle: skuValue.bundle || [],
-        option: skuValue.option || [],
-        quantity
+        ...detail._extend.other
       };
       e = (0, import_utils2.formatDataKey)(e);
       payload.callback(e, void 0, detail, false);
       return;
     }
-    const newProducts = (_e = ((_d = state == null ? void 0 : state.service) == null ? void 0 : _d.value) || []) == null ? void 0 : _e.map((item) => {
-      var _a2, _b2;
+    console.log("handleConfirm", data, (_h = data == null ? void 0 : data._extend) == null ? void 0 : _h.origin_total);
+    const newProducts = (_j = ((_i = state == null ? void 0 : state.service) == null ? void 0 : _i.value) || []) == null ? void 0 : _j.map((item) => {
+      var _a2, _b2, _c2, _d2;
       if (item._id == data._id) {
         const total = (0, import_utils3.getProductTotalPrice)(data);
         data._extend.total = total;
-        data._extend.origin_total = total;
+        data._extend.origin_total = ((_a2 = data._extend) == null ? void 0 : _a2.origin_total) ?? total;
+        data._extend._skuValue = (0, import_lodash.cloneDeep)(((_b2 = data == null ? void 0 : data._extend) == null ? void 0 : _b2.skuValue) || {});
         data = (0, import_utils.setProductPrice)(data, {
           newTotal: total,
-          origin_total: (_a2 = data._extend) == null ? void 0 : _a2.origin_total
+          origin_total: (_c2 = data._extend) == null ? void 0 : _c2.origin_total
         });
-        data.note = (_b2 = data._extend) == null ? void 0 : _b2.note;
+        data.note = (_d2 = data._extend) == null ? void 0 : _d2.note;
         return data;
       }
       return item;

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

@@ -62,9 +62,11 @@ var import_BookingList = __toESM(require("../../../info/service/editService/Book
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils9 = require("../../../info/service2/Group/utils");
 var import_openNormalService = require("../openNormalService");
+var import_decimal = __toESM(require("decimal.js"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var submitLock = false;
 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;
+  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, _L;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -82,6 +84,10 @@ var Info = (_, ref) => {
   const [open, setOpen] = (0, import_react.useState)(false);
   const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
   const [maskClosable, setMaskClosable] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const {
+    getData
+  } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   (0, import_react.useEffect)(() => {
     window.openBookingEditModal = () => {
       setOpen(true);
@@ -96,7 +102,7 @@ var Info = (_, ref) => {
       return true;
     }
     return ((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem) && (0, import_utils4.isNormalProductByDurationSchedule)((_c2 = state == null ? void 0 : state.service) == null ? void 0 : _c2.cacheItem);
-  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.cacheItem]);
+  }, [(_b = state == null ? void 0 : state.service) == null ? void 0 : _b.cacheItem]);
   const getCurrentCacheItem = (0, import_ahooks.useMemoizedFn)((_cacheItem) => {
     let values = form.getFieldsValue();
     let _item = _cacheItem || state.service.cacheItem;
@@ -126,7 +132,7 @@ var Info = (_, ref) => {
     state.service.cacheItem,
     useStartTime,
     useResource,
-    (_d = (_c = (_b = state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.service_time
+    (_e = (_d = (_c = state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.basic) == null ? void 0 : _e.service_time
   ]);
   const flexibleOption = (0, import_react.useMemo)(() => {
     const op = (0, import_utils7.getFlexibleOption)({
@@ -148,7 +154,7 @@ var Info = (_, ref) => {
     durationProps,
     useStartTime,
     currentResource,
-    (_g = (_f = (_e = state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.service_time,
+    (_h = (_g = (_f = state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.basic) == null ? void 0 : _h.service_time,
     useDuration
   ]);
   (0, import_react.useEffect)(() => {
@@ -201,7 +207,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -215,6 +221,7 @@ var Info = (_, ref) => {
     }, 1500);
     let _list = [...state.service.value];
     let _item = {
+      is_price_include_tax: getData("is_price_include_tax"),
       ...state.service.cacheItem,
       autoClose: false
     };
@@ -235,6 +242,23 @@ var Info = (_, ref) => {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
+    if (isChangeTotal.current) {
+      const discountRatio = new import_decimal.default(values.total).div(_item._extend.origin_total);
+      const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
+      let childProductsTotal = new import_decimal.default(0);
+      if (bundles2.length > 0) {
+        bundles2.forEach((bundle) => {
+          const discountedPrice = new import_decimal.default(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+          bundle.bundle_selling_price = discountedPrice.toNumber();
+          childProductsTotal = childProductsTotal.add(
+            discountedPrice.mul(bundle.quantity)
+          );
+        });
+      }
+      const mainProductTotal = new import_decimal.default(values.total).sub(childProductsTotal);
+      const mainProductQuantity = ((_d2 = _extend.other) == null ? void 0 : _d2.quantity) || _extend.quantity || 1;
+      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+    }
     if (_extend.bundle_edit !== void 0) {
       _extend.bundle_edit = 1;
     }
@@ -242,7 +266,7 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils3.genServiceKey)(_item);
     _item._holderKey = (0, import_utils3.genHolderKey)(_item);
-    if (((_d2 = (_c2 = _item._extend) == null ? void 0 : _c2.holder_id) == null ? void 0 : _d2.length) > 1 || ((_e2 = _item._extend) == null ? void 0 : _e2.quantity) > 1 && ((_g2 = (_f2 = _item._extend) == null ? void 0 : _f2.holder_id) == null ? void 0 : _g2.length) >= 1) {
+    if (((_f2 = (_e2 = _item._extend) == null ? void 0 : _e2.holder_id) == null ? void 0 : _f2.length) > 1 || ((_g2 = _item._extend) == null ? void 0 : _g2.quantity) > 1 && ((_i2 = (_h2 = _item._extend) == null ? void 0 : _h2.holder_id) == null ? void 0 : _i2.length) >= 1) {
       let holder_ids = _item._extend.holder_id;
       _item._extend.holder_id = holder_ids[0];
       holder_ids = holder_ids.slice(1);
@@ -261,10 +285,10 @@ var Info = (_, ref) => {
       }
     }
     let _id = _item == null ? void 0 : _item._id;
-    let groupId = (_h2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _h2.groupId;
+    let groupId = (_j2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _j2.groupId;
     _item = (0, import_utils8.setProductPrice)(_item, {
       newTotal: values.total,
-      origin_total: (_i2 = _item._extend) == null ? void 0 : _i2.origin_total
+      origin_total: (_k2 = _item._extend) == null ? void 0 : _k2.origin_total
     });
     if (groupId) {
       _list = _list.filter((d) => {
@@ -286,7 +310,7 @@ var Info = (_, ref) => {
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_j2 = state.service.cacheItem) == null ? void 0 : _j2.new)) {
+    if (!!((_l2 = state.service.cacheItem) == null ? void 0 : _l2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -295,7 +319,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_k2 = window.closeBookingEditModal) == null ? void 0 : _k2.call(window);
+    (_m2 = window.closeBookingEditModal) == null ? void 0 : _m2.call(window);
     _list.sort((a, b) => {
       var _a3, _b3;
       const aHasHolderId = ((_a3 = a._extend) == null ? void 0 : _a3.holder_id) && (Array.isArray(a._extend.holder_id) ? a._extend.holder_id.length > 0 : true);
@@ -372,7 +396,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
+  }, [useTotal, (_j = (_i = state.service.cacheItem) == null ? void 0 : _i._extend) == null ? void 0 : _j.origin_total]);
   const getResources = () => {
     var _a2, _b2;
     let res = (0, import_utils7.formatResources)({
@@ -436,11 +460,11 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_k = (_j = state.service.cacheItem) == null ? void 0 : _j._extend) == null ? void 0 : _k.origin_total]);
+  }, [useTotal, (_l = (_k = state.service.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
+  }, [(_p = (_o = (_n = (_m = state.service) == null ? void 0 : _m.cacheItem) == null ? void 0 : _n._extend) == null ? void 0 : _o.other) == null ? void 0 : _p.bundle]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
     var _a2, _b2, _c2, _d2, _e2;
     const item = state.service.cacheItem;
@@ -573,7 +597,7 @@ var Info = (_, ref) => {
     }
     return false;
   }, [state.renderType, isNormalProduct]);
-  const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
+  const SelectTime = (_q = window.BaseMaterials) == null ? void 0 : _q.SelectTime;
   const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(state.service.cacheItem);
   const items = (0, import_react.useMemo)(() => {
     var _a2, _b2;
@@ -610,7 +634,7 @@ var Info = (_, ref) => {
       }
     ))));
   }, [
-    (_s = (_r = (_q = state.service) == null ? void 0 : _q.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.product_name,
+    (_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name,
     bundles,
     state.amountSymbol,
     state.isBookingCreatePage
@@ -655,7 +679,7 @@ var Info = (_, ref) => {
     ));
   }, [
     useTotal,
-    (_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total,
+    (_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total,
     state.amountSymbol,
     state.channelDisabledEdit
   ]);
@@ -703,7 +727,7 @@ var Info = (_, ref) => {
         }
       ) : null
     ));
-  }, [SelectTime, (_y = (_x = (_w = (_v = state.bookingConfig) == null ? void 0 : _v.config) == null ? void 0 : _w.basic) == null ? void 0 : _x.service_time) == null ? void 0 : _y.value, isEditGroup]);
+  }, [SelectTime, (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value, isEditGroup]);
   const endTime = (0, import_react.useMemo)(() => {
     if (!isEditGroup) {
       return null;
@@ -742,8 +766,8 @@ var Info = (_, ref) => {
     ));
   }, [
     state.renderType,
-    (_A = (_z = state.service.cacheItem) == null ? void 0 : _z._data) == null ? void 0 : _A.resources,
-    (_C = (_B = state.service.cacheItem) == null ? void 0 : _B._data) == null ? void 0 : _C.resourceMaps
+    (_B = (_A = state.service.cacheItem) == null ? void 0 : _A._data) == null ? void 0 : _B.resources,
+    (_D = (_C = state.service.cacheItem) == null ? void 0 : _C._data) == null ? void 0 : _D.resourceMaps
   ]);
   const holder = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
@@ -781,7 +805,7 @@ var Info = (_, ref) => {
   }, [
     state.locale,
     state.isTerminal,
-    (_F = (_E = (_D = state.service) == null ? void 0 : _D.cacheItem) == null ? void 0 : _E._data) == null ? void 0 : _F.capacitys
+    (_G = (_F = (_E = state.service) == null ? void 0 : _E.cacheItem) == null ? void 0 : _F._data) == null ? void 0 : _G.capacitys
   ]);
   const hiddenQuantity = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null));
@@ -861,10 +885,10 @@ var Info = (_, ref) => {
         import_utils.locales.getText("pisell2.text.apply")
       )
     );
-  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length, isNormalProduct]);
+  }, [(_H = state.service.resourcesOrigin) == null ? void 0 : _H.length, isNormalProduct]);
   console.log("render edit");
   console.log(
-    state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose),
+    state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
     performance.now() - window.pp1,
     "打开商品1"
   );
@@ -966,7 +990,7 @@ var Info = (_, ref) => {
   const drawerOpen = (0, import_react.useMemo)(() => {
     var _a2;
     return !isNoSpecAndPackage && state.service.editModal && !((_a2 = state.service.cacheItem) == null ? void 0 : _a2.autoClose);
-  }, [isNoSpecAndPackage, state.service.editModal, (_I = state.service.cacheItem) == null ? void 0 : _I.autoClose]);
+  }, [isNoSpecAndPackage, state.service.editModal, (_J = state.service.cacheItem) == null ? void 0 : _J.autoClose]);
   (0, import_react.useEffect)(() => {
     let timer = null;
     if (drawerOpen) {
@@ -1016,7 +1040,7 @@ var Info = (_, ref) => {
           display: currentTab === "batch_edit" ? "block" : "none"
         }
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_K = (_J = state.client) == null ? void 0 : _J.value) == null ? void 0 : _K.id) && holder),
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_L = (_K = state.client) == null ? void 0 : _K.value) == null ? void 0 : _L.id) && holder),
       /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, name: "note" }, noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
         import_noteModal.default,
         {

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

@@ -55,7 +55,7 @@ var setAutoAllocationStorage = (data) => {
   }
 };
 var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   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)) {
@@ -68,15 +68,18 @@ var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
   }
   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 newPrice = new import_decimal.default(option.original_price || 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();
-  if ((_i = cacheItem._extend) == null ? void 0 : _i.priceOverride) {
-    cacheItem._extend.total = new import_decimal.default(((_j = cacheItem._extend) == null ? void 0 : _j.priceOverride) || 0).toNumber();
+  if ((_j = (_i = cacheItem._extend) == null ? void 0 : _i.other) == null ? void 0 : _j.product_variant_id) {
+    cacheItem._extend.other.price = cacheItem._extend.price;
+  }
+  if ((_k = cacheItem._extend) == null ? void 0 : _k.priceOverride) {
+    cacheItem._extend.total = new import_decimal.default(((_l = cacheItem._extend) == null ? void 0 : _l.priceOverride) || 0).toNumber();
   }
   return cacheItem;
 };