@pisell/private-materials 6.3.113 → 6.3.114

package/lib/components/booking/info/service/index.less

@@ -8,10 +8,8 @@
     line-height: 24px; /* 150% */
     display: flex;
     align-items: center;
-    margin-bottom: 16px !important;
-    // padding: 12px 0;
-    padding: 0 !important;
-    width: max-content;
+    margin-bottom: 4px;
+    padding: 12px 0;
     .anticon {
       font-size: 18px;
       margin-right: 6px;

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

@@ -103,8 +103,6 @@ declare const _default: {
                 en: string;
                 "zh-CN": string;
                 "zh-HK": string;
-                ja: string;
-                pt: string;
                 original: string;
             };
             id: number;

package/lib/components/booking/info2/service/addService/mock.js

@@ -230,8 +230,6 @@ var mock_default = {
           "en": "",
           "zh-CN": "",
           "zh-HK": "",
-          "ja": "",
-          "pt": "",
           "original": "成人"
         },
         id: 1,
@@ -243,8 +241,6 @@ var mock_default = {
           "en": "",
           "zh-CN": "",
           "zh-HK": "",
-          "ja": "",
-          "pt": "",
           "original": "儿童"
         },
         id: 2,

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

@@ -52,8 +52,6 @@ var import_materials = require("@pisell/materials");
 var import_utils5 = require("../../../info/utils");
 var import_utils6 = require("../../../info/service2/utils");
 var import_utils7 = require("../../../../ticketBooking/utils");
-var import_decimal = require("decimal.js");
-var import_utils8 = require("./utils");
 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;
@@ -167,7 +165,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -195,23 +193,6 @@ var Info = (_, ref) => {
     const { startDate, endDate } = (0, import_utils3.getServiceTimes)({ _extend });
     _extend.startDate = startDate;
     _extend.endDate = endDate;
-    if (isChangeTotal.current) {
-      const discountRatio = new import_decimal.Decimal(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.Decimal(0);
-      if (bundles2.length > 0) {
-        bundles2.forEach((bundle) => {
-          const discountedPrice = new import_decimal.Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_HALF_UP);
-          bundle.bundle_selling_price = discountedPrice.toNumber();
-          childProductsTotal = childProductsTotal.add(
-            discountedPrice.mul(bundle.quantity)
-          );
-        });
-      }
-      const mainProductTotal = new import_decimal.Decimal(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;
     }
@@ -219,10 +200,6 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils7.genServiceKey)(_item);
     let _id = _item == null ? void 0 : _item._id;
-    _item = (0, import_utils8.setProductPrice)(_item, {
-      newTotal: values.total,
-      origin_total: (_e2 = _item._extend) == null ? void 0 : _e2.origin_total
-    });
     if (!_list.some((d) => d._id === _id)) {
       const detail = (0, import_utils7.addService)(_list, _item, state);
       _list = detail.list;

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

@@ -11,18 +11,3 @@ 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

@@ -20,14 +20,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
-  setAutoAllocationStorage: () => setAutoAllocationStorage,
-  setProductPrice: () => setProductPrice
+  setAutoAllocationStorage: () => setAutoAllocationStorage
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
-var import_utils2 = require("../addService/utils");
-var import_decimal = require("decimal.js");
-var import_utils3 = require("@pisell/utils");
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
@@ -45,40 +41,8 @@ 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, _i;
-  if (((_a = cacheItem == null ? void 0 : cacheItem.discount_list) == null ? void 0 : _a.length) && ((cacheItem == null ? void 0 : cacheItem.discount_list) || []).some((item) => ["good_pass", "discount_card", "product_discount_card"].includes(
-    item.type
-  ))) {
-    return cacheItem;
-  }
-  if (cacheItem.discount_amount) {
-    return cacheItem;
-  }
-  const discountRatio = new import_decimal.Decimal(newTotal).div(new import_decimal.Decimal(origin_total));
-  let subTotal = new import_decimal.Decimal(0);
-  if (((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle) && (0, import_utils3.isArr)((_c = cacheItem._extend.other) == null ? void 0 : _c.bundle)) {
-    (_e = (_d = cacheItem._extend.other) == null ? void 0 : _d.bundle) == null ? void 0 : _e.forEach((bundle) => {
-      const newPrice = new import_decimal.Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_DOWN).toNumber();
-      const quantity = bundle.num ?? bundle.quantity ?? 1;
-      subTotal = subTotal.add(new import_decimal.Decimal(newPrice).mul(quantity));
-      bundle.price = newPrice;
-    });
-  }
-  if (((_f = cacheItem._extend.other) == null ? void 0 : _f.option) && (0, import_utils3.isArr)((_g = cacheItem._extend.other) == null ? void 0 : _g.option)) {
-    (_i = (_h = cacheItem._extend.other) == null ? void 0 : _h.option) == null ? void 0 : _i.forEach((option) => {
-      const newPrice = new import_decimal.Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_DOWN).toNumber();
-      const quantity = option.num ?? option.quantity ?? 1;
-      subTotal = subTotal.add(new import_decimal.Decimal(newPrice).mul(quantity));
-      option.price = newPrice;
-    });
-  }
-  cacheItem._extend.price = new import_decimal.Decimal(newTotal).sub(subTotal).toNumber();
-  return cacheItem;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getAutoAllocationStorage,
-  setAutoAllocationStorage,
-  setProductPrice
+  setAutoAllocationStorage
 });