@pisell/private-materials 3.3.33 → 3.3.35

package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -17,10 +17,10 @@ import React, { useMemo, useState } from 'react';
 import { locales } from '@pisell/utils';
 import { Button, PisellToast } from '@pisell/materials';
 import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer } from "../../../../../Sales";
-import { formatValues } from "../../../../../Sales/Checkout/utils";
+import { formatValues, getFormParams } from "../../../../../Sales/Checkout/utils";
 import OrderProductModal from "../../OrderProductModal/index";
 import EmptyHolderModal from "../../EmptyHolderModal";
-import { getEventDetailBookingOptionsApi } from "../../../../../Sales/Event/serve";
+import { getProductPrice } from "../../../../../Sales/Event/serve";
 import { useRequest } from 'ahooks';
 import useEngineContext from "../../../../../../hooks/useEngineContext";
 import "./index.less";
@@ -67,7 +67,9 @@ var ContinueButton = function ContinueButton() {
     removeSessionStorage = _useSales2.removeSessionStorage;
   var context = useEngineContext();
   var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
-    store = _ref.store;
+    store = _ref.store,
+    action = _ref.action,
+    getStore = _ref.getStore;
 
   /**
    * @title: 下单
@@ -77,29 +79,53 @@ var ContinueButton = function ContinueButton() {
    * @Date: 2025-02-10 17:54
    */
   var handleCheckout = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var value, result, _result$err;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var params;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            value = formatValues(data); // 如果检测成功，则直接下单
-            _context.next = 3;
-            return onCheckout(value);
-          case 3:
-            result = _context.sent;
-            // 清空数据
-            if (result !== null && result !== void 0 && result.success) {
-              removeSessionStorage();
-            } else {
-              PisellToast({
-                content: (result === null || result === void 0 || (_result$err = result.err) === null || _result$err === void 0 ? void 0 : _result$err.message) || ''
-              });
-            }
-          case 5:
+            params = getFormParams(data);
+            action === null || action === void 0 || action({
+              type: 'pisell1.goProductForm',
+              data: params,
+              callback: function () {
+                var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
+                  var value, result, _result$err;
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        value = formatValues(data, false, {
+                          relation_forms: e
+                        }); // 如果检测成功，则直接下单
+                        _context.next = 3;
+                        return onCheckout(value);
+                      case 3:
+                        result = _context.sent;
+                        // 清空数据
+                        if (result !== null && result !== void 0 && result.success) {
+                          removeSessionStorage();
+                        } else {
+                          PisellToast({
+                            content: (result === null || result === void 0 || (_result$err = result.err) === null || _result$err === void 0 ? void 0 : _result$err.message) || ''
+                          });
+                        }
+                      case 5:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }));
+                function callback(_x) {
+                  return _callback.apply(this, arguments);
+                }
+                return callback;
+              }()
+            });
+          case 2:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function handleCheckout() {
       return _ref2.apply(this, arguments);
@@ -109,23 +135,130 @@ var ContinueButton = function ContinueButton() {
   /**
    * 登录后根据返回商品价格更新cartItem price
    */
-  var getEventDetailBookingOptions = useRequest(getEventDetailBookingOptionsApi, {
+  var _getProductPrice = useRequest(getProductPrice, {
     manual: true,
     onSuccess: function onSuccess(res) {
-      var _res$data;
-      var list = ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
+      var list = res.data || [];
       var productById = list.reduce(function (pre, cur) {
         pre[cur.id] = cur;
         return pre;
       }, {});
+      console.log('start update price');
       var newCartItems = cartData.cartItems.map(function (item) {
         var _ref3 = item._originData || {},
           product = _ref3.product;
         var newProduct = productById[product.product_id];
-        item.price = newProduct.price;
-        item.total = newProduct.price;
+        // 目前默认按单件商品计算
+        var _totalPrice = Number(newProduct.price);
+        if (!(item !== null && item !== void 0 && item._productDetail)) {
+          // 没有 _productDetail 说明可能是普通商品 则直接替换价格
+          item.price = _totalPrice;
+          item.total = _totalPrice;
+          return item;
+        }
+
+        // 从 cartItem 中获取bundleItem原始信息
+        var _item$_productDetail = item._productDetail,
+          _item$_productDetail$ = _item$_productDetail.bundle,
+          bundle = _item$_productDetail$ === void 0 ? [] : _item$_productDetail$,
+          options = _item$_productDetail.options;
+
+        // 1. 组合规格商品
+        if (product !== null && product !== void 0 && product.product_variant_id) {
+          var _newProduct$variant = newProduct.variant,
+            variant = _newProduct$variant === void 0 ? [] : _newProduct$variant;
+          var _variant = variant.find(function (v) {
+            return v.id === product.product_variant_id;
+          });
+          if (_variant) {
+            _totalPrice = Number(_variant.price);
+          }
+        } else if (
+        // 2. 套餐商品
+        Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle) && product.product_bundle.length > 0) {
+          // 登录后的最新商品分组信息
+          var _newProduct$bundle_gr = newProduct.bundle_group,
+            bundle_group = _newProduct$bundle_gr === void 0 ? [] : _newProduct$bundle_gr;
+          var _loop = function _loop() {
+            var _targetBundleGroup$bu;
+            var pbItem = product.product_bundle[i];
+            var bundle_group_id = pbItem.bundle_group_id,
+              bundle_id = pbItem.bundle_id,
+              option = pbItem.option;
+            // 最初绑定的bundle的基本信息，主要是获取 price_type 用于计算最新价格
+            var _originBundleItemInfo = bundle.find(function (bi) {
+              return bi.id === bundle_id;
+            });
+            var _targetBundleGroup = bundle_group.find(function (bg) {
+              return bg.id === bundle_group_id;
+            });
+            // 如果匹配到bundle group items, 则继续定位 item
+            if (_targetBundleGroup !== null && _targetBundleGroup !== void 0 && (_targetBundleGroup$bu = _targetBundleGroup.bundle_item) !== null && _targetBundleGroup$bu !== void 0 && _targetBundleGroup$bu.length) {
+              var _newBundleItemInfo = _targetBundleGroup.bundle_item.find(function (bi) {
+                return bi.id === bundle_id;
+              });
+              // 比对原始bundle_item中的商品id和最新bundle_item中的商品id
+              if ((_originBundleItemInfo === null || _originBundleItemInfo === void 0 ? void 0 : _originBundleItemInfo._bundle_product_id) === (_newBundleItemInfo === null || _newBundleItemInfo === void 0 ? void 0 : _newBundleItemInfo.bundle_product_id)) {
+                var price_type = _originBundleItemInfo.price_type,
+                  _originBundleItemInfo2 = _originBundleItemInfo.num,
+                  num = _originBundleItemInfo2 === void 0 ? 0 : _originBundleItemInfo2,
+                  _originBundleItemOptions = _originBundleItemInfo.option;
+                var _bundleItemPrice = Number(_newBundleItemInfo.price);
+                if (price_type === 'markup') {
+                  _totalPrice += _bundleItemPrice * num;
+                } else if (price_type === 'markdown') {
+                  _totalPrice -= _bundleItemPrice * num;
+                } else {
+                  _totalPrice += _bundleItemPrice * num;
+                }
+                // 如果该套餐商品子商品为单规格商品
+                if (Array.isArray(option) && (option === null || option === void 0 ? void 0 : option.length) > 0) {
+                  var _loop2 = function _loop2() {
+                    var option_group_item_id = option[j].option_group_item_id;
+                    var _originOptionItem = _originBundleItemOptions.find(function (op) {
+                      return op.product_option_item_id === option_group_item_id;
+                    });
+                    if (_originOptionItem) {
+                      var price = _originOptionItem.price,
+                        _originOptionItem$num = _originOptionItem.num,
+                        _optionNum = _originOptionItem$num === void 0 ? 0 : _originOptionItem$num;
+                      _totalPrice += Number(price) * _optionNum;
+                    }
+                  };
+                  for (var j = 0; j < option.length; j++) {
+                    _loop2();
+                  }
+                }
+              }
+            }
+          };
+          for (var i = 0; i < product.product_bundle.length; i++) {
+            _loop();
+          }
+        } else if (
+        // 3. 单规格商品
+        Array.isArray(product === null || product === void 0 ? void 0 : product.product_option_item) && product.product_option_item.length > 0) {
+          var _loop3 = function _loop3() {
+            var option_group_item_id = product.product_option_item[_i].option_group_item_id;
+            var _originOptionItem = options.find(function (op) {
+              return op.product_option_item_id === option_group_item_id;
+            });
+            if (_originOptionItem) {
+              var price = _originOptionItem.price,
+                _originOptionItem$num2 = _originOptionItem.num,
+                num = _originOptionItem$num2 === void 0 ? 0 : _originOptionItem$num2;
+              _totalPrice += Number(price) * num;
+            }
+          };
+          for (var _i = 0; _i < product.product_option_item.length; _i++) {
+            _loop3();
+          }
+        }
+        item.price = _totalPrice;
+        item.total = _totalPrice;
         return item;
       });
+      console.log('new cart data', newCartItems);
       setData({
         cartData: _objectSpread(_objectSpread({}, cartData), {}, {
           cartItems: newCartItems
@@ -133,33 +266,45 @@ var ContinueButton = function ContinueButton() {
       });
     }
   });
+
+  /**
+   * 登录后重新获取应用报价单后的价格
+   * 过滤掉组规格商品
+   */
   var getCartItemProductsWithQuotation = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var _store$getState;
-      var ids, customer;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      var ids, store, customer;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             ids = cartData.cartItems.map(function (item) {
               var _ref5 = item._originData || {},
-                product = _ref5.product;
-              return product === null || product === void 0 ? void 0 : product.product_id;
+                _ref5$product = _ref5.product,
+                product = _ref5$product === void 0 ? {} : _ref5$product;
+              var product_id = product.product_id;
+              return product_id;
             }).filter(function (id) {
               return !!id;
             });
+            store = getStore();
             customer = store === null || store === void 0 || (_store$getState = store.getState()) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 ? void 0 : _store$getState.userInfo;
-            getEventDetailBookingOptions.run({
+            if (ids !== null && ids !== void 0 && ids.length) {
+              _context3.next = 5;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 5:
+            _getProductPrice.run({
               ids: ids,
-              num: 100,
-              skip: 1,
-              customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
-              open_quotation: 1
+              customer_id: customer === null || customer === void 0 ? void 0 : customer.id
+              // open_quotation: 1,
             });
-          case 3:
+          case 6:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function getCartItemProductsWithQuotation() {
       return _ref4.apply(this, arguments);
@@ -174,26 +319,26 @@ var ContinueButton = function ContinueButton() {
    * @Date: 2025-02-08 18:57
    */
   var handleNextStep = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             onCloseCart();
             setOpenEmptyHolder(false);
 
             // 如果当前是确认信息页面，则到结算页面
             if (!isLastStep) {
-              _context3.next = 4;
+              _context4.next = 4;
               break;
             }
-            return _context3.abrupt("return", handleCheckout());
+            return _context4.abrupt("return", handleCheckout());
           case 4:
             nextStep();
           case 5:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function handleNextStep() {
       return _ref6.apply(this, arguments);
@@ -231,67 +376,67 @@ var ContinueButton = function ContinueButton() {
    * @Date: 2025-01-16 16:30
    */
   var handleContinue = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
       var value, checkRes, emptyHolders;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!isLastStep) {
-              _context5.next = 14;
+              _context6.next = 14;
               break;
             }
             value = formatValues(data); // 检测商品是否可以下单
-            _context5.next = 4;
+            _context6.next = 4;
             return onCheckBeforeBooking(value);
           case 4:
-            checkRes = _context5.sent;
+            checkRes = _context6.sent;
             if (!((checkRes === null || checkRes === void 0 ? void 0 : checkRes.result) === false)) {
-              _context5.next = 9;
+              _context6.next = 9;
               break;
             }
             setCheckedNumber(checkRes === null || checkRes === void 0 ? void 0 : checkRes.num);
             setOpenCheckout(true);
-            return _context5.abrupt("return");
+            return _context6.abrupt("return");
           case 9:
             // 验证holder是否为空
             emptyHolders = getWithoutCartItemsHolderNames();
             if (!((emptyHolders === null || emptyHolders === void 0 ? void 0 : emptyHolders.length) > 0)) {
-              _context5.next = 12;
+              _context6.next = 12;
               break;
             }
-            return _context5.abrupt("return", setOpenEmptyHolder(true));
+            return _context6.abrupt("return", setOpenEmptyHolder(true));
           case 12:
             // 关闭购物车弹窗
             onCloseCart();
-            return _context5.abrupt("return", handleCheckout());
+            return _context6.abrupt("return", handleCheckout());
           case 14:
             if (isLogin()) {
-              _context5.next = 17;
+              _context6.next = 17;
               break;
             }
             onCloseCart();
-            return _context5.abrupt("return", openLoginModal({
+            return _context6.abrupt("return", openLoginModal({
               callback: function () {
-                var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(status) {
-                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                    while (1) switch (_context4.prev = _context4.next) {
+                var _callback2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(status) {
+                  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                    while (1) switch (_context5.prev = _context5.next) {
                       case 0:
                         if (!(status === 'success')) {
-                          _context4.next = 4;
+                          _context5.next = 4;
                           break;
                         }
-                        _context4.next = 3;
+                        _context5.next = 3;
                         return getCartItemProductsWithQuotation();
                       case 3:
                         handleHolder();
                       case 4:
                       case "end":
-                        return _context4.stop();
+                        return _context5.stop();
                     }
-                  }, _callee4);
+                  }, _callee5);
                 }));
-                function callback(_x) {
-                  return _callback.apply(this, arguments);
+                function callback(_x2) {
+                  return _callback2.apply(this, arguments);
                 }
                 return callback;
               }()
@@ -300,9 +445,9 @@ var ContinueButton = function ContinueButton() {
             handleHolder();
           case 18:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
     return function handleContinue() {
       return _ref7.apply(this, arguments);

package/es/components/eventBooking/components/Provider/Cart/Item/Total.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Total: ({ className, isFooter }: any) => JSX.Element;
 export default Total;

package/es/components/eventBooking/components/Provider/Content/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const EmptyHolderModal: (props: any) => JSX.Element;
 export default EmptyHolderModal;

package/es/components/eventBooking/components/Provider/Footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Footer: () => JSX.Element;
 export default Footer;

package/es/components/eventBooking/components/Provider/Header/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

package/es/components/eventBooking/components/Provider/Information/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Information: () => JSX.Element;
 export default Information;

package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const InformationOptionsModal: (props: any) => JSX.Element;
 export default InformationOptionsModal;

package/es/components/eventBooking/components/Provider/OrderProductModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const OrderProductModal: (props: any) => JSX.Element;
 export default OrderProductModal;

package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const RemoveOptionConfirmModal: (props: any) => JSX.Element;
 export default RemoveOptionConfirmModal;

package/es/components/eventBooking/components/Provider/SelectHolderModal.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const SelectHolderModal: (props: any) => JSX.Element;
 export default SelectHolderModal;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type CallToBookProps = {
     show: boolean;
     type: string;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const WeekItem: (props: any) => JSX.Element;
 export default WeekItem;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts

@@ -1,3 +1,4 @@
-/// <reference types="react" />
-declare const BookingOptions: () => JSX.Element;
+declare const BookingOptions: (props: {
+    onChangeBookingOption?: ((bookingOption: any) => void) | undefined;
+}) => JSX.Element;
 export default BookingOptions;

package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.js

@@ -3,12 +3,17 @@ import OpenCard from "../../OpenCard";
 import { PisellCheckboxGroup, PisellText } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import { useEventDetail } from "../../../../Sales";
-var BookingOptions = function BookingOptions() {
+var BookingOptions = function BookingOptions(props) {
   var _detail$bookingOption, _detail$bookingOption2;
   var _useEventDetail = useEventDetail(),
     detail = _useEventDetail.detail,
     currentBookingOption = _useEventDetail.currentBookingOption,
     selectEventDetailBookingOptions = _useEventDetail.selectEventDetailBookingOptions;
+  var onChange = function onChange(value, item) {
+    var _props$onChangeBookin;
+    selectEventDetailBookingOptions(value);
+    props === null || props === void 0 || (_props$onChangeBookin = props.onChangeBookingOption) === null || _props$onChangeBookin === void 0 || _props$onChangeBookin.call(props, item);
+  };
   return /*#__PURE__*/React.createElement(OpenCard, {
     title: locales.getText('pisell2.event.booking.options'),
     showBorder: true,
@@ -30,9 +35,7 @@ var BookingOptions = function BookingOptions() {
         className: "price"
       }));
     },
-    onChange: function onChange(value) {
-      return selectEventDetailBookingOptions(value);
-    }
+    onChange: onChange
   }));
 };
 export default BookingOptions;

package/es/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Resource: (props: any) => JSX.Element;
 export default Resource;