@pisell/private-materials 6.4.83 → 6.4.84

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

@@ -35,7 +35,7 @@ import ProductItem from "../components/TabProduct/selectProductItem";
 import TabProduct from "../components/TabProduct";
 import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
-import { formatOriginalPrice, formatProductBundle, formatProductOption, formatProductPrice, formatSellingPrice, getBundleDiscountList, getMainProductSellingPrice, getSourceProductPrice } from "../components/footer/utils";
+import { formatOriginalPrice, formatProductBundle, formatProductOption, formatProductPrice, formatSellingPrice, getBundleDiscountList, getSourceProductPrice, getMainProductSellingPrice } from "../components/footer/utils";
 import { formatProductListByCategory, getIsEject, getIsOnlySession, getMainPrice, getProductTotalPrice, isSessionProduct, request } from "../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";

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

@@ -290,8 +290,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _window;
-    (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.bookingTicket) === null || _window === void 0 || _window.clearAllCart();
+    var _shopDiscount$clear;
+    // (window as any)?.shopApi?.bookingTicket?.clearAllCart();
     clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
@@ -358,6 +358,8 @@ var ActionButtons = function ActionButtons(_ref) {
     // TODO: 如果需要重置更多信息，可以在这里添加
     // 比如重置优惠券、表单数据、宠物信息等
 
+    // 清空商品券
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
     setShowClearModal(false);
     Toast === null || Toast === void 0 || Toast.success(createToastContent(locales.getText('pisell2.action-buttons.clear-success')));
   };

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

@@ -605,16 +605,8 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _item$_extend$other2, _item$_extend$other3, _item$_extend$other5;
-  var total = new Decimal(item._extend.main_product_selling_price || item._extend.price || 0);
-
-  // 如果主商品没有main_product_selling_price 则通过discount_list计算
-  if (!item._extend.main_product_selling_price) {
-    // 主商品折扣金额
-    var discountAmount = getDiscountAmount(item.discount_list);
-    // 主商品总价 - 主商品折扣金额
-    total = total.minus(discountAmount);
-  }
+  var _ref3, _ref4, _item$_extend$main_pr, _item$_extend3, _item$metadata, _item$_extend$other2, _item$_extend$other3, _item$_extend$other5;
+  var total = new Decimal((_ref3 = (_ref4 = (_item$_extend$main_pr = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.main_product_selling_price) !== null && _item$_extend$main_pr !== void 0 ? _item$_extend$main_pr : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item._extend.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
 
   // 单规格 
   if ((_item$_extend$other2 = item._extend.other) !== null && _item$_extend$other2 !== void 0 && _item$_extend$other2.option && Array.isArray((_item$_extend$other3 = item._extend.other) === null || _item$_extend$other3 === void 0 ? void 0 : _item$_extend$other3.option)) {
@@ -629,13 +621,13 @@ var getMainProductTotal = function getMainProductTotal(item) {
     for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
       var bundleItem = _step8.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref3, _bundleItem$bundle_se2;
+        var _ref5, _bundleItem$bundle_se2;
         // 子商品折扣金额
-        var _discountAmount = getDiscountAmount(bundleItem.discount_list);
+        var discountAmount = getDiscountAmount(bundleItem.discount_list);
         // 子商品价格
-        var bundleItemPrice = new Decimal((_ref3 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
+        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.minus(discountAmount);
         total = total.add(bundleItemTotal);
       }
     }
@@ -837,11 +829,11 @@ var getSurcharge = function getSurcharge(state, options) {
                 scheduleById: scheduleById || {},
                 ScheduleModule: ScheduleModule
               })) {
-                var _ref4, _bundleItem$bundle_se3;
+                var _ref6, _bundleItem$bundle_se3;
                 var _mainQuantity = item._extend.quantity || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref4 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0),
+                  total: Number((_ref6 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref6 !== void 0 ? _ref6 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -936,10 +928,17 @@ var getSurcharge = function getSurcharge(state, options) {
 
     // 追加进入的固定附加费总值
     var fixedTotal = new Decimal(0);
+    // 追加到商品的附加费总值 用于追加抹平字段
+    var productTotalSurcharge = new Decimal(0);
     if (matchedItems.length > 0) {
       // 基于每个商品计算附加费：max(0, 商品价格) * rate + fixed
       var configTotal = new Decimal(0);
 
+      // 计算固定附加费 - 只加一次
+      if (fixed && new Decimal(fixed).gt(0)) {
+        configTotal = configTotal.plus(fixed);
+      }
+
       // 计算百分比附加费 - 对每个商品单独计算
       if (percentage && new Decimal(percentage).gt(0) || fixed) {
         var percentageRate = new Decimal(percentage);
@@ -957,6 +956,7 @@ var getSurcharge = function getSurcharge(state, options) {
             var addTimeTotal = new Decimal(_item4.addTimeTotal || 0);
             // 单个商品总附加费
             var itemTotalSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
+            configTotal = configTotal.plus(itemTotalSurcharge);
 
             // 单个商品单数量附加费
             var itemSurcharge = itemPrice.times(percentageRate);
@@ -965,10 +965,12 @@ var getSurcharge = function getSurcharge(state, options) {
             var fixedSurcharge = new Decimal(1).div(productCount).times(fixed).times(100).floor().div(100).toFixed(2);
             var quantity = _item4.isMain ? _item4.quantity : _item4.quantity * _item4.mainQuantity;
             fixedTotal = fixedTotal.plus(new Decimal(fixedSurcharge).times(quantity).toNumber());
+
             // 如果是最后一个商品 判断fixed - fixedTotal 是否有剩余小数 如果有的话，追加抹平字段
             if (isLast && fixedTotal.gt(0)) {
               var remaining = new Decimal(fixed).minus(fixedTotal).toNumber();
               if (remaining > 0) {
+                productTotalSurcharge = productTotalSurcharge.plus(remaining);
                 if (_item4.isMain) {
                   _item4.item._extend.surcharge_rounding_remainder = remaining;
                 } else {
@@ -983,17 +985,34 @@ var getSurcharge = function getSurcharge(state, options) {
                 var _item4$item$_extend;
                 var originSurchargeFee = new Decimal(_item4.item._extend.surcharge_fee || 0);
                 // 保留两位小数
-                _item4.item._extend.surcharge_fee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toNumber();
+                var surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+                productTotalSurcharge = productTotalSurcharge.plus(new Decimal(surchargeFee).times(itemQuantity).toNumber());
+                _item4.item._extend.surcharge_fee = surchargeFee;
                 _item4.item._extend.relation_surcharge_ids = [].concat(_toConsumableArray(((_item4$item$_extend = _item4.item._extend) === null || _item4$item$_extend === void 0 ? void 0 : _item4$item$_extend.relation_surcharge_ids) || []), [id]);
               } else {
                 var _item4$item;
                 var _originSurchargeFee = new Decimal(_item4.item.surcharge_fee || 0);
                 // 保留两位小数
-                _item4.item.surcharge_fee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toNumber();
+                var _surchargeFee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+                productTotalSurcharge = productTotalSurcharge.plus(new Decimal(_surchargeFee).times(itemQuantity).toNumber());
+                _item4.item.surcharge_fee = _surchargeFee;
                 _item4.item.relation_surcharge_ids = [].concat(_toConsumableArray(((_item4$item = _item4.item) === null || _item4$item === void 0 ? void 0 : _item4$item.relation_surcharge_ids) || []), [id]);
               }
             }
-            configTotal = configTotal.plus(itemTotalSurcharge);
+            // 最后一个商品 判断configTotal - productTotalSurcharge 是否有剩余小数 如果有的话，追加抹平字段
+            if (isLast && configTotal.minus(productTotalSurcharge).gt(0)) {
+              // 四舍五入configTotal
+              var configTotalRounded = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+              if (_item4.isMain) {
+                var newRoundingRemainder = new Decimal(_item4.item._extend.surcharge_rounding_remainder || 0);
+                newRoundingRemainder = newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
+                _item4.item._extend.surcharge_rounding_remainder = newRoundingRemainder.toNumber();
+              } else {
+                var _newRoundingRemainder = new Decimal(_item4.item.surcharge_rounding_remainder || 0);
+                _newRoundingRemainder = _newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
+                _item4.item.surcharge_rounding_remainder = _newRoundingRemainder.toNumber();
+              }
+            }
           }
         } catch (err) {
           _iterator18.e(err);
@@ -1002,11 +1021,6 @@ var getSurcharge = function getSurcharge(state, options) {
         }
       }
 
-      // 计算固定附加费 - 只加一次
-      if (fixed && new Decimal(fixed).gt(0)) {
-        configTotal = configTotal.plus(fixed);
-      }
-
       // 如果该配置有金额，则添加到结果中
       finalAmount = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
     }
@@ -1099,13 +1113,13 @@ export var getIsPriceIncludeTax = function getIsPriceIncludeTax(state) {
   var _state$bookingDetail$, _state$bookingDetail6;
   return (_state$bookingDetail$ = (_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.is_price_include_tax) !== null && _state$bookingDetail$ !== void 0 ? _state$bookingDetail$ : 0;
 };
-var getExpectAmount = function getExpectAmount(_ref5) {
-  var price = _ref5.price,
-    tax = _ref5.tax,
-    surchargeAmount = _ref5.surchargeAmount,
-    shopDiscount = _ref5.shopDiscount,
-    state = _ref5.state,
-    options = _ref5.options;
+var getExpectAmount = function getExpectAmount(_ref7) {
+  var price = _ref7.price,
+    tax = _ref7.tax,
+    surchargeAmount = _ref7.surchargeAmount,
+    shopDiscount = _ref7.shopDiscount,
+    state = _ref7.state,
+    options = _ref7.options;
   var _tax = tax;
   // 如果价格含税, 则将税费改为0
   if (getIsPriceIncludeTax(state) || options !== null && options !== void 0 && options.is_price_include_tax) {
@@ -1127,9 +1141,9 @@ var getRoundingAmount = function getRoundingAmount(state) {
   var _state$bookingDetail9;
   return Number(state === null || state === void 0 || (_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.rounding_amount) || 0;
 };
-var getSumTotalAmount = function getSumTotalAmount(_ref6) {
-  var expectAmount = _ref6.expectAmount,
-    roundingAmount = _ref6.roundingAmount;
+var getSumTotalAmount = function getSumTotalAmount(_ref8) {
+  var expectAmount = _ref8.expectAmount,
+    roundingAmount = _ref8.roundingAmount;
   return expectAmount + roundingAmount;
 };
 

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

@@ -17,7 +17,7 @@ import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } from "../../info/service2/utils";
-import { isArr, locales, sendWarningLog, getUniqueId, isNumber } from '@pisell/utils';
+import { isArr, locales, sendWarningLog, getUniqueId, isNumber, isString } from '@pisell/utils';
 import { PisellToast } from '@pisell/materials';
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
@@ -127,8 +127,8 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "custom_price": (d === null || d === void 0 ? void 0 : d.custom_price) || Math.abs(new Decimal((d === null || d === void 0 ? void 0 : d.original_price) || (d === null || d === void 0 ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
       "option": option,
-      "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
-      "bundle_sum_price": (d === null || d === void 0 ? void 0 : d.original_price) || (d === null || d === void 0 ? void 0 : d.original_total),
+      "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._id,
         // 子商品单数量附加费
@@ -279,9 +279,9 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend6, _item$_extend7, _item$variant;
+  var _item$_extend6, _item$price, _item$_extend7, _item$variant;
   var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
-  var price = Number((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
+  var price = Number((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant = item.variant) === null || _item$variant === void 0 ? void 0 : _item$variant.length) > 0) {
@@ -413,8 +413,8 @@ export var getSourceProductPrice = function getSourceProductPrice(item) {
 
 // 获取主商品价格 要增加option
 export var getMainProductSellingPrice = function getMainProductSellingPrice(item) {
-  var _item$_extend29, _item$_extend$other, _item$_extend$other2, _item$_extend30;
-  if (!isNumber((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.main_product_selling_price)) {
+  var _item$_extend29, _item$_extend30, _item$_extend$other, _item$_extend$other2, _item$_extend31;
+  if (!isNumber((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.main_product_selling_price) && !isString((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.main_product_selling_price)) {
     return undefined;
   }
   var optionPrice = new Decimal(0);
@@ -427,7 +427,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
       return accumulator.add(currentPrice.mul(currentNum));
     }, optionPrice);
   }
-  return new Decimal((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.main_product_selling_price).add(optionPrice).toNumber();
+  return new Decimal((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.main_product_selling_price).add(optionPrice).toNumber();
 };
 
 /**
@@ -439,7 +439,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend31, _getMainProductSellin, _item$_extend32, _item$_extend33, _item$_extend34, _item$_extend35;
+  var _item$_extend32, _getMainProductSellin, _item$_extend33, _item$_extend34, _item$_extend35, _item$_extend36;
   if (item !== null && item !== void 0 && item.discount_list) {
     item === null || item === void 0 || item.discount_list.forEach(function (d) {
       if (d !== null && d !== void 0 && d.id) {
@@ -450,7 +450,7 @@ var formatProducts = function formatProducts(item, quantity) {
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
-  var bundleDiscountList = getBundleDiscountList(((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 || (_item$_extend31 = _item$_extend31.other) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.bundle) || []);
+  var bundleDiscountList = getBundleDiscountList(((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.other) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.bundle) || []);
   var discount_list = _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []);
   discount_list.push.apply(discount_list, _toConsumableArray(bundleDiscountList));
 
@@ -479,15 +479,15 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
     "is_charge_tax": item.is_charge_tax,
-    "note": ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.note) || '',
+    "note": ((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.note) || '',
     "discountway": item._extend.discountway || "num",
     "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$_extend33 = item._extend) === null || _item$_extend33 === void 0 || (_item$_extend33 = _item$_extend33.other) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.bundle),
+    "product_bundle": formatProductBundle((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
-    "product_option_item": formatProductOption((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.option),
-    "product_variant_id": ((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.other) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.other) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.option),
+    "product_variant_id": ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.other) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatProductMetadata(item),
     // checkout 需求新增字段
@@ -512,8 +512,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend36;
-    var holderId = (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.holder_id;
+    var _item$_extend37;
+    var holderId = (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -539,15 +539,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend37;
-      return ((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend38;
+      return ((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend38;
-      var key = (_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.holder_id; // 分组键
+      var _item$_extend39;
+      var key = (_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -609,7 +609,7 @@ var formatBookings = function formatBookings(data, values) {
   var bookings = [];
   var obj = {};
   list.forEach(function (item) {
-    var _item$_extend43, _item$_extend44;
+    var _item$_extend44, _item$_extend45, _item$_extend46, _objectSpread2;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -630,9 +630,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend39, _item$_extend40, _item$_extend41, _item$_extend42;
-      var startDate = ((_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.startDate) || ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.start_date);
-      var endDate = ((_item$_extend41 = item._extend) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.endDate) || ((_item$_extend42 = item._extend) === null || _item$_extend42 === void 0 ? void 0 : _item$_extend42.end_date);
+      var _item$_extend40, _item$_extend41, _item$_extend42, _item$_extend43;
+      var startDate = ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.startDate) || ((_item$_extend41 = item._extend) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.start_date);
+      var endDate = ((_item$_extend42 = item._extend) === null || _item$_extend42 === void 0 ? void 0 : _item$_extend42.endDate) || ((_item$_extend43 = item._extend) === null || _item$_extend43 === void 0 ? void 0 : _item$_extend43.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -654,17 +654,20 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
+    if (!((_item$_extend44 = item._extend) !== null && _item$_extend44 !== void 0 && _item$_extend44.unique_identification_number)) {
+      var unique_identification_number = getUniqueId();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
 
     // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
     // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
     // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
-    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend43 = item._extend) === null || _item$_extend43 === void 0 ? void 0 : _item$_extend43.groupId];
-    if (!((_item$_extend44 = item._extend) !== null && _item$_extend44 !== void 0 && _item$_extend44.unique_identification_number)) {
-      var unique_identification_number = getUniqueId();
-      item._extend.unique_identification_number = unique_identification_number;
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend45 = item._extend) === null || _item$_extend45 === void 0 ? void 0 : _item$_extend45.groupId];
+    if (!((_item$_extend46 = item._extend) !== null && _item$_extend46 !== void 0 && _item$_extend46.unique_identification_number)) {
+      var _unique_identification_number = getUniqueId();
+      item._extend.unique_identification_number = _unique_identification_number;
     }
-    debugger;
-    var booking = _objectSpread(_objectSpread({
+    var booking = _objectSpread(_objectSpread((_objectSpread2 = {
       schedule_event_id: item === null || item === void 0 ? void 0 : item.booking_id,
       product: formatProducts(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
@@ -687,7 +690,9 @@ var formatBookings = function formatBookings(data, values) {
       resources: formatResource(item),
       note: item._extend.note,
       "metadata": formatMetaData(item, !isSetGroupId)
-    }, eventOtherParams || {}), dayParams);
+    }, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_objectSpread2, "relation_products", formatRelationDetails(item._extend.relation_details)), "id", item.booking_id || 0), "relation_id", item._extend.relation_id || 0), "like_status", item._extend.like_status || 'common'), "relation_type", item._extend.relation_type || ''), "is_all", false), "schedule_id", item._extend.schedule_id || 0), "end_time", end_time), "sub_type", isDay ? 'days' : getSubType(item)), "select_date", start_date), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_objectSpread2, "start_time", start_time), "end_date", end_date), "start_date", start_date), "duration", isDay ? 0 : flexibleObj.getValue(item._extend.duration)), "number", item._extend.capacity ? getSumCapacity({
+      cacheItem: item
+    }) : item._extend.number || 1), "resources", formatResource(item)), "note", item._extend.note)), eventOtherParams || {}), dayParams);
 
     // 记录下每个GroupId第一次出现的时机
     if (!isSetGroupId) {
@@ -713,12 +718,12 @@ var formatBookings = function formatBookings(data, values) {
         }
       }
       bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
-        product: formatProducts(newItem, 1),
-        number: item._extend.capacity ? getSumCapacity({
+        "product": formatProducts(newItem, 1),
+        "number": item._extend.capacity ? getSumCapacity({
           cacheItem: newItem
         }, false) : newItem._extend.number || 1,
-        holder: getHolderByIndex(booking.holder, i),
-        metadata: formatMetaData(newItem, false)
+        "holder": getHolderByIndex(booking.holder, i),
+        "metadata": formatMetaData(newItem, false)
       }));
     }
   });
@@ -738,16 +743,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend45;
+    var _item$_extend47;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend45 = item._extend) === null || _item$_extend45 === void 0 ? void 0 : _item$_extend45.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend47 = item._extend) === null || _item$_extend47 === void 0 ? void 0 : _item$_extend47.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend46;
-    if (!((_item$_extend46 = item._extend) !== null && _item$_extend46 !== void 0 && _item$_extend46.unique_identification_number)) {
+    var _item$_extend48;
+    if (!((_item$_extend48 = item._extend) !== null && _item$_extend48 !== void 0 && _item$_extend48.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -766,8 +771,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend47;
-    if (!((_item$_extend47 = item._extend) !== null && _item$_extend47 !== void 0 && _item$_extend47.unique_identification_number)) {
+    var _item$_extend49;
+    if (!((_item$_extend49 = item._extend) !== null && _item$_extend49 !== void 0 && _item$_extend49.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -775,7 +780,6 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   return relationProducts || [];
 };
-
 /**
  * @title: 预约主体信息
  * @description:
@@ -888,21 +892,21 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend49;
+    var _item$_extend51;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend48;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend48 = item._extend) === null || _item$_extend48 === void 0 || (_item$_extend48 = _item$_extend48.other) === null || _item$_extend48 === void 0 ? void 0 : _item$_extend48.rowKey);
-      return true;
-    }
-    if (item._extend.quantity > 1 && ((_item$_extend49 = item._extend) === null || _item$_extend49 === void 0 || (_item$_extend49 = _item$_extend49.holder_id) === null || _item$_extend49 === void 0 ? void 0 : _item$_extend49.length) !== item._extend.quantity) {
       var _item$_extend50;
       errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend50 = item._extend) === null || _item$_extend50 === void 0 || (_item$_extend50 = _item$_extend50.other) === null || _item$_extend50 === void 0 ? void 0 : _item$_extend50.rowKey);
       return true;
     }
+    if (item._extend.quantity > 1 && ((_item$_extend51 = item._extend) === null || _item$_extend51 === void 0 || (_item$_extend51 = _item$_extend51.holder_id) === null || _item$_extend51 === void 0 ? void 0 : _item$_extend51.length) !== item._extend.quantity) {
+      var _item$_extend52;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend52 = item._extend) === null || _item$_extend52 === void 0 || (_item$_extend52 = _item$_extend52.other) === null || _item$_extend52 === void 0 ? void 0 : _item$_extend52.rowKey);
+      return true;
+    }
     return false;
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;

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

@@ -70,6 +70,8 @@ var VoucherCard = function VoucherCard(props) {
   var shopDiscount = useShopDiscountModule();
   var _useActiveExecute = useActiveExecute(),
     executeIfActive = _useActiveExecute.executeIfActive;
+  var stateRef = useRef(state);
+  stateRef.current = state;
   services = state.service;
 
   // 将选中的客户数据传递给状态管理
@@ -169,13 +171,13 @@ var VoucherCard = function VoucherCard(props) {
         return;
       }
       if (isBooking4Shop) {
-        var val = shopDiscount.calcDiscount([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
+        var val = shopDiscount.calcDiscount([].concat(_toConsumableArray(stateRef.current.service.value), _toConsumableArray(stateRef.current.addons.value)));
         console.log('input: ', state.service.value);
         console.log('output: ', val);
         productListToValue(val.productList);
       }
     }, {
-      wait: 500
+      wait: 1000
     }),
     run = _useDebounceFn.run;
 

package/es/components/booking/dashboard/serve.js

@@ -10,7 +10,12 @@ export var getBookingList = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return request.getRequest().get("/shop/schedule/booking", params);
+          return request.getRequest().get("/shop/schedule/booking", params, {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          });
         case 2:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;

package/es/components/booking/forms/serve.js

@@ -12,7 +12,12 @@ export var getFormData = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", request.getRequest().get("/shop/form/data/v1", params));
+          return _context.abrupt("return", request.getRequest().get("/shop/form/data/v1", params, {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          }));
         case 1:
         case "end":
           return _context.stop();
@@ -32,7 +37,12 @@ export var sendFormReminder = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", request.getRequest().post("/shop/form/form-reminder", params));
+          return _context2.abrupt("return", request.getRequest().post("/shop/form/form-reminder", params, {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          }));
         case 1:
         case "end":
           return _context2.stop();

package/es/components/booking/hooks/useQuotation.js

@@ -85,9 +85,12 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
         return item.id === bundle.id;
       });
       var optionPrice = calculateTotalPrice((selectBundleInfo === null || selectBundleInfo === void 0 ? void 0 : selectBundleInfo.option) || []);
+
+      // 编辑预约时使用折扣卡
+      var isEditDiscount = item.booking_id && (bundle.discount_list || []).length;
       return _objectSpread(_objectSpread({}, bundle), {}, {
         base_price: bundleItemMap[bundle.id].base_price,
-        price: new Decimal(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
+        price: isEditDiscount ? bundle.price : new Decimal(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
         // product_price: bundleItemMap[item.id].product_price,
       });
     });

package/es/components/booking/info/client/serve.js

@@ -10,7 +10,12 @@ export var getFranchiseeCustomerInfo = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return request.getRequest().get("/shop/franchisee/customer/id", params);
+          return request.getRequest().get("/shop/franchisee/customer/id", params, {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          });
         case 2:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;
@@ -33,7 +38,11 @@ export var getFranchiseeCustomerList = /*#__PURE__*/function () {
         case 0:
           _context2.next = 2;
           return request.getRequest().get("/shop/franchisee/customer/select-list", params, {
-            abort: true
+            abort: true,
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
           });
         case 2:
           _yield$request$getReq2 = _context2.sent;

package/es/components/booking/info/pet/serve.js

@@ -10,7 +10,12 @@ export var getFormDetail = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return request.getRequest().get("/shop/form/".concat(id));
+          return request.getRequest().get("/shop/form/".concat(id), {
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
+          });
         case 2:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;

package/es/components/booking/info/service/Lists.js

@@ -8,7 +8,7 @@ import React, { useContext, useMemo } from 'react';
 import ShoppingCart from "../../../shoppingCart";
 import { CartContext } from "../../../shoppingCart/Provider";
 import { Context } from "../model";
-import { formatProducts, isEventBooking, updateServices } from "../service2/utils";
+import { formatProducts, isEventBooking, isNormalProductByDurationSchedule, updateServices } from "../service2/utils";
 import useHolderConfig from "../hooks/useHolderConfig";
 import { useMemoizedFn } from 'ahooks';
 import { getProductExtend } from "../../info2/service/addService/utils";
@@ -53,7 +53,7 @@ var Lists = function Lists(_ref) {
       var cacheItem = _objectSpread(_objectSpread({}, product), {}, {
         new: 0
       });
-      if (isParallelResource) {
+      if (isParallelResource && !isNormalProductByDurationSchedule(product)) {
         cacheItem = getProductExtend({
           cacheItem: cacheItem,
           state: state