@pisell/private-materials 6.3.120 → 6.3.121

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

@@ -21,7 +21,7 @@
 
   .booking-order-sales-channel {
     width: 100%;
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
@@ -37,7 +37,7 @@
   }
 
   .booking-header-left {
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 18px;
     font-style: normal;
     font-weight: 400;
@@ -48,17 +48,17 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Base-White, #FFF) !important;
+      color: var(--Gray-900, #101828) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
       cursor: pointer;
-      border: 1px solid #fff;
+      border: 1px solid var(--Gray-900, #101828);
       padding: 4px 12px;
       border-radius: 24px;
 
       span {
-        color: var(--Base-White, #FFF) !important;
+        color: var(--Gray-900, #101828) !important;
       }
 
       .booking-header-right-status-icon {

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

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

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

@@ -189,16 +189,17 @@ var handleChangeHolder = (products, currentItem, other) => {
 };
 var handleLike = (products, currentItem, other) => {
   return products.map((item) => {
-    var _a, _b;
+    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) === (currentItem == null ? void 0 : currentItem.serviceId);
     if (currentItem.isParallelResource) {
-      if (item._id === currentItem.serviceId) {
+      if (item._id === currentItem.serviceId || isSameGroup) {
         return {
           ...item,
           _extend: {
             ...item._extend,
             resource: {
-              ...(_a = item._extend) == null ? void 0 : _a.resource,
-              [currentItem.resourceId]: (_b = item._extend) == null ? void 0 : _b.resource[currentItem.resourceId].map((item2) => ({
+              ...(_c = item._extend) == null ? void 0 : _c.resource,
+              [currentItem.resourceId]: (_d = item._extend) == null ? void 0 : _d.resource[currentItem.resourceId].map((item2) => ({
                 ...item2,
                 like_status: other.like_status
               }))
@@ -208,7 +209,7 @@ var handleLike = (products, currentItem, other) => {
       }
       return item;
     } else {
-      if (item._id === currentItem._id) {
+      if (item._id === currentItem._id || isSameGroup) {
         return {
           ...item,
           _extend: {
@@ -223,11 +224,12 @@ var handleLike = (products, currentItem, other) => {
 };
 var handleChangeResource = (products, currentItem, other, state) => {
   return products.map((item) => {
-    var _a;
+    var _a, _b, _c, _d, _e;
     const { props, value } = other || {};
     const { isParallelResource, resourceId } = props || {};
+    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 (isParallelResource) {
-      if (item._id === currentItem._id) {
+      if (item._id === currentItem._id || isSameGroup) {
         const hasDataItem = (0, import_utils6.getProductExtend)({
           cacheItem: { ...item, new: 0 },
           state
@@ -237,21 +239,21 @@ var handleChangeResource = (products, currentItem, other, state) => {
           return pre;
         }, {}) : {};
         item._extend.resource[resourceId] = value.map((d) => {
-          var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
+          var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i;
           const currentForm = ((_a2 = hasDataItem._data.resourceMaps) == null ? void 0 : _a2[resourceId]) || {};
           return (
             // maps[d] 为真时, 说明是之前已选择, 否则为新增的值,补充数据
             maps[d] || {
-              relation_type: ((_c = (_b = currentForm.renderListMaps[d]) == null ? void 0 : _b.usable) == null ? void 0 : _c.relation_type) || "form",
+              relation_type: ((_c2 = (_b2 = currentForm.renderListMaps[d]) == null ? void 0 : _b2.usable) == null ? void 0 : _c2.relation_type) || "form",
               form_id: resourceId,
               relation_id: d,
               like_status: "common",
               // 新添加的数据补充错误信息
               errors: (0, import_utilsByBooking.getErrorList)(
-                (_d = currentForm.renderListMaps) == null ? void 0 : _d[d],
+                (_d2 = currentForm.renderListMaps) == null ? void 0 : _d2[d],
                 hasDataItem
               ),
-              children: (_f = (_e = currentForm.renderListMaps) == null ? void 0 : _e[d]) == null ? void 0 : _f.children,
+              children: (_f = (_e2 = currentForm.renderListMaps) == null ? void 0 : _e2[d]) == null ? void 0 : _f.children,
               metadata: {
                 ...(_h = (_g = currentForm.renderListMaps) == null ? void 0 : _g[d]) == null ? void 0 : _h.metadata,
                 form_name: currentForm.title,
@@ -263,9 +265,9 @@ var handleChangeResource = (products, currentItem, other, state) => {
       }
       return item;
     } else {
-      if (item._id === currentItem._id) {
+      if (item._id === currentItem._id || isSameGroup) {
         const resourceItem = currentResource(state, other.id, item);
-        const { relation_type, item_id, schedule_id } = ((_a = resourceItem == null ? void 0 : resourceItem._extend) == null ? void 0 : _a.usableTime) || {};
+        const { relation_type, item_id, schedule_id } = ((_e = resourceItem == null ? void 0 : resourceItem._extend) == null ? void 0 : _e.usableTime) || {};
         return {
           ...item,
           _extend: {

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

@@ -103,6 +103,8 @@ 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,6 +230,8 @@ var mock_default = {
           "en": "",
           "zh-CN": "",
           "zh-HK": "",
+          "ja": "",
+          "pt": "",
           "original": "成人"
         },
         id: 1,
@@ -241,6 +243,8 @@ var mock_default = {
           "en": "",
           "zh-CN": "",
           "zh-HK": "",
+          "ja": "",
+          "pt": "",
           "original": "儿童"
         },
         id: 2,

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

@@ -52,6 +52,8 @@ 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;
@@ -165,7 +167,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2, _e2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -193,6 +195,23 @@ 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;
     }
@@ -200,6 +219,10 @@ 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,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

@@ -20,10 +20,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 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("../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) {
@@ -41,8 +45,40 @@ 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
+  setAutoAllocationStorage,
+  setProductPrice
 });