@pisell/private-materials 6.1.1 → 6.2.2

package/es/businessModel/SalesModel/Sales/index.js

@@ -11,6 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { createContext, useRef, useState } from 'react';
+import useEngineContext from "../../../hooks/useEngineContext";
 var defaultData = {};
 var SALES_MODEL_SESSION_STORAGE_KEY = 'shop_h5_sales_model_data';
 export var SalesContext = /*#__PURE__*/createContext({});
@@ -26,23 +27,55 @@ export var SalesProvider = function SalesProvider(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     hooks = _useState4[0],
     setHooks = _useState4[1];
+  var context = useEngineContext();
+  var utils = context.appHelper.utils || {};
   var _setData = function _setData(newData) {
     dataRef.current = _objectSpread(_objectSpread({}, dataRef.current), newData);
     console.log('sales_model_newData', dataRef.current);
     if (config !== null && config !== void 0 && config.useSessionStorage) {
-      sessionStorage.setItem(SALES_MODEL_SESSION_STORAGE_KEY, JSON.stringify(dataRef.current || {}));
+      setSessionStorage();
     }
     setData(_objectSpread({}, dataRef.current));
   };
   var getCurrentData = function getCurrentData() {
     return dataRef.current;
   };
+
+  /**
+   * @title 设置sessionStorage
+   * @description 获取路由参数中的cacheId，并设置到sessionStorage中
+   */
   var setSessionStorage = function setSessionStorage() {
-    sessionStorage.setItem(SALES_MODEL_SESSION_STORAGE_KEY, JSON.stringify(dataRef.current || {}));
+    var _utils$getHistory, _history$location;
+    var history = (utils === null || utils === void 0 || (_utils$getHistory = utils.getHistory) === null || _utils$getHistory === void 0 ? void 0 : _utils$getHistory.call(utils)) || {};
+    var cacheId = (history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 || (_history$location = _history$location.query) === null || _history$location === void 0 ? void 0 : _history$location.cacheId) || '';
+    var sessionData = _objectSpread(_objectSpread({}, dataRef.current || {}), {}, {
+      cacheId: cacheId
+    });
+    sessionStorage.setItem("".concat(SALES_MODEL_SESSION_STORAGE_KEY), JSON.stringify(sessionData || {}));
   };
+
+  /**
+   * @title 获取sessionStorage
+   * @description 获取路由参数中的cacheId并与sessionStorage中的cacheId进行匹配，如果匹配成功，则返回sessionStorage中的数据
+   */
   var getSessionStorage = function getSessionStorage() {
-    var result = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
-    return JSON.parse(result || '{}');
+    var _utils$getHistory2, _history$location2;
+    var history = (utils === null || utils === void 0 || (_utils$getHistory2 = utils.getHistory) === null || _utils$getHistory2 === void 0 ? void 0 : _utils$getHistory2.call(utils)) || {};
+    var strResult = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
+    var result = strResult ? JSON.parse(strResult || '{}') : {};
+    var cacheId = (history === null || history === void 0 || (_history$location2 = history.location) === null || _history$location2 === void 0 || (_history$location2 = _history$location2.query) === null || _history$location2 === void 0 ? void 0 : _history$location2.cacheId) || '';
+
+    // cacheId 为空，且sessionStorage中cacheId也为空，则返回sessionStorage中的数据
+    if (!cacheId && !(result !== null && result !== void 0 && result.cacheId)) {
+      return result;
+    }
+
+    // cacheId 不为空，需要比对sessionStorage中的cacheId与路由参数中的cacheId是否一致
+    if (cacheId && (result === null || result === void 0 ? void 0 : result.cacheId) === cacheId) {
+      return result;
+    }
+    return {};
   };
   var removeSessionStorage = function removeSessionStorage() {
     sessionStorage.removeItem(SALES_MODEL_SESSION_STORAGE_KEY);

package/es/businessModel/SalesModel/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/Sales/Cart/index.js

@@ -22,7 +22,7 @@ import { checkBeforeAddToCartApi } from "./serve";
 import { useCustomer } from "../Customer";
 import { useRequest } from 'ahooks';
 import { formatValues } from "../Checkout/utils";
-import { handleCartItemOrigin, handleProductInfo } from "./utils";
+import { handleCartItemOrigin, handleProductDeposit, handleProductInfo } from "./utils";
 var defaultState = {
   cartItems: [],
   currentCartItem: null
@@ -31,6 +31,7 @@ export var CartContext = /*#__PURE__*/createContext(undefined);
 export var CartProvider = function CartProvider(_ref) {
   var children = _ref.children;
   var _useCustomer = useCustomer(),
+    appContext = _useCustomer.appContext,
     appUtils = _useCustomer.appUtils,
     getUserInfo = _useCustomer.getUserInfo;
   var _useSales = useSales(),
@@ -228,12 +229,16 @@ export var CartProvider = function CartProvider(_ref) {
    */
   var checkBeforeAddToCart = function checkBeforeAddToCart() {
     return new Promise(function (resolve) {
+      var _appContext$appHelper;
       var _cartData = getCurrentData().cartData;
       var newCartItem = createCartItemData() || {};
       var params = formatValues({
-        cartData: {
-          cartItems: [].concat(_toConsumableArray(_cartData.cartItems || []), [newCartItem])
-        }
+        state: {
+          cartData: {
+            cartItems: [].concat(_toConsumableArray(_cartData.cartItems || []), [newCartItem])
+          }
+        },
+        platform: appContext === null || appContext === void 0 || (_appContext$appHelper = appContext.appHelper) === null || _appContext$appHelper === void 0 || (_appContext$appHelper = _appContext$appHelper.constants) === null || _appContext$appHelper === void 0 ? void 0 : _appContext$appHelper.platform
       });
       checkRef.current = {
         callback: function callback(res) {
@@ -324,6 +329,10 @@ export var CartProvider = function CartProvider(_ref) {
         }),
         _productDetail: eventDetail.productDetail
       };
+
+      // 处理定金
+      newCartItem.deposit = handleProductDeposit(newCartItem, eventDetail, num);
+      // 处理提交给接口的数据
       var originData = handleCartItemOrigin(newCartItem, eventDetail);
       newCartItem._originData = originData;
       if (_holderItem !== null && _holderItem !== void 0 && _holderItem._originData) {

package/es/components/Sales/Cart/utils.d.ts

@@ -1,3 +1,4 @@
+import Decimal from 'decimal.js';
 import { ICalculatePriceParams } from './types';
 export declare const handleProductInfo: (eventDetail: any, num: number) => {
     totalPrice: number;
@@ -21,3 +22,42 @@ export declare const getOriginTotalPrice: (params: ICalculatePriceParams) => num
 export declare const handleCartItemOrigin: (cartItem: any, eventDetail: any) => any;
 export declare const formatBundleToOrigin: (bundle: any) => any;
 export declare const formatOptionsToOrigin: (options: any) => any;
+export declare const handleProductDeposit: (cartItem: any, eventDetail: any, num: number) => {
+    total: number;
+    protocols: any;
+} | null;
+/**
+ * 获取商品定金
+ * @description 定金基于商品售价来算，最终乘商品数量
+ * 1、如果套餐主商品有定金规则，则定金为：（套餐商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * 2、如果套餐主商品没有定金规则，子商品有定金规则，则定金为：（套餐子商品售价 * 套餐子商品定金百分比 + 套餐子商品定金固定金额）* 商品数量，最终将所有子商品定金相加
+ * 3、普通商品/单规格商品/组合规则商品，定金规则：（商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * @param params 参数
+ * @returns 商品定金
+ */
+export declare const getProductDeposit: (params: {
+    cartItem: any;
+    product: any;
+    bundle?: any;
+    options?: any;
+    num?: number;
+}) => {
+    total: number;
+    protocols: any;
+} | null;
+/**
+ * 计算商品定金
+ * @param params 参数
+ * @returns 商品定金
+ */
+export declare const calculateProductDeposit: (params: {
+    depositData: {
+        deposit_fixed?: string;
+        deposit_percentage?: string;
+    };
+    total: string | number;
+    num: number;
+}) => {
+    result: boolean;
+    depositTotal: Decimal;
+};

package/es/components/Sales/Cart/utils.js

@@ -1,3 +1,10 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import Decimal from 'decimal.js';
 export var handleProductInfo = function handleProductInfo(eventDetail, num) {
   var productDetail = eventDetail.productDetail,
     bookingOptionItem = eventDetail.bookingOptionItem;
@@ -158,4 +165,168 @@ export var formatOptionsToOrigin = function formatOptionsToOrigin(options) {
       option_group_id: d.option_group_id
     };
   });
+};
+export var handleProductDeposit = function handleProductDeposit(cartItem, eventDetail, num) {
+  var _origin$custom_deposi;
+  var productDetail = eventDetail.productDetail;
+  if (!productDetail) {
+    return null;
+  }
+  var _ref = productDetail || {},
+    origin = _ref.origin,
+    bundle = _ref.bundle,
+    options = _ref.options,
+    product_variant_id = _ref.product_variant_id;
+  var deposit = null;
+  var product = origin;
+  if (product_variant_id) {
+    product.product_variant_id = product_variant_id;
+  }
+  if ((origin === null || origin === void 0 || (_origin$custom_deposi = origin.custom_deposit_data) === null || _origin$custom_deposi === void 0 ? void 0 : _origin$custom_deposi.has_deposit) == 1) {
+    deposit = getProductDeposit({
+      cartItem: cartItem,
+      product: product,
+      bundle: bundle,
+      options: options,
+      num: num
+    });
+  }
+  return deposit;
+};
+
+/**
+ * 获取商品定金
+ * @description 定金基于商品售价来算，最终乘商品数量
+ * 1、如果套餐主商品有定金规则，则定金为：（套餐商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * 2、如果套餐主商品没有定金规则，子商品有定金规则，则定金为：（套餐子商品售价 * 套餐子商品定金百分比 + 套餐子商品定金固定金额）* 商品数量，最终将所有子商品定金相加
+ * 3、普通商品/单规格商品/组合规则商品，定金规则：（商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * @param params 参数
+ * @returns 商品定金
+ */
+export var getProductDeposit = function getProductDeposit(params) {
+  var _product$custom_depos;
+  var cartItem = params.cartItem,
+    product = params.product,
+    bundle = params.bundle,
+    options = params.options;
+  var num = (params === null || params === void 0 ? void 0 : params.num) || 1;
+
+  // 判定商品是否有定金规则
+  if ((product === null || product === void 0 || (_product$custom_depos = product.custom_deposit_data) === null || _product$custom_depos === void 0 ? void 0 : _product$custom_depos.has_deposit) == 1) {
+    var total = new Decimal(0);
+    var _ref2 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
+      deposit_fixed = _ref2.deposit_fixed,
+      deposit_percentage = _ref2.deposit_percentage,
+      deposit_policy_data = _ref2.deposit_policy_data,
+      self_deposit_policy_ids = _ref2.self_deposit_policy_ids;
+    // 所有协议数据
+    var allProtocols = deposit_policy_data || [];
+    // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
+    var productHasDeposit = false;
+    // 关联的定金协议id
+    var protocolIds = [];
+
+    // 判断主商品是否有定金规则
+    if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
+      var _calculateProductDepo = calculateProductDeposit({
+          depositData: product === null || product === void 0 ? void 0 : product.custom_deposit_data,
+          total: (cartItem === null || cartItem === void 0 ? void 0 : cartItem.total) || 0,
+          num: num
+        }),
+        depositTotal = _calculateProductDepo.depositTotal,
+        result = _calculateProductDepo.result;
+      if (result) {
+        total = depositTotal;
+        protocolIds.push.apply(protocolIds, _toConsumableArray(self_deposit_policy_ids || []));
+        productHasDeposit = true;
+      }
+    } else {
+      // 组合规格商品
+      if (product !== null && product !== void 0 && product.product_variant_id) {
+        var _product$variant;
+        var variantProduct = product === null || product === void 0 || (_product$variant = product.variant) === null || _product$variant === void 0 ? void 0 : _product$variant.find(function (item) {
+          return (item === null || item === void 0 ? void 0 : item.id) === (product === null || product === void 0 ? void 0 : product.product_variant_id);
+        });
+        if (variantProduct) {
+          var depositData = variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.custom_deposit_data;
+          var _calculateProductDepo2 = calculateProductDeposit({
+              depositData: depositData,
+              total: (cartItem === null || cartItem === void 0 ? void 0 : cartItem.total) || 0,
+              num: num
+            }),
+            _depositTotal = _calculateProductDepo2.depositTotal,
+            _result = _calculateProductDepo2.result;
+          if (_result) {
+            total = _depositTotal;
+            protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
+            productHasDeposit = true;
+          }
+        }
+      }
+      if (bundle !== null && bundle !== void 0 && bundle.length) {
+        total = bundle.reduce(function (accumulator, currBundleProduct) {
+          var depositData = currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.custom_deposit_data;
+          var _calculateProductDepo3 = calculateProductDeposit({
+              depositData: depositData,
+              total: currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.price,
+              num: (currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.num) || 1
+            }),
+            depositTotal = _calculateProductDepo3.depositTotal,
+            result = _calculateProductDepo3.result;
+          if (result) {
+            protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
+            productHasDeposit = true;
+            return accumulator.plus(depositTotal);
+          }
+          return accumulator;
+        }, new Decimal(0));
+      }
+    }
+    if (productHasDeposit) {
+      var ids = new Set(protocolIds);
+      var protocols = allProtocols.filter(function (item) {
+        return ids.has(item.id);
+      });
+      return {
+        total: total.toNumber(),
+        protocols: protocols
+      };
+    }
+    return null;
+  }
+  return null;
+};
+
+/**
+ * 计算商品定金
+ * @param params 参数
+ * @returns 商品定金
+ */
+export var calculateProductDeposit = function calculateProductDeposit(params) {
+  var depositData = params.depositData,
+    total = params.total,
+    num = params.num;
+  if (!depositData) {
+    return {
+      result: false,
+      depositTotal: new Decimal(0)
+    };
+  }
+  var _ref3 = depositData || {},
+    deposit_fixed = _ref3.deposit_fixed,
+    deposit_percentage = _ref3.deposit_percentage;
+  if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
+    var depositFixed = new Decimal(deposit_fixed || 0);
+    var depositPercent = new Decimal(deposit_percentage || 0);
+    var productTotalPrice = new Decimal(total || 0);
+    var deposit = depositFixed.plus(depositPercent.times(productTotalPrice));
+    return {
+      depositTotal: deposit.times(num),
+      result: true
+    };
+  }
+  return {
+    result: false,
+    depositTotal: new Decimal(0)
+  };
 };

package/es/components/Sales/Checkout/index.d.ts

@@ -5,6 +5,9 @@ interface PayProps {
     order_id: string;
     amount: number;
     sale_channel?: string;
+    is_deposit?: number;
+    deposit_amount?: number;
+    total_amount?: number;
 }
 interface CheckoutContextType {
     onCheckBeforeBooking: (data: any) => Promise<{
@@ -15,6 +18,7 @@ interface CheckoutContextType {
     onPay: (payProps: PayProps) => void;
     createBooking: any;
     checkBeforeBooking: any;
+    freePay: any;
 }
 interface CheckoutProviderProps {
     children: React.ReactNode;

package/es/components/Sales/Checkout/index.js

@@ -1,4 +1,9 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -6,8 +11,9 @@ import React, { createContext, useRef } from 'react';
 import { useSales } from "../../../businessModel/SalesModel";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { useRequest } from 'ahooks';
-import { checkBeforeBookingApi, createBookingApi } from "./serve";
+import { checkBeforeBookingApi, createBookingApi, freePayApi } from "./serve";
 import { useCart } from "../Cart";
+import { Toast } from "../../appointmentBooking/utils";
 
 // 定义上下文接口
 
@@ -27,6 +33,7 @@ export var CheckoutProvider = function CheckoutProvider(_ref) {
     updateDisabledCartItem = _useCart.updateDisabledCartItem;
   var checkoutCallback = useRef(null);
   var checkRef = useRef(null);
+  var payRef = useRef(null);
   var checkBeforeBooking = useRequest(checkBeforeBookingApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
@@ -61,6 +68,17 @@ export var CheckoutProvider = function CheckoutProvider(_ref) {
       });
     }
   });
+  var freePay = useRequest(freePayApi, {
+    manual: true,
+    onSuccess: function onSuccess(res) {
+      if (res !== null && res !== void 0 && res.status) {
+        var _payRef$current, _payRef$current2;
+        goPaymentFinish((_payRef$current = payRef.current) === null || _payRef$current === void 0 ? void 0 : _payRef$current.order_id, (_payRef$current2 = payRef.current) === null || _payRef$current2 === void 0 ? void 0 : _payRef$current2.total_amount);
+      } else {
+        Toast(res === null || res === void 0 ? void 0 : res.message);
+      }
+    }
+  });
 
   /**
    * @title: 下单前校验
@@ -106,6 +124,11 @@ export var CheckoutProvider = function CheckoutProvider(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  var goPaymentFinish = function goPaymentFinish(order_id, amount) {
+    var _utils$history;
+    var url = "/payment-finish/success?order_id=".concat(order_id, "&amount=").concat(Number(amount));
+    utils === null || utils === void 0 || (_utils$history = utils.history) === null || _utils$history === void 0 || _utils$history.replace(url);
+  };
 
   /**
    * @title: 支付
@@ -115,20 +138,41 @@ export var CheckoutProvider = function CheckoutProvider(_ref) {
    * @Author: zhiwei.Wang
    */
   var onPay = function onPay(payProps) {
-    utils.action({
-      type: 'pisell1.payment',
-      data: payProps,
-      callback: function callback(e) {
-        checkoutCallback.current && checkoutCallback.current(e);
+    payRef.current = payProps;
+    var is_deposit = payProps.is_deposit,
+      deposit_amount = payProps.deposit_amount,
+      total_amount = payProps.total_amount;
+
+    // 如果有定金，则支付定金金额，否则订单金额
+    var _total = is_deposit ? deposit_amount || 0 : total_amount || 0;
+    if (_total > 0) {
+      utils.action({
+        type: 'pisell1.payment',
+        data: _objectSpread(_objectSpread({}, payProps), {}, {
+          total_amount: _total
+        }),
+        callback: function callback(e) {
+          checkoutCallback.current && checkoutCallback.current(e);
+        }
+      });
+    } else {
+      // 定金为0则直接跳转结果页面
+      if (is_deposit) {
+        goPaymentFinish(payProps.order_id, _total);
+        return;
       }
-    });
+
+      // 金额为0则需要调用免费支付接口，接口调用成功后跳转结果页面
+      freePay.runAsync(payProps.order_id);
+    }
   };
   var contextValue = {
     onCheckBeforeBooking: onCheckBeforeBooking,
     onCheckout: onCheckout,
     onPay: onPay,
     createBooking: createBooking,
-    checkBeforeBooking: checkBeforeBooking
+    checkBeforeBooking: checkBeforeBooking,
+    freePay: freePay
   };
   return /*#__PURE__*/React.createElement(CheckoutContext.Provider, {
     value: contextValue

package/es/components/Sales/Checkout/serve.d.ts

@@ -1,2 +1,15 @@
+/**
+ * @title: 下单前置校验接口
+ * @param {any} data
+ */
 export declare const checkBeforeBookingApi: (data: any) => Promise<any>;
+/**
+ * @title: 创建订单
+ * @param {any} data
+ */
 export declare const createBookingApi: (data: any) => Promise<any>;
+/**
+ * @title: 免费支付
+ * @param {string} orderId
+ */
+export declare const freePayApi: (orderId: string) => Promise<any>;

package/es/components/Sales/Checkout/serve.js

@@ -1,11 +1,25 @@
 import { request } from "../../../utils";
 
-// 下单前置校验接口
+/**
+ * @title: 下单前置校验接口
+ * @param {any} data
+ */
 export var checkBeforeBookingApi = function checkBeforeBookingApi(data) {
   return request.getRequest().post('/h5/eventbookingv2/order/check-config', data);
 };
 
-// 创建
+/**
+ * @title: 创建订单
+ * @param {any} data
+ */
 export var createBookingApi = function createBookingApi(data) {
   return request.getRequest().post('/h5/eventbookingv2/order', data);
+};
+
+/**
+ * @title: 免费支付
+ * @param {string} orderId
+ */
+export var freePayApi = function freePayApi(orderId) {
+  return request.getRequest().post("/h5/pay/order/free-pay/".concat(orderId), {});
 };

package/es/components/Sales/Checkout/utils.d.ts

@@ -24,7 +24,12 @@ export declare const formatProductBundle: (bundle: any) => any;
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export declare const formatValues: (state: any, excludeDisabled?: boolean, otherValue?: Record<string, any>) => any;
+export declare const formatValues: (params: {
+    state: any;
+    platform: 'h5' | 'pc';
+    excludeDisabled?: boolean;
+    extra?: Record<string, any>;
+}) => any;
 /**
  * @title: 获取拉开表单弹窗参数
  * @param state

package/es/components/Sales/Checkout/utils.js

@@ -84,16 +84,21 @@ var formatBookings = function formatBookings(list) {
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export var formatValues = function formatValues(state, excludeDisabled, otherValue) {
+export var formatValues = function formatValues(params) {
+  var state = params.state,
+    platform = params.platform,
+    excludeDisabled = params.excludeDisabled,
+    extra = params.extra;
   var values = _objectSpread({
     type: 'event_booking_v2',
-    platform: 'H5',
+    platform: platform === 'pc' ? 'PC' : 'H5',
     sales_channel: 'my_pisel',
     order_sales_channel: 'online_store',
     bookings: [],
     shop_note: '',
     schedule_date: ''
-  }, otherValue || {});
+  }, extra || {});
+  console.log('values', values);
   var data = [];
   if (excludeDisabled) {
     var _state$cartData$cartI, _state$cartData$cartI2;
@@ -104,6 +109,12 @@ export var formatValues = function formatValues(state, excludeDisabled, otherVal
     data = state.cartData.cartItems;
   }
 
+  // 定金
+  var is_deposit = data.find(function (v) {
+    return v.deposit;
+  }) ? 1 : 0;
+  values.is_deposit = is_deposit;
+
   // 服务
   values.bookings = formatBookings(data);
   return values;
@@ -121,6 +132,6 @@ export var getFormParams = function getFormParams(state) {
   });
   return {
     product_id: product_id,
-    appointment_type: "event_booking_v2"
+    appointment_type: 'event_booking_v2'
   };
 };

package/es/components/Sales/Customer/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 interface CustomerData {
 }
 interface CustomerContextType {
+    appContext: any;
     appUtils: any;
     isLogin: () => boolean;
     openLoginModal: (params: any) => void;

package/es/components/Sales/Customer/index.js

@@ -34,6 +34,7 @@ export var CustomerProvider = function CustomerProvider(_ref) {
     return userInfo !== null && userInfo !== void 0 && userInfo.id ? userInfo : localUserInfo;
   };
   var contextValue = {
+    appContext: context,
     appUtils: utils,
     isLogin: isLogin,
     openLoginModal: openLoginModal,

package/es/components/Sales/Resource/index.js

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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, { createContext } from 'react';
 import { useSales } from "../../../businessModel/SalesModel";
-import { getResourceListApi } from "./serve";
+import { getSpecialResourceListApi } from "./serve";
 import { useRequest } from 'ahooks';
 import { useCart } from "../Cart";
 import { getIamgeFromMedia } from "../utils";
@@ -73,7 +73,7 @@ export var ResourceProvider = function ResourceProvider(_ref) {
     });
     return renderData;
   };
-  var getResourceList = useRequest(getResourceListApi, {
+  var getResourceList = useRequest(getSpecialResourceListApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
       var formatData = formatResourceList(res);

package/es/components/Sales/Resource/serve.d.ts

@@ -3,3 +3,10 @@ export declare const getResourceListApi: (params: {
     shop_id: string;
     form_data_status: string;
 }) => Promise<any>;
+/**
+ * @title: 获取特殊资源列表
+ * @Author: xiangfeng.xue
+ */
+export declare const getSpecialResourceListApi: (params: {
+    event_item_ids?: string | number[];
+}) => Promise<any>;