@pisell/private-materials 6.6.5 → 6.6.7

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

@@ -339,6 +339,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]);
   var orderTotalList = useMemo(function () {
     return [
     // 订单已付金额
@@ -878,23 +885,24 @@ var Footer = function Footer(props) {
             }
             return _context6.abrupt("return");
           case 7:
+            debugger;
             hasUnspecifiedHolderProduct = (_state$service$value2 = state.service.value) === null || _state$service$value2 === void 0 ? void 0 : _state$service$value2.some(function (item) {
               var _item$_extend, _item$_extend2;
               return (!((_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.holder_id) || ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.holder_id) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.length) === 0) && !isNormalProductByDurationSchedule(item);
             });
             if (!(!isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id) && getIsSubjectRequire(state) && hasUnspecifiedHolderProduct)) {
-              _context6.next = 11;
+              _context6.next = 12;
               break;
             }
-            _context6.next = 11;
+            _context6.next = 12;
             return showConfirmHolderModal(state, dispatch);
-          case 11:
+          case 12:
             if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 13;
+              _context6.next = 14;
               break;
             }
             return _context6.abrupt("return");
-          case 13:
+          case 14:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -903,34 +911,34 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 26;
+              _context6.next = 27;
               break;
             }
-            _context6.next = 22;
+            _context6.next = 23;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 22:
+          case 23:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 25;
+              _context6.next = 26;
               break;
             }
             _context6.t0 = {};
-          case 25:
-            saveOtherValue = _context6.t0;
           case 26:
-            _context6.prev = 26;
+            saveOtherValue = _context6.t0;
+          case 27:
+            _context6.prev = 27;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // checkout 2.0 补充商品总税费字段
             values.product_tax_fee = total.tax || 0;
             if (!noSubmit) {
-              _context6.next = 32;
+              _context6.next = 33;
               break;
             }
             return _context6.abrupt("return", values);
-          case 32:
+          case 33:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context6.next = 42;
+              _context6.next = 43;
               break;
             }
             subtotal_info = {
@@ -939,7 +947,7 @@ var Footer = function Footer(props) {
               total: cloneDeep(total),
               showDetail: showDetail
             };
-            _context6.next = 37;
+            _context6.next = 38;
             return checkout.updateLocalOrderAsync({
               orderId: editOrderId,
               orderData: values,
@@ -947,10 +955,10 @@ var Footer = function Footer(props) {
               autoPayment: true,
               totalInfo: subtotal_info
             });
-          case 37:
-            _context6.next = 39;
+          case 38:
+            _context6.next = 40;
             return checkout.manualSyncOrderAsync();
-          case 39:
+          case 40:
             res = _context6.sent;
             if (res.success) {
               // 回调关闭弹窗
@@ -958,7 +966,7 @@ var Footer = function Footer(props) {
               _setLoading(false);
             }
             return _context6.abrupt("return");
-          case 42:
+          case 43:
             // 如果是保存，检查是否需要支付定金
             if (type === 'save') {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
@@ -1022,43 +1030,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 48;
+              _context6.next = 49;
               break;
             }
-            _context6.next = 48;
+            _context6.next = 49;
             return handleSaveAddons();
-          case 48:
+          case 49:
             if (!infoEdit) {
-              _context6.next = 53;
+              _context6.next = 54;
               break;
             }
-            _context6.next = 51;
+            _context6.next = 52;
             return api(values, state.bookingId || editOrderId);
-          case 51:
+          case 52:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 53:
+          case 54:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context6.abrupt("return", callbackData || values);
-          case 58:
-            _context6.prev = 58;
-            _context6.t1 = _context6["catch"](26);
+          case 59:
+            _context6.prev = 59;
+            _context6.t1 = _context6["catch"](27);
             console.log(_context6.t1);
             if ((_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.code) === 70101) {
               message.error(_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.message);
             }
             _setLoading(false);
-          case 63:
+          case 64:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[26, 58]]);
+      }, _callee6, null, [[27, 59]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);
@@ -1747,7 +1755,8 @@ var Footer = function Footer(props) {
     }
   };
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
-    var _state$service4;
+    var _state$client4, _state$service4;
+    var beforeValue = state === null || state === void 0 || (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : _state$client4.value;
     dispatch({
       type: 'setClient',
       payload: {
@@ -1755,6 +1764,7 @@ var Footer = function Footer(props) {
         edit: true
       }
     });
+    if ((beforeValue === null || beforeValue === void 0 ? void 0 : beforeValue.id) === (value === null || value === void 0 ? void 0 : value.id)) return;
     if (state !== null && state !== void 0 && (_state$service4 = state.service) !== null && _state$service4 !== void 0 && (_state$service4 = _state$service4.value) !== null && _state$service4 !== void 0 && _state$service4.length) {
       // 还需要清空商品内的 holder 信息
       dispatch({

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

@@ -15,7 +15,12 @@ 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
+ */
+export declare const getBundleDiscountList: (bundle: any[]) => any[];
 export interface ResourceItem {
     [key: string]: any;
 }
@@ -37,6 +42,20 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+/**
+ * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
+ * @param item
+ * @returns
+ */
+export declare const formatOriginalPrice: (item: any) => number;
+/**
+ * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
+ * @param item
+ * @returns
+ */
+export declare const formatSellingPrice: (item: any) => number;
+export declare const getSourceProductPrice: (item: any) => number;
+export declare const getMainProductSellingPrice: (item: any) => number | undefined;
 /**
  * @title: 是否包含跨日预约商品
  * @description: