@pisell/private-materials 6.6.51 → 6.6.52

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -28,6 +28,8 @@ import { PisellInput, PisellGoodPassCard, PisellText, PisellToast } from '@pisel
 import { useAppointmentBooking, useShopDiscount, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
 import "../../../booking/components/voucher/index.less";
 import "./index.less";
+import { useAppointmentBookingContext } from "../../context";
+import { useDebounceFn } from 'ahooks';
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -69,11 +71,19 @@ var VoucherCard = function VoucherCard(props) {
     openLoginModal = _useAppointmentBookin.openLoginModal;
   var _useAppointmentBookin2 = useAppointmentBookingAccount(),
     accountLists = _useAppointmentBookin2.accountLists;
+  var _useAppointmentBookin3 = useAppointmentBookingContext(),
+    summary = _useAppointmentBookin3.summary;
+  var originTotal = summary.originTotal,
+    total = summary.total;
   var cart = appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.cart;
   var isUserLoggedIn = useMemo(function () {
     var _utils$token, _utils$token$get;
     return !!(utils !== null && utils !== void 0 && (_utils$token = utils.token) !== null && _utils$token !== void 0 && (_utils$token$get = _utils$token.get) !== null && _utils$token$get !== void 0 && _utils$token$get.call(_utils$token)) || false;
   }, [store]);
+  useEffect(function () {
+    var shopDiscount = pisellos.getModule('shopDiscount');
+    shopDiscount.setOriginTotalAmount(originTotal);
+  }, [originTotal]);
   var availableData = useMemo(function () {
     return discountList.filter(function (item) {
       return !!item.isAvailable;
@@ -110,13 +120,18 @@ var VoucherCard = function VoucherCard(props) {
     });
     appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$b = appointmentBooking.batchUpdateCart) === null || _appointmentBooking$b === void 0 || _appointmentBooking$b.call(appointmentBooking, items);
   };
-  var onCartChange = function onCartChange() {
-    var _shopDiscount$setBook, _appointmentBooking$o;
-    var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
-    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
-    var val = shopDiscount.calcDiscount(products);
-    batchUpdateCart(val.productList);
-  };
+
+  // 防抖处理
+  var _useDebounceFn = useDebounceFn(function () {
+      var _shopDiscount$setBook, _appointmentBooking$o;
+      var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
+      shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
+      var val = shopDiscount.calcDiscount(products);
+      batchUpdateCart(val.productList);
+    }, {
+      wait: 200
+    }),
+    onCartChange = _useDebounceFn.run;
   var stringifiedHolders = useMemo(function () {
     var _ret;
     try {

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

@@ -60,14 +60,15 @@ export var formatProducts = function formatProducts(values) {
       discountway: 'num',
       discount_type: 'discount',
       bundle_edit: (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle_edit,
-      product_bundle: formatProductBundle((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle),
+      product_bundle: formatProductBundle((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle, item.is_price_include_tax),
       "product_option_item": formatProductOption((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.option),
       "product_variant_id": ((_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 || (_item$_extend5 = _item$_extend5.other) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.product_variant_id) || 0,
       "source_product_price": getSourceProductPrice(item),
       "main_product_selling_price": (_getMainProductSellin = getMainProductSellingPrice(item)) !== null && _getMainProductSellin !== void 0 ? _getMainProductSellin : formatProductPrice(item),
       "calculated_original_price": formatOriginalPrice(item),
       "calculated_selling_price": formatSellingPrice(item),
-      "tax_fee": item._extend.tax_fee
+      "tax_fee": item._extend.tax_fee,
+      is_price_include_tax: item.is_price_include_tax
     };
   });
   return arr;

package/es/components/booking/components/footer/amount.d.ts

@@ -1,5 +1,6 @@
 export declare const getRelationDetailsTotal: (relation_details: any) => number;
 export declare const getProductDiscountProductDiscountDifference: (product: any) => any;
+export declare const getOptionDiscountAmount: (discounts: any[]) => number;
 export declare const getIsPriceIncludeTax: (state: any) => any;
 /**
  * 总金额

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

@@ -807,6 +807,12 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
     return total.add(new Decimal(discount.amount || 0));
   }, new Decimal(0)).toNumber();
 };
+export var getOptionDiscountAmount = function getOptionDiscountAmount(discounts) {
+  return (discounts || []).reduce(function (total, discount) {
+    var _discount$metadata;
+    return total.add(new Decimal((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.optionDiscountAmount) || 0));
+  }, new Decimal(0)).toNumber();
+};
 
 /**
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
@@ -821,6 +827,9 @@ var getMainProductTotal = function getMainProductTotal(item) {
     total = total.add((_item$_extend$other5 = item._extend.other) === null || _item$_extend$other5 === void 0 ? void 0 : _item$_extend$other5.option.reduce(function (t, option) {
       return t.add(new Decimal(option.price || 0).mul(option.num || 1));
     }, new Decimal(0)));
+    if (item.booking_id) {
+      total = total.sub(getOptionDiscountAmount((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+    }
   }
   var _iterator13 = _createForOfIteratorHelper(((_item$_extend$other6 = item._extend.other) === null || _item$_extend$other6 === void 0 ? void 0 : _item$_extend$other6.bundle) || []),
     _step13;
@@ -834,7 +843,7 @@ var getMainProductTotal = function getMainProductTotal(item) {
         // 子商品价格
         var bundleItemPrice = new Decimal((_ref5 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
         // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
+        var bundleItemTotal = bundleItemPrice;
         total = total.add(bundleItemTotal);
       }
     }

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

@@ -338,6 +338,13 @@ var Footer = function Footer(props) {
       ScheduleModule: ScheduleModule
     }, getDataFromHost()));
   }, [state, isEdit]);
+  useEffect(function () {
+    window.dispatchEvent(new CustomEvent('onOriginExpectAmountWithoutDiscountChange', {
+      detail: {
+        originExpectAmountWithoutDiscount: total === null || total === void 0 ? void 0 : total.originExpectAmountWithoutDiscount
+      }
+    }));
+  }, [total === null || total === void 0 ? void 0 : total.originExpectAmountWithoutDiscount]);
   useDebounceEffect(function () {
     var _state$service4;
     if (state !== null && state !== void 0 && (_state$service4 = state.service) !== null && _state$service4 !== void 0 && _state$service4.addTimeModal) {

package/es/components/booking/components/footer/utils.d.ts

@@ -15,7 +15,7 @@ export declare const formatProductOption: (option: any) => any;
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export declare const formatProductBundle: (bundle: any) => any;
+export declare const formatProductBundle: (bundle: any, is_price_include_tax: number) => any;
 /**
  * 获取子商品折扣信息
  * @param item

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

@@ -22,6 +22,7 @@ import { PisellToast } from '@pisell/materials';
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
 import Decimal from 'decimal.js';
+import { getOptionDiscountAmount } from "./amount";
 var formatNote = function formatNote(data) {
   var _data$notes;
   return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || '';
@@ -92,7 +93,7 @@ var log = function log(data) {
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export var formatProductBundle = function formatProductBundle(bundle) {
+export var formatProductBundle = function formatProductBundle(bundle, is_price_include_tax) {
   if (!bundle) {
     return;
   }
@@ -133,6 +134,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "option": option,
       "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
+      is_price_include_tax: is_price_include_tax,
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
@@ -322,8 +324,8 @@ export var formatOriginalPrice = function formatOriginalPrice(item) {
 
 /**
  * 获取套餐子商品折扣差价
- * @param item 
- * @returns 
+ * @param item
+ * @returns
  */
 var getBundleProductDiscountDifference = function getBundleProductDiscountDifference(item) {
   var _item$_extend9, _item$_extend10, _item$_extend11;
@@ -461,6 +463,9 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
       var currentNum = new Decimal(currentValue.num || 0);
       return accumulator.add(currentPrice.mul(currentNum));
     }, optionPrice);
+    if (item !== null && item !== void 0 && item.booking_id) {
+      optionPrice = optionPrice.sub(getOptionDiscountAmount((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+    }
   }
   return new Decimal((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.main_product_selling_price).add(optionPrice).toNumber();
 };
@@ -512,7 +517,7 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.other) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.bundle),
+    "product_bundle": formatProductBundle((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.other) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.bundle, item.is_price_include_tax),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
     "product_option_item": formatProductOption((_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 || (_item$_extend39 = _item$_extend39.other) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.option),
     "product_variant_id": ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 || (_item$_extend40 = _item$_extend40.other) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.product_variant_id) || 0,
@@ -522,7 +527,8 @@ var formatProducts = function formatProducts(item, quantity) {
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
     "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data
+    "custom_deposit_data": item.custom_deposit_data,
+    is_price_include_tax: item.is_price_include_tax
   };
 };
 

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

@@ -152,11 +152,17 @@ var VoucherCard = function VoucherCard(props) {
     }
     onScanCode(e.detail.code);
   });
+  var onOriginExpectAmountWithoutDiscountChange = useMemoizedFn(function (e) {
+    var _shopDiscount$setOrig;
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setOrig = shopDiscount.setOriginTotalAmount) === null || _shopDiscount$setOrig === void 0 || _shopDiscount$setOrig.call(shopDiscount, e.detail.originExpectAmountWithoutDiscount);
+  });
   useEffect(function () {
     var wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
     window.addEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
+    window.addEventListener('onOriginExpectAmountWithoutDiscountChange', onOriginExpectAmountWithoutDiscountChange);
     return function () {
       window.removeEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
+      window.removeEventListener('onOriginExpectAmountWithoutDiscountChange', onOriginExpectAmountWithoutDiscountChange);
     };
   }, []);
   var addonsMemo = useMemo(function () {

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

@@ -1,5 +1,8 @@
 .pisell-lowcode__booking-footer-voucher-container {
   margin-bottom: 8px;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
   .voucher-title {
     display: flex;
     align-items: center;
@@ -47,9 +50,9 @@
     width: 100%;
     transition: 0.2s;
     max-height: 0;
-    overflow: hidden;
     display: flex;
     flex-direction: column;
+    overflow: auto;
 
     &.show {
       max-height: unset;

package/es/components/booking/components/voucherModal/index.less

@@ -6,6 +6,7 @@
   .pisell-voucher-modal-content {
     max-height: 70vh;
     overflow-y: auto;
+    display: flex;
   }
 
   // 隐藏状态下的样式优化

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

@@ -48,12 +48,13 @@ import EditTabs from "../../../info/service/editService/EditTabs";
 import BookingList from "../../../info/service/editService/BookingList";
 import dayjs from "dayjs";
 import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/service2/Group/utils";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 import { useShopDiscountModule } from "../../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 import DiscountChangeModal from "./DiscountChangeModal";
 import Decimal from "decimal.js";
 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;
+  var _context$appHelper, _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;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -89,6 +90,9 @@ var Info = function Info(_, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     currentTab = _useState8[0],
     setCurrentTab = _useState8[1];
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    getData = _context$appHelper$ut.getData;
   var valuesRef = useRef({});
   var noInOriginalDiscountIdsRef = useRef([]);
 
@@ -323,7 +327,9 @@ var Info = function Info(_, ref) {
       submitLock = false;
     }, 1500);
     var _list = _toConsumableArray(state.service.value);
-    var _item = _objectSpread(_objectSpread({}, cacheItem !== null && cacheItem !== void 0 ? cacheItem : state.service.cacheItem), {}, {
+    var _item = _objectSpread(_objectSpread({
+      is_price_include_tax: getData('is_price_include_tax')
+    }, cacheItem !== null && cacheItem !== void 0 ? cacheItem : state.service.cacheItem), {}, {
       autoClose: false
     });
     var _extend = _objectSpread(_objectSpread({}, _item._extend), {}, {

package/es/components/checkout/components/WalletPassModule/index.js

@@ -25,6 +25,7 @@ var WalletPassModule = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useWalletPass = useWalletPass({
       onSelectChange: onSelectChange,
       customAmount: customAmount,
+      totalAmount: Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) || 0,
       clientId: clientId
     }),
     handleSelectWallet = _useWalletPass.handleSelectWallet,

package/es/components/checkout/components/WalletPassModule/utils.d.ts

@@ -1,6 +1,7 @@
 declare type WalletPassDataType = Record<string, any>;
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => any;
 export declare const voucherTime: (data: WalletPassDataType, key?: string) => any;
+export declare const getVoucherAvailableStatus: (item: any) => boolean;
 export declare const formatMachineCodeServer2CardList: (data: WalletPassDataType[], selectId?: number[], otherProps?: Record<string, any>) => any;
 export declare const formatDiscountWalletData: (data: any, selectId?: number[]) => any;
 export interface WalletPassUsageUnit {

package/es/components/checkout/components/WalletPassModule/utils.js

@@ -11,12 +11,15 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from 'react';
-import { formatDate, locales } from '@pisell/utils';
+import { formatDate, isNumber, locales } from '@pisell/utils';
 import { globalConfig, PisellText } from "@pisell/materials";
 import Decimal from 'decimal.js';
 var Amount = PisellText.Amount;
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
+  if (isNumber(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 export var voucherTime = function voucherTime(data) {
@@ -27,11 +30,22 @@ export var voucherTime = function voucherTime(data) {
   }
   return locales.getText('pisell2.text.walletPassPermanent');
 };
+export var getVoucherAvailableStatus = function getVoucherAvailableStatus(item) {
+  return item.unified_available_status === 1 && (isNumber(item._unified_available_status) ? !!item._unified_available_status : true);
+};
 export var formatMachineCodeServer2CardList = function formatMachineCodeServer2CardList(data) {
   var selectId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var otherProps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return (data || []).map(function (item) {
     var _item$unified_message, _item$product;
+    var disabled = false;
+    if (item.unified_available_status === 0) {
+      disabled = true;
+    } else {
+      if (isNumber(item._unified_available_status)) {
+        disabled = !item._unified_available_status;
+      }
+    }
     return _objectSpread({
       id: item.id,
       name: item.product_name,
@@ -48,8 +62,8 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       showQrCode: false,
       showStatus: true,
       code: item.code,
-      disabled: !item.unified_available_status,
-      disabledReason: (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
+      disabled: disabled,
+      disabledReason: isNumber(item._unified_available_status) && item._unified_available_status !== 1 ? item.reason : (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -9,6 +9,7 @@ export declare const useWalletPass: (props: {
     }[]) => void) | undefined;
     customAmount?: string | undefined;
     clientId?: number | undefined;
+    totalAmount?: number | undefined;
 }) => {
     walletRecommendList: any[];
     userIdentificationCodes: any[];
@@ -29,7 +30,6 @@ export declare const useWalletPass: (props: {
     selectedDiscountList: any;
     handleSelectDiscount: (this: unknown, value: number[], option: any) => void;
     customerName: any;
-    fetchWalletRecommendList: (this: unknown, params: any) => Promise<any>;
     fetchUserIdentificationCodes: (this: unknown, params: any) => Promise<any>;
     getCachedWalletRecommendList: (this: unknown) => any;
     getCachedUserIdentificationCodes: (this: unknown) => any;