@pisell/private-materials 6.6.68 → 6.6.70

package/es/components/booking/components/footer/amount.js

@@ -519,8 +519,7 @@ var processItemsTax = function processItemsTax(items, state, options) {
   }
   return {
     originTax: expectedOriginTax,
-    tax: expectedTax,
-    taxDecimal: preciseTax
+    tax: expectedTax
   };
 };
 
@@ -652,7 +651,7 @@ var getTax = function getTax(state, options) {
         computed: computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.taxDecimal);
+      totalTax = totalTax.plus(serviceResult.tax);
     }
 
     // 处理附加商品
@@ -663,7 +662,7 @@ var getTax = function getTax(state, options) {
         computed: computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.taxDecimal);
+      totalTax = totalTax.plus(addonsResult.tax);
     }
   }
   return {

package/es/components/booking/components/footer/utils.js

@@ -108,7 +108,6 @@ export var formatProductBundle = function formatProductBundle(bundle) {
     }
   } catch (error) {}
   return bundle.map(function (d) {
-    var _d$metadata;
     var option = formatProductOption(d.option);
     var option_price = option.reduce(function (temp, item) {
       return temp + Number(item.num) * item.custom_add_price;
@@ -136,7 +135,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
-        custom_product_bundle_map_id: (d === null || d === void 0 || (_d$metadata = d.metadata) === null || _d$metadata === void 0 ? void 0 : _d$metadata.custom_product_bundle_map_id) || d._id,
+        custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
@@ -482,7 +481,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
  * @Author: WangHan
  * @Date: 2024-12-07 14:21
  */
-var formatProducts = function formatProducts(item, quantity, options) {
+var formatProducts = function formatProducts(item, quantity) {
   var _item$_extend39, _getMainProductSellin, _item$_extend40, _item$_extend41, _item$_extend42, _item$_extend43;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
@@ -497,9 +496,6 @@ var formatProducts = function formatProducts(item, quantity, options) {
     d.metadata = _objectSpread(_objectSpread({}, d.metadata), {}, {
       unique_identification_number: "".concat(item._extend.unique_identification_number, "_").concat(d.discount.resource_id)
     });
-    if (options !== null && options !== void 0 && options.isServiceEdit && options !== null && options !== void 0 && options.isMultiDay) {
-      delete d.id;
-    }
   });
 
   // 非手动折扣
@@ -722,10 +718,7 @@ var formatBookings = function formatBookings(data, values) {
       item._extend.unique_identification_number = unique_identification_number;
     }
     var booking = _objectSpread(_objectSpread({
-      product: formatProducts(item, undefined, {
-        isServiceEdit: data.service.edit,
-        isMultiDay: isMultiDay
-      }),
+      product: formatProducts(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,

package/es/components/booking/components/voucher/index.js

@@ -128,7 +128,7 @@ var VoucherCard = function VoucherCard(props) {
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
       var _value$_extend, _value$_extend2, _value$_extend3;
       return {
-        // booking_id: value.booking_id,
+        booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,

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

@@ -19,7 +19,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
-import { formatAmount, getUniqueId, locales, sendWarningLog } from '@pisell/utils';
+import { formatAmount, getUniqueId, locales } from '@pisell/utils';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Drawer from "../../../components/drawer";
 import { Context } from "../../../info/model";
@@ -41,7 +41,7 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductOriginTotalPrice, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { getProductAllDiscountList, mergeBundles, setProductPrice, mergeBundleWithOriginalPrice } from "./utils";
+import { getProductAllDiscountList, mergeBundleWithOriginalPrice, setProductPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
@@ -51,7 +51,6 @@ import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/ser
 import { useShopDiscountModule } from "../../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 import DiscountChangeModal from "./DiscountChangeModal";
 import Decimal from "decimal.js";
-import useEngineContext from "../../../../../hooks/useEngineContext";
 var submitLock = false;
 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;
@@ -72,7 +71,6 @@ var Info = function Info(_, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     discountChangeModalOpen = _useState2[0],
     setDiscountChangeModalOpen = _useState2[1];
-  var context = useEngineContext();
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -665,19 +663,13 @@ var Info = function Info(_, ref) {
     var values = form.getFieldsValue();
     var isSession = isSessionProduct(item);
     var sessionValue = {};
-    var oldSession = {};
     if (isSession) {
-      var _item$_extend7, _item$_extend8, _item$_extend9, _item$_extend10, _item$_extend11, _item$_extend12;
+      var _item$_extend7, _item$_extend8, _item$_extend9;
       sessionValue.startEndTime = {
         startDate: item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.start_date,
         endDate: item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date,
         duration: item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.duration
       };
-      oldSession = {
-        start_date: dayjs(item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.start_date).format('YYYY-MM-DD'),
-        end_date: dayjs(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.end_date).format('YYYY-MM-DD'),
-        duration: item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.duration
-      };
     }
 
     // 打开商品详情弹窗
@@ -695,9 +687,7 @@ var Info = function Info(_, ref) {
         },
         isOS: isSession,
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
-        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), {}, {
-          bundle: mergeBundles(item._extend.other)
-        }, sessionValue), {}, {
+        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), sessionValue), {}, {
           quantity: values.quantity || item._extend.quantity
         })
       },
@@ -710,8 +700,8 @@ var Info = function Info(_, ref) {
 
         // 手动折扣时 合并 bundle price，优先使用编辑前的价格
         if (item.discount_amount) {
-          var _item$_extend13;
-          other = mergeBundleWithOriginalPrice(other, ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.other) || {});
+          var _item$_extend10;
+          other = mergeBundleWithOriginalPrice(other, ((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.other) || {});
         }
         other.session = e.session;
 
@@ -746,37 +736,6 @@ var Info = function Info(_, ref) {
           });
         } catch (err) {}
         var sessionDetail = editSessionProduct(cacheItem, e.session);
-        try {
-          var _e$session, _e$session2, _e$session3, _e$session4, _e$session5, _context$appHelper, _context$appHelper$ge;
-          sendWarningLog({
-            title: '修改商品数据',
-            content: [{
-              key: 'productId',
-              value: item.id
-            }, {
-              key: "isSession",
-              value: isSession
-            }, {
-              key: 'oldSession',
-              value: JSON.stringify(oldSession)
-            }, {
-              key: 'sessionValue',
-              value: JSON.stringify({
-                startTime: (_e$session = e.session) === null || _e$session === void 0 ? void 0 : _e$session.start_time,
-                endTime: (_e$session2 = e.session) === null || _e$session2 === void 0 ? void 0 : _e$session2.end_time,
-                startDate: dayjs((_e$session3 = e.session) === null || _e$session3 === void 0 ? void 0 : _e$session3.start_at).format('YYYY-MM-DD'),
-                endDate: dayjs((_e$session4 = e.session) === null || _e$session4 === void 0 ? void 0 : _e$session4.end_at).format('YYYY-MM-DD'),
-                duration: (_e$session5 = e.session) === null || _e$session5 === void 0 ? void 0 : _e$session5.duration
-              })
-            }, {
-              key: '日期',
-              value: dayjs().format('YYYY-MM-DD HH:mm')
-            }, {
-              key: '店铺id',
-              value: (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.store) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getState) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.call(_context$appHelper)) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.global) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.globalConfig) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.id
-            }]
-          });
-        } catch (err) {}
         if (sessionDetail) {
           setTimeout(function () {
             form.setFieldsValue({
@@ -787,7 +746,20 @@ var Info = function Info(_, ref) {
         }
         var origin_total = _total;
         if (item.discount_amount) {
+          var _item$_extend11, _item$_extend12;
           origin_total = getProductOriginTotalPrice(cacheItem);
+          var previousOriginTotal = Number((item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.origin_total) || 0);
+          var previousTotal = Number((item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.total) || 0);
+          var productAllDiscountList = getProductAllDiscountList(item);
+          var hasNonManualDiscount = productAllDiscountList.some(function (discountItem) {
+            return (discountItem === null || discountItem === void 0 ? void 0 : discountItem.type) !== 'product';
+          });
+          if (previousOriginTotal > 0 && Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !hasNonManualDiscount) {
+            // 手动折扣编辑套餐时只延续旧折后比例，不改子商品单价，避免后续重复折扣。
+            var sellingRatio = new Decimal(previousTotal).div(previousOriginTotal);
+            _total = new Decimal(origin_total).mul(sellingRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+            cacheItem._extend.total = _total;
+          }
         }
 
         // 用于储存原价

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

@@ -32,7 +32,6 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
-export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

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

@@ -149,22 +149,6 @@ export var getProductAllDiscountList = function getProductAllDiscountList(cacheI
   (_discountList = discountList).push.apply(_discountList, _toConsumableArray(bundleDiscountList));
   return discountList;
 };
-export var mergeBundles = function mergeBundles(other) {
-  var bundle = (other === null || other === void 0 ? void 0 : other.bundle) || [];
-  var newBundle = [];
-  bundle.forEach(function (item) {
-    var newItem = newBundle.find(function (newItem) {
-      return newItem.id === item.id;
-    });
-    if (newItem) {
-      newItem.num += item.num || 1;
-      newItem.quantity += item.quantity || 1;
-    } else {
-      newBundle.push(_objectSpread({}, item));
-    }
-  });
-  return newBundle;
-};
 
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值

package/es/components/booking/payments/index.js

@@ -189,7 +189,7 @@ var Payments = Provider(function (props) {
         className: "payment-list-item-surcharge"
       }, "(", locales.getText("pisell2.text.surcharge"), " ", formatAmount(item.service_fee, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"), ")") : null, /*#__PURE__*/React.createElement("div", {
         className: "payment-list-item-date"
-      }, dayjs(item.payment_time || item.created_at).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
+      }, dayjs(item.payment_time).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
         className: "payment-list-item-platform-type"
       }, item.platform && locales.getText("pisell2.text.platform.type")(item.platform))))))));
     }

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/components/footer/amount.js

@@ -323,7 +323,7 @@ var processItemsTax = (items, state, options) => {
       }
     }
   }
-  return { originTax: expectedOriginTax, tax: expectedTax, taxDecimal: preciseTax };
+  return { originTax: expectedOriginTax, tax: expectedTax };
 };
 var clearTaxFee = (state) => {
   var _a, _b;
@@ -376,7 +376,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.taxDecimal);
+      totalTax = totalTax.plus(serviceResult.tax);
     }
     if ((_c = state == null ? void 0 : state.addons) == null ? void 0 : _c.value) {
       const addonsResult = processItemsTax(state.addons.value, state, {
@@ -385,7 +385,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.taxDecimal);
+      totalTax = totalTax.plus(addonsResult.tax);
     }
   }
   return {

package/lib/components/booking/components/footer/utils.js

@@ -111,14 +111,13 @@ var formatProductBundle = (bundle) => {
   } catch (error) {
   }
   return bundle.map((d) => {
-    var _a;
     const option = formatProductOption(d.option);
     const option_price = option.reduce((temp, item) => {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
     const product_discount_difference = ((d == null ? void 0 : d.discount_list) || []).reduce((pre, cur) => {
-      var _a2;
-      return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
+      var _a;
+      return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
     }, 0);
     return {
       "is_charge_tax": d.is_charge_tax,
@@ -139,7 +138,7 @@ var formatProductBundle = (bundle) => {
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
-        custom_product_bundle_map_id: ((_a = d == null ? void 0 : d.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) || d._id,
+        custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
@@ -374,7 +373,7 @@ var getMainProductSellingPrice = (item) => {
   }
   return new import_decimal.default((_f = item._extend) == null ? void 0 : _f.main_product_selling_price).add(optionPrice).toNumber();
 };
-var formatProducts = (item, quantity, options) => {
+var formatProducts = (item, quantity) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
@@ -388,9 +387,6 @@ var formatProducts = (item, quantity, options) => {
       ...d.metadata,
       unique_identification_number: `${item._extend.unique_identification_number}_${d.discount.resource_id}`
     };
-    if ((options == null ? void 0 : options.isServiceEdit) && (options == null ? void 0 : options.isMultiDay)) {
-      delete d.id;
-    }
   });
   const notManualDiscount = discount_list.filter(
     (item2) => item2.type !== "product"
@@ -531,10 +527,7 @@ var formatBookings = (data, values) => {
       item._extend.unique_identification_number = unique_identification_number;
     }
     const booking = {
-      product: formatProducts(item, void 0, {
-        isServiceEdit: data.service.edit,
-        isMultiDay
-      }),
+      product: formatProducts(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,

package/lib/components/booking/components/voucher/index.js

@@ -111,7 +111,7 @@ var VoucherCard = (props) => {
     const val = (_a2 = state.service.value || []) == null ? void 0 : _a2.map((value) => {
       var _a3, _b2, _c2;
       return {
-        // booking_id: value.booking_id,
+        booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,

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

@@ -64,7 +64,6 @@ var import_utils9 = require("../../../info/service2/Group/utils");
 var import_useShopDiscountModule = require("../../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var import_DiscountChangeModal = __toESM(require("./DiscountChangeModal"));
 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;
@@ -80,7 +79,6 @@ var Info = (_, ref) => {
   const useEndDate = import_antd.Form.useWatch("end_date", form);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const [discountChangeModalOpen, setDiscountChangeModalOpen] = (0, import_react.useState)(false);
-  const context = (0, import_useEngineContext.default)();
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
@@ -502,23 +500,17 @@ var Info = (_, ref) => {
     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]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    var _a2, _b2, _c2, _d2, _e2;
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
     const isSession = (0, import_utils6.isSessionProduct)(item);
     const sessionValue = {};
-    let oldSession = {};
     if (isSession) {
       sessionValue.startEndTime = {
         startDate: (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.start_date,
         endDate: (_b2 = item == null ? void 0 : item._extend) == null ? void 0 : _b2.end_date,
         duration: (_c2 = item == null ? void 0 : item._extend) == null ? void 0 : _c2.duration
       };
-      oldSession = {
-        start_date: (0, import_dayjs.default)((_d2 = item == null ? void 0 : item._extend) == null ? void 0 : _d2.start_date).format("YYYY-MM-DD"),
-        end_date: (0, import_dayjs.default)((_e2 = item == null ? void 0 : item._extend) == null ? void 0 : _e2.end_date).format("YYYY-MM-DD"),
-        duration: (_f2 = item == null ? void 0 : item._extend) == null ? void 0 : _f2.duration
-      };
     }
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -533,16 +525,15 @@ var Info = (_, ref) => {
           number: (0, import_utils3.getIsShowNumber)(item, state)
         },
         isOS: isSession,
-        customer_id: (_h2 = (_g2 = state.client) == null ? void 0 : _g2.value) == null ? void 0 : _h2.id,
+        customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
         value: {
           ...item._extend.other,
-          bundle: (0, import_utils8.mergeBundles)(item._extend.other),
           ...sessionValue,
           quantity: values.quantity || item._extend.quantity
         }
       },
       callback: (e2, extension_type, detail) => {
-        var _a3, _b3, _c3, _d3, _e3, _f3, _g3, _h3, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2;
+        var _a3, _b3, _c3, _d3, _e3, _f2, _g2;
         isEditedRef.current = true;
         const _detail = detail || item;
         let other = JSON.parse(JSON.stringify(e2));
@@ -579,29 +570,6 @@ var Info = (_, ref) => {
         } catch (err) {
         }
         const sessionDetail = (0, import_utils5.editSessionProduct)(cacheItem, e2.session);
-        try {
-          (0, import_utils.sendWarningLog)({
-            title: "修改商品数据",
-            content: [
-              { key: "productId", value: item.id },
-              { key: "isSession", value: isSession },
-              { key: "oldSession", value: JSON.stringify(oldSession) },
-              { key: "sessionValue", value: JSON.stringify({
-                startTime: (_d3 = e2.session) == null ? void 0 : _d3.start_time,
-                endTime: (_e3 = e2.session) == null ? void 0 : _e3.end_time,
-                startDate: (0, import_dayjs.default)((_f3 = e2.session) == null ? void 0 : _f3.start_at).format("YYYY-MM-DD"),
-                endDate: (0, import_dayjs.default)((_g3 = e2.session) == null ? void 0 : _g3.end_at).format("YYYY-MM-DD"),
-                duration: (_h3 = e2.session) == null ? void 0 : _h3.duration
-              }) },
-              { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
-              {
-                key: "店铺id",
-                value: (_o2 = (_n2 = (_m2 = (_l2 = (_k2 = (_j2 = (_i2 = context.appHelper) == null ? void 0 : _i2.utils) == null ? void 0 : _j2.store) == null ? void 0 : _k2.getState) == null ? void 0 : _l2.call(_k2)) == null ? void 0 : _m2.global) == null ? void 0 : _n2.globalConfig) == null ? void 0 : _o2.id
-              }
-            ]
-          });
-        } catch (err) {
-        }
         if (sessionDetail) {
           setTimeout(() => {
             form.setFieldsValue({
@@ -613,9 +581,20 @@ var Info = (_, ref) => {
         let origin_total = _total;
         if (item.discount_amount) {
           origin_total = (0, import_utils6.getProductOriginTotalPrice)(cacheItem);
+          const previousOriginTotal = Number(((_d3 = item == null ? void 0 : item._extend) == null ? void 0 : _d3.origin_total) || 0);
+          const previousTotal = Number(((_e3 = item == null ? void 0 : item._extend) == null ? void 0 : _e3.total) || 0);
+          const productAllDiscountList = (0, import_utils8.getProductAllDiscountList)(item);
+          const hasNonManualDiscount = productAllDiscountList.some(
+            (discountItem) => (discountItem == null ? void 0 : discountItem.type) !== "product"
+          );
+          if (previousOriginTotal > 0 && Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !hasNonManualDiscount) {
+            const sellingRatio = new import_decimal.default(previousTotal).div(previousOriginTotal);
+            _total = new import_decimal.default(origin_total).mul(sellingRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+            cacheItem._extend.total = _total;
+          }
         }
         cacheItem._extend.origin_total = origin_total;
-        (((_p2 = cacheItem._extend) == null ? void 0 : _p2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
+        (((_f2 = cacheItem._extend) == null ? void 0 : _f2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
         dispatch({
           type: "setService",
           payload: {
@@ -624,7 +603,7 @@ var Info = (_, ref) => {
         });
         form.setFieldsValue({
           total: _total,
-          capacity: (_q2 = cacheItem._extend) == null ? void 0 : _q2.capacity,
+          capacity: (_g2 = cacheItem._extend) == null ? void 0 : _g2.capacity,
           quantity: (e2 == null ? void 0 : e2.quantity) || (values == null ? void 0 : values.quantity) || 1
         });
       }

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

@@ -32,7 +32,6 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
-export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

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

@@ -32,7 +32,6 @@ __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
-  mergeBundles: () => mergeBundles,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
   setProductPrice: () => setProductPrice
 });
@@ -97,20 +96,6 @@ var getProductAllDiscountList = (cacheItem) => {
   discountList.push(...bundleDiscountList);
   return discountList;
 };
-var mergeBundles = (other) => {
-  const bundle = (other == null ? void 0 : other.bundle) || [];
-  const newBundle = [];
-  bundle.forEach((item) => {
-    const newItem = newBundle.find((newItem2) => newItem2.id === item.id);
-    if (newItem) {
-      newItem.num += item.num || 1;
-      newItem.quantity += item.quantity || 1;
-    } else {
-      newBundle.push({ ...item });
-    }
-  });
-  return newBundle;
-};
 var mergeBundleWithOriginalPrice = (other, originalOther) => {
   var _a, _b;
   if (!((_a = other == null ? void 0 : other.bundle) == null ? void 0 : _a.length) || !((_b = originalOther == null ? void 0 : originalOther.bundle) == null ? void 0 : _b.length)) return other;
@@ -130,7 +115,6 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
   getAutoAllocationStorage,
   getProductAllDiscountList,
   mergeBundleWithOriginalPrice,
-  mergeBundles,
   setAutoAllocationStorage,
   setProductPrice
 });

package/lib/components/booking/payments/index.js

@@ -134,7 +134,7 @@ var Payments = (0, import_model.Provider)((props) => {
           item.service_fee,
           2,
           (state == null ? void 0 : state.amountSymbol) || "$"
-        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time || item.created_at).format(
+        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time).format(
           "HH:mm YYYY/MM/DD"
         ), /* @__PURE__ */ import_react.default.createElement("span", { className: "payment-list-item-platform-type" }, item.platform && import_utils.locales.getText("pisell2.text.platform.type")(
           item.platform

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.68",
+  "version": "6.6.70",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,8 +63,8 @@
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.6.17",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",