@pisell/private-materials 6.3.116 → 6.3.118

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {
@@ -8,5 +7,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => React.JSX.Element;
+declare const Info: (props: AddServiceProps) => JSX.Element;
 export default Info;

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

@@ -0,0 +1,216 @@
+declare const _default: {
+    id: number;
+    shop_id: number;
+    source_shop_id: number;
+    extension_id: number;
+    extension_type: string;
+    title: string;
+    slug: string;
+    title_letter: string;
+    category_letter: string;
+    vendor_letter: string;
+    tag_letter: string;
+    subtitle: string;
+    description: string;
+    cover: string;
+    price: string;
+    original_price: string;
+    cost_price: string;
+    sort_price: string;
+    is_gst: number;
+    is_delivery: number;
+    weight_unit: string;
+    weight_value: string;
+    code: string;
+    barcode: string;
+    unit: string;
+    is_track: number;
+    stock_quantity: number;
+    sum_stock: number;
+    sales_quantity: number;
+    order_sales_quantity: number;
+    over_sold: number;
+    status: string;
+    sell_status: number;
+    published_time: string;
+    shop_update_time: string;
+    audit_time: null;
+    is_recommend: number;
+    audit_status: string;
+    shop_status: string;
+    weight: number;
+    sort: number;
+    type: string;
+    channel_application: string[];
+    channel_id: number;
+    rebate_type: string;
+    rebate_value: string;
+    create_account_id: number;
+    update_account_id: number;
+    source_product_id: number;
+    start_at: null;
+    created_at: string;
+    updated_at: string;
+    deleted_at: null;
+    seo: {
+        title: string;
+        is_set_title: number;
+        description: string;
+        is_set_desc: number;
+        keywords: string;
+        is_set_keywords: number;
+    };
+    service_times: number;
+    product_resource: {
+        resources: ({
+            id: number;
+            title: string;
+            status: number;
+            code: string;
+            created_at: string;
+            updated_at: string;
+            type: string;
+            optional_resource: number[];
+            default_resource: number[];
+            select_type: {
+                type: string;
+                min: number;
+                max: number;
+            };
+            resource_type_id: number;
+        } | {
+            id: number;
+            title: string;
+            status: number;
+            code: string;
+            created_at: string;
+            updated_at: null;
+            type: string;
+            optional_resource: never[];
+            default_resource: never[];
+            select_type: {
+                type: string;
+                min: number;
+                max: number;
+            };
+            resource_type_id: number;
+        })[];
+    };
+    capacity: {
+        type: string;
+        custom: {
+            name: {
+                en: string;
+                "zh-CN": string;
+                "zh-HK": string;
+                ja: string;
+                pt: string;
+                original: string;
+            };
+            id: number;
+            min: number;
+            max: number;
+        }[];
+        package: {
+            product_ids: never[];
+        };
+    };
+    is_grey: number;
+    is_eject: number;
+    share_url: string;
+    token_check_msg: string;
+    is_charge_tax: number;
+    media: never[];
+    tag: never[];
+    vendor: never[];
+    category: {
+        id: number;
+        shop_id: number;
+        parent_id: number;
+        name: string;
+        slug: string;
+        icon: string;
+        status: string;
+        last_applicable_time: number;
+        sort: number;
+        create_account_id: number;
+        update_account_id: number;
+        created_at: string;
+        updated_at: string;
+    }[];
+    collection: ({
+        id: number;
+        shop_id: number;
+        title: string;
+        title_letter: string;
+        description: null;
+        cover: string;
+        rule_type: string;
+        rule: {
+            class: string;
+            value: number;
+            operator: string;
+        }[];
+        product_quantity: number;
+        type: string;
+        order_type: string;
+        disabled: number;
+        create_account_id: number;
+        update_account_id: number;
+        created_at: string;
+        updated_at: string;
+    } | {
+        id: number;
+        shop_id: number;
+        title: string;
+        title_letter: string;
+        description: string;
+        cover: string;
+        rule_type: string;
+        rule: {
+            class: string;
+            value: string;
+            operator: string;
+        }[];
+        product_quantity: number;
+        type: string;
+        order_type: string;
+        disabled: number;
+        create_account_id: number;
+        update_account_id: number;
+        created_at: string;
+        updated_at: string;
+    } | {
+        id: number;
+        shop_id: number;
+        title: string;
+        title_letter: string;
+        description: null;
+        cover: string;
+        rule_type: string;
+        rule: {
+            class: string;
+            value: string;
+            operator: string;
+        }[];
+        product_quantity: number;
+        type: string;
+        order_type: string;
+        disabled: number;
+        create_account_id: number;
+        update_account_id: number;
+        created_at: string;
+        updated_at: string;
+    })[];
+    variant_group: never[];
+    option_group: never[];
+    variant: never[];
+    shop: {
+        id: number;
+        name: string;
+        default_domain: string;
+        default_url: string;
+    };
+    bundle_group: never[];
+};
+export default _default;

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

@@ -183,6 +183,8 @@ export default {
         "en": "",
         "zh-CN": "",
         "zh-HK": "",
+        "ja": "",
+        "pt": "",
         "original": "成人"
       },
       id: 1,
@@ -193,6 +195,8 @@ export default {
         "en": "",
         "zh-CN": "",
         "zh-HK": "",
+        "ja": "",
+        "pt": "",
         "original": "儿童"
       },
       id: 2,

package/es/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/es/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import '../../../info/service/addTimeModal/index.less';
-declare const AddTimeModal: () => React.JSX.Element;
+declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

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

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const ContactInfoMode: () => React.JSX.Element;
+declare const ContactInfoMode: () => JSX.Element;
 export default ContactInfoMode;

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

@@ -36,6 +36,8 @@ import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
+import { Decimal } from "decimal.js";
+import { setProductPrice } from "./utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI10, _state$bookingConfig5, _state$service$cacheI11, _state$service$cacheI12, _state$service9, _state$service$resour2, _state$service$cacheI13, _state$service$cacheI14;
@@ -218,7 +220,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend;
+    var _resourcesRef$current, _item$_extend, _item2, _item$_extend2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -249,13 +251,41 @@ var Info = function Info(_, ref) {
       endDate = _getServiceTimes.endDate;
     _extend.startDate = startDate;
     _extend.endDate = endDate;
+    if (isChangeTotal.current) {
+      var _extend$other, _extend$other2;
+      // 计算折扣比例
+      var discountRatio = new Decimal(values.total).div(_item._extend.origin_total);
+
+      // 处理子商品
+      var _bundles = (_extend === null || _extend === void 0 || (_extend$other = _extend.other) === null || _extend$other === void 0 ? void 0 : _extend$other.bundle) || [];
+      var childProductsTotal = new Decimal(0);
+      if (_bundles.length > 0) {
+        _bundles.forEach(function (bundle) {
+          // 计算子商品折扣后的单价（保留两位小数）
+          var discountedPrice = new Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+          bundle.bundle_selling_price = discountedPrice.toNumber();
+
+          // 累计子商品折扣后总价
+          childProductsTotal = childProductsTotal.add(discountedPrice.mul(bundle.quantity));
+        });
+      }
+
+      // 计算主商品折扣后的单价
+      var mainProductTotal = new Decimal(values.total).sub(childProductsTotal);
+      var mainProductQuantity = ((_extend$other2 = _extend.other) === null || _extend$other2 === void 0 ? void 0 : _extend$other2.quantity) || _extend.quantity || 1;
+      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+    }
     if (_extend.bundle_edit !== undefined) {
       _extend.bundle_edit = 1;
     }
     _item._extend = _extend;
     _item._time = new Date().getTime();
     _item._serviceKey = genServiceKey(_item);
-    var _id = _item === null || _item === void 0 ? void 0 : _item._id;
+    var _id = (_item2 = _item) === null || _item2 === void 0 ? void 0 : _item2._id;
+    _item = setProductPrice(_item, {
+      newTotal: values.total,
+      origin_total: (_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.origin_total
+    });
 
     // 判断是新增还是编辑
     if (!_list.some(function (d) {
@@ -453,11 +483,11 @@ var Info = function Info(_, ref) {
     var isSession = isSessionProduct(item);
     var sessionValue = {};
     if (isSession) {
-      var _item$_extend2, _item$_extend3, _item$_extend4;
+      var _item$_extend3, _item$_extend4, _item$_extend5;
       sessionValue.startEndTime = {
-        startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
-        endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
-        duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
+        startDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.end_date,
+        duration: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.duration
       };
     }
 

package/es/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/es/components/booking/info2/service/editService/utils.js

@@ -15,6 +15,9 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import { isBoolean } from "@pisell/utils";
+import { getTimeObj } from "../addService/utils";
+import { Decimal } from "decimal.js";
+import { isArr } from "@pisell/utils";
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
@@ -52,4 +55,77 @@ export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
   } else {
     localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread({}, data)));
   }
+};
+
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
+  var _cacheItem$discount_l, _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
+  var newTotal = _ref2.newTotal,
+    origin_total = _ref2.origin_total;
+  if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$discount_l = cacheItem.discount_list) !== null && _cacheItem$discount_l !== void 0 && _cacheItem$discount_l.length && ((cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list) || []).some(function (item) {
+    return ['good_pass', 'discount_card', 'product_discount_card'].includes(item.type);
+  })) {
+    return cacheItem;
+  }
+  if (cacheItem.discount_amount) {
+    return cacheItem;
+  }
+
+  // 计算折扣比例
+  var discountRatio = new Decimal(newTotal).div(new Decimal(origin_total));
+
+  // 用于累加子商品总价c
+  var subTotal = new Decimal(0);
+
+  // 处理 bundle 子商品
+  if ((_cacheItem$_extend$ot = cacheItem._extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.bundle && isArr((_cacheItem$_extend$ot2 = cacheItem._extend.other) === null || _cacheItem$_extend$ot2 === void 0 ? void 0 : _cacheItem$_extend$ot2.bundle)) {
+    var _cacheItem$_extend$ot3;
+    (_cacheItem$_extend$ot3 = cacheItem._extend.other) === null || _cacheItem$_extend$ot3 === void 0 || (_cacheItem$_extend$ot3 = _cacheItem$_extend$ot3.bundle) === null || _cacheItem$_extend$ot3 === void 0 || _cacheItem$_extend$ot3.forEach(function (bundle) {
+      var _ref3, _bundle$num;
+      // 计算新价格，直接截取两位小数（不四舍五入）
+      var newPrice = new Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+
+      // 获取数量，优先取 num，再取 quantity，默认为 1
+      var quantity = (_ref3 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref3 !== void 0 ? _ref3 : 1;
+
+      // 累加到子商品总价
+      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
+
+      // 设置新价格
+      bundle.price = newPrice;
+    });
+  }
+
+  // 处理 option 子商品
+  if ((_cacheItem$_extend$ot4 = cacheItem._extend.other) !== null && _cacheItem$_extend$ot4 !== void 0 && _cacheItem$_extend$ot4.option && isArr((_cacheItem$_extend$ot5 = cacheItem._extend.other) === null || _cacheItem$_extend$ot5 === void 0 ? void 0 : _cacheItem$_extend$ot5.option)) {
+    var _cacheItem$_extend$ot6;
+    (_cacheItem$_extend$ot6 = cacheItem._extend.other) === null || _cacheItem$_extend$ot6 === void 0 || (_cacheItem$_extend$ot6 = _cacheItem$_extend$ot6.option) === null || _cacheItem$_extend$ot6 === void 0 || _cacheItem$_extend$ot6.forEach(function (option) {
+      var _ref4, _option$num;
+      // 计算新价格，直接截取两位小数（不四舍五入）
+      var newPrice = new Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+
+      // 获取数量，优先取 num，再取 quantity，默认为 1
+      var quantity = (_ref4 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1;
+
+      // 累加到子商品总价
+      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
+
+      // 设置新价格
+      option.price = newPrice;
+    });
+  }
+
+  // 主商品价格 = newTotal - 子商品总价（让主商品吸收精度误差，确保总价精确）
+  cacheItem._extend.price = new Decimal(newTotal).sub(subTotal).toNumber();
+  return cacheItem;
 };

package/es/components/booking/info2/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../info/service/index.less';
-declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
 export default _default;

package/es/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/info2/service/serviceList/index.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default ServiceList;