@pisell/private-materials 6.6.11 → 6.6.12

package/es/components/pay/toC/index.js

@@ -23,13 +23,14 @@ import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
 import PaymentList from "./PaymentList";
 import PaymentMethods from "./PaymentMethods";
-import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus } from "./serve";
+import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus, getOrderBasicDetail } from "./serve";
 import { Provider, Context } from "./model";
 import useEngineContext from "../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../hooks/usePaymentLogger";
 import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
+import { getMachineCodeList } from "./PaymentMethods/WalletPass/serve";
 import { getIsWalletPassAndTripartitePayment } from "./utils";
 import { saleChannelMap } from "./status";
 import "./index.less";
@@ -263,7 +264,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, withCustomerIdList;
+      var _order$_order, _state$payGroup2, _paymentListRef$curre, _yield$Promise$all, _yield$Promise$all2, data, allList, orderBasicDetail, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, products, _res, recommended, transformList, noApplicableVoucher, recommendedAmount, withCustomerIdList, _waitAmount2;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -276,14 +277,42 @@ var ToCPay = function ToCPay(props, ref) {
             });
             _context3.prev = 1;
             _context3.next = 4;
-            return getPaymentsAndWalletPass({
+            return Promise.all([getPaymentsAndWalletPass({
               order_id: order.order_id,
               total_amount: order.amount,
               sale_channel: order.sale_channel || 'online-store'
-            });
+            }), getMachineCodeList({
+              order_id: order.order_id,
+              available: 2,
+              prepare_payments: [],
+              filter_prepare_wallet_pass: 1,
+              sale_channel: ((_order$_order = order._order) === null || _order$_order === void 0 ? void 0 : _order$_order.sale_channel) || 'online-store',
+              other_exact_codes: []
+            }), getOrderBasicDetail(order.order_id)]);
           case 4:
-            data = _context3.sent;
-            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass; // 记录获取到的数据
+            _yield$Promise$all = _context3.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);
+            data = _yield$Promise$all2[0];
+            allList = _yield$Promise$all2[1];
+            orderBasicDetail = _yield$Promise$all2[2];
+            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass;
+            products = (orderBasicDetail.detail || []).map(function (item) {
+              var _ref5;
+              return _objectSpread(_objectSpread({}, item), {}, {
+                is_price_include_tax: orderBasicDetail.is_price_include_tax,
+                product_bundle: (_ref5 = item.product_bundle || []) === null || _ref5 === void 0 ? void 0 : _ref5.map(function (bundle) {
+                  return _objectSpread(_objectSpread({}, bundle), {}, {
+                    is_price_include_tax: orderBasicDetail.is_price_include_tax
+                  });
+                })
+              });
+            });
+            _res = utils.walletPassEvaluator.getRecommendedVouchers({
+              orderTotalAmount: Math.min(orderBasicDetail.product_unpaid_total_pay_amount, order.amount),
+              products: products,
+              vouchers: allList || []
+            });
+            recommended = _res.recommended, transformList = _res.transformList, noApplicableVoucher = _res.noApplicableVoucher, recommendedAmount = _res.recommendedAmount; // 记录获取到的数据
             paymentLogger.addLog({
               key: '支付数据获取',
               value: ''
@@ -292,30 +321,40 @@ var ToCPay = function ToCPay(props, ref) {
               return _objectSpread(_objectSpread({}, item), {}, {
                 customer_id: customer_id || item.customer_id
               });
-            }); // 设置交易组
+            });
+            _waitAmount2 = new Decimal((order === null || order === void 0 ? void 0 : order.amount) || 0).minus(new Decimal(recommendedAmount)).toNumber(); // 设置交易组
             dispatch({
               type: 'setPayGroup',
               payload: {
                 // ...state.payGroup,
                 order_id: order === null || order === void 0 ? void 0 : order.order_id,
                 // total_amount: order?.amount,
+                orderDetail: orderBasicDetail,
                 // 原订单信息
                 _order: order,
                 payment_group_id: order === null || order === void 0 ? void 0 : order.payment_group_id,
                 // 支付方式没有walletPass时walletPass设置null
                 walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.walletPass), walletPass), {}, {
-                  amount: wallet_pass_amount,
-                  cards: withCustomerIdList
+                  // 推荐钱包
+                  cards: recommended,
+                  // 推荐金额
+                  amount: recommendedAmount,
+                  // 不可用钱包
+                  noApplicableVoucher: noApplicableVoucher,
+                  // 转换列表
+                  transformList: transformList
+                  // amount: wallet_pass_amount,
+                  // cards: wallet_pass_recommend_list,
                 }) : null,
                 total_amount: order === null || order === void 0 ? void 0 : order.amount,
-                wait_amount: remain_amount
+                wait_amount: Math.max(0, _waitAmount2)
               }
             });
 
             // 初始化支付列表
-            _context3.next = 11;
+            _context3.next = 19;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list);
-          case 11:
+          case 19:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
@@ -326,10 +365,10 @@ var ToCPay = function ToCPay(props, ref) {
               key: '获取支付列表成功',
               value: ''
             });
-            _context3.next = 21;
+            _context3.next = 29;
             break;
-          case 15:
-            _context3.prev = 15;
+          case 23:
+            _context3.prev = 23;
             _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
 
@@ -352,11 +391,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 21:
+          case 29:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 15]]);
+      }, _callee3, null, [[1, 23]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);
@@ -373,7 +412,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:46
    */
   var handlePaymentByType = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
       var _state$payGroup3;
       var paymentType, currentPayGroup, _paymentMethodsRef$cu;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -433,7 +472,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee4, null, [[3, 12]]);
     }));
     return function handlePaymentByType(_x4, _x5) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -445,7 +484,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:41
    */
   var paymentInit = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
       var _state$payGroup4;
       var orderId, _state$payGroup5, data;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -519,7 +558,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee5, null, [[3, 12]]);
     }));
     return function paymentInit(_x6) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -578,7 +617,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-30 10:23:48
    */
   var getIsShowDetectIncognitoConfirm = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
       var _yield$detectIncognit, isPrivate;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -596,7 +635,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee6);
     }));
     return function getIsShowDetectIncognitoConfirm(_x7) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -608,7 +647,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:25
    */
   var onSubmit = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
       var _state$payGroup10, _state$payGroup11, _state$payGroup12;
       var newPayGroup, _state$payGroup13, _newPayGroup, _newPayGroup2, _state$payGroup14, result, _state$payGroup15;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -686,7 +725,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee7, null, [[2, 20]]);
     }));
     return function onSubmit(_x8) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 
@@ -743,7 +782,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-09 14:25
    */
   var payCallback = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
       var _res$data, _state$payGroup20, _props$callback;
       var orderId, _res$data2;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -783,7 +822,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee8);
     }));
     return function payCallback(_x9) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
 

package/es/components/pay/toC/model.d.ts

@@ -29,6 +29,7 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
     front_order_uuid?: string;
+    orderDetail: any;
 }
 export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
     state: FormState;

package/es/components/pay/toC/serve.d.ts

@@ -60,3 +60,21 @@ export declare const getWalletNameAndPopupStatus: (values: {
  * @description: 获取支付结果
  */
 export declare const getPaymentResult: (values: any) => Promise<any>;
+declare type OrderBasicDetail = {
+    id: number;
+    status: string;
+    payment_status: string;
+    order_time: string;
+    detail: any[];
+    product_unpaid_total_pay_amount: number;
+    product_paid_total_pay_amount: number;
+    is_price_include_tax: 1 | 0;
+};
+/**
+ * @title: 查询订单基础信息和订单商品信息
+ * @description: 查询订单基础信息和订单商品信息
+ * @param {string} order_id
+ * @return {*}
+ */
+export declare const getOrderBasicDetail: (order_id: string) => Promise<OrderBasicDetail>;
+export {};

package/es/components/pay/toC/serve.js

@@ -185,4 +185,32 @@ export var getWalletNameAndPopupStatus = /*#__PURE__*/function () {
  */
 export var getPaymentResult = function getPaymentResult(values) {
   return request.getRequest().get("/h5/pay/order/payment/result", values);
-};
+};
+/**
+ * @title: 查询订单基础信息和订单商品信息
+ * @description: 查询订单基础信息和订单商品信息
+ * @param {string} order_id
+ * @return {*}
+ */
+export var getOrderBasicDetail = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_id) {
+    var _yield$request$getReq5, data;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
+          return request.getRequest().get("/h5/order/order/".concat(order_id, "/basic-detail"), {});
+        case 2:
+          _yield$request$getReq5 = _context5.sent;
+          data = _yield$request$getReq5.data;
+          return _context5.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return function getOrderBasicDetail(_x5) {
+    return _ref5.apply(this, arguments);
+  };
+}();

package/es/components/pay/toC/utils.d.ts

@@ -22,7 +22,7 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
     order_id: string;
     payment_group_id: number;
     payments: {
-        amount: string;
+        amount: string | number;
         wallet_pass_use_value: any;
         voucher_id: any;
         tag: any;
@@ -48,7 +48,7 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
  */
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
-export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
+export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string | number;
 export declare const clientPayment: (params: {
     order_id: number;
     type: "aliPay" | "wxPay" | 'google_pay';

package/es/components/pay/toC/utils.js

@@ -6,6 +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 { Decimal } from 'decimal.js';
 import { isTripartitePayment } from "./status";
+import { isNumber } from "@pisell/utils";
 /**
  * 计算walletPass列表数据的总金额
  * @param list
@@ -95,6 +96,9 @@ export var formatFranchiseeRoute = function formatFranchiseeRoute(url, history)
 
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
+  if (isNumber(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 export var clientPayment = function clientPayment(params) {

package/es/components/systemSettings/registry/components/SectionList.js

@@ -3,6 +3,8 @@ import { Card, Empty, Spin } from 'antd';
 import { ShoppingCartOutlined, CreditCardOutlined, SafetyCertificateOutlined, SettingOutlined } from '@ant-design/icons';
 import { ShoppingCart01 } from '@pisell/icon';
 import { locales } from '@pisell/utils';
+import useEngineContext from "../../../../hooks/useEngineContext";
+
 // 获取多语言文本的工具函数
 var getLocalizedText = function getLocalizedText(text) {
   var locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'zh-CN';
@@ -38,6 +40,7 @@ var renderSectionIcon = function renderSectionIcon(iconName, code) {
   return sectionIcons.default;
 };
 var SectionList = function SectionList(_ref) {
+  var _context$engine;
   var sections = _ref.sections,
     selectedSectionId = _ref.selectedSectionId,
     onSectionSelect = _ref.onSectionSelect,
@@ -48,9 +51,10 @@ var SectionList = function SectionList(_ref) {
     onLoadMore = _ref.onLoadMore;
   var scrollContainerRef = useRef(null);
   var loadingRef = useRef(null);
+  var context = useEngineContext();
 
   // 获取当前语言
-  var currentLocale = localStorage.getItem('umi_locale') || 'zh-CN';
+  var currentLocale = (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || localStorage.getItem('umi_locale') || 'en';
 
   // 滚动加载更多的处理函数
   var handleScroll = useCallback(function () {

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -51,7 +51,7 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$client2;
+  var _context$appHelper, _context$appHelper2, _context$appHelper2$g, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _state$bookingConfig2, _state$client2;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
@@ -59,6 +59,8 @@ var AddSerivce = function AddSerivce(props) {
     renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode,
     productDisplayConfig = props.productDisplayConfig;
   var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    getData = _context$appHelper$ut.getData;
   var notAvailableRef = useRef(null);
   request.setRequest(context.appHelper.utils.request);
   var isActive = useIsActive();
@@ -71,7 +73,7 @@ var AddSerivce = function AddSerivce(props) {
     }),
     createBookingData = _useService.createBookingData,
     createBooking = _useService.createBooking;
-  var isBooking4 = isBooking4Shop(((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'shop_id')) || ((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id), state === null || state === void 0 ? void 0 : state.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
+  var isBooking4 = isBooking4Shop(((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getData) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2, 'shop_id')) || ((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id), state === null || state === void 0 ? void 0 : state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils);
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     currentProduct = _useState2[0],
@@ -219,7 +221,7 @@ var AddSerivce = function AddSerivce(props) {
   var processAddService = useMemoizedFn( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item, _detail, e, notShowToast, startDate, endDate) {
       var _state$client3, _state$bookingConfig3;
-      var other, cacheItem, _total, _isEdit, _stateRef$current$ser, isMultiDay, getMultiDayCacheItem, res, _state$bookingConfig4, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData, _window$openBookingEd, _window;
+      var other, cacheItem, _total, _isEdit, _stateRef$current$ser, isMultiDay, getMultiDayCacheItem, res, _state$bookingConfig4, _addService2, _list, quantity, _context$appHelper$ut5, _context$appHelper$ut6, val, sendData, _window$openBookingEd, _window;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -229,6 +231,7 @@ var AddSerivce = function AddSerivce(props) {
               product_id: item.id,
               _id: getUniqueId(),
               _key: e.key,
+              is_price_include_tax: getData('is_price_include_tax'),
               _extend: {
                 start_date: startDate,
                 quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
@@ -337,7 +340,7 @@ var AddSerivce = function AddSerivce(props) {
               }
             }));
             try {
-              if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
+              if (((_context$appHelper$ut5 = context.appHelper.utils.store) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut5.getState) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.call(_context$appHelper$ut5)) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.global) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.globalConfig) === null || _context$appHelper$ut6 === void 0 ? void 0 : _context$appHelper$ut6.id) === 2155) {
                 val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
                   return {
                     product_id: s === null || s === void 0 ? void 0 : s.product_id,

package/es/plus/walletPassGallery/serve.js

@@ -220,6 +220,8 @@ export var getDetailApi = /*#__PURE__*/function () {
             order_behavior_count_customer: 1,
             // 客户订单行为次数
             order_behavior_count_customer_id: params.apiPrefix === '/shop' ? params.order_behavior_count_customer_id : undefined
+          }, {
+            isOriginHost: true
           });
         case 2:
           _yield$request$getReq6 = _context6.sent;

package/es/pro/Login2.0/AuthModal.js

@@ -84,7 +84,7 @@ var AuthModal = function AuthModal() {
 
   // 转换配置为 Login2 所需的格式
   var login2Config = useMemo(function () {
-    var _config$auth, _authMethods$email, _authMethods$phone, _authMethods$google, _authMethods$facebook, _authMethods$apple, _authMethods$guest, _config$page, _config$page2, _config$page3, _config$page4, _config$page5, _config$page6, _config$page7;
+    var _config$auth, _authMethods$email, _authMethods$phone, _authMethods$google, _authMethods$facebook, _authMethods$apple, _authMethods$guest, _config$page, _config$page2, _config$page3, _config$page4, _config$page5, _config$page6, _config$logoSize, _config$logoSize2, _config$page7;
     if (!localesInitialized) {
       return {
         loginMethods: [],
@@ -302,7 +302,11 @@ var AuthModal = function AuthModal() {
           show: config !== null && config !== void 0 && config.logo ? true : false,
           url: config === null || config === void 0 ? void 0 : config.logo,
           // 直接从 config.logo 读取
-          position: 'center'
+          position: 'center',
+          size: {
+            width: (config === null || config === void 0 || (_config$logoSize = config.logoSize) === null || _config$logoSize === void 0 ? void 0 : _config$logoSize.width) || 48,
+            height: (config === null || config === void 0 || (_config$logoSize2 = config.logoSize) === null || _config$logoSize2 === void 0 ? void 0 : _config$logoSize2.height) || 48
+          }
         } : undefined,
         themeColor: (config === null || config === void 0 || (_config$page7 = config.page) === null || _config$page7 === void 0 || (_config$page7 = _config$page7.login) === null || _config$page7 === void 0 || (_config$page7 = _config$page7.ui) === null || _config$page7 === void 0 ? void 0 : _config$page7.themeColor) || '#7F56D9',
         formLabels: {
@@ -325,7 +329,7 @@ var AuthModal = function AuthModal() {
 
   // 转换配置为 Register2 所需的格式
   var register2Config = useMemo(function () {
-    var _config$auth2, _authMethods$email2, _authMethods$phone2, _authMethods$google2, _authMethods$facebook2, _authMethods$apple2, _config$page8, _config$page9, _config$page10, _config$auth3;
+    var _config$auth2, _authMethods$email2, _authMethods$phone2, _authMethods$google2, _authMethods$facebook2, _authMethods$apple2, _config$page8, _config$page9, _config$logoSize3, _config$logoSize4, _config$page10, _config$auth3;
     if (!localesInitialized) {
       return {
         registrationMethods: [],
@@ -471,7 +475,11 @@ var AuthModal = function AuthModal() {
           show: config.logo ? true : false,
           url: config.logo,
           // 直接从 config.logo 读取
-          position: 'center'
+          position: 'center',
+          size: {
+            width: (config === null || config === void 0 || (_config$logoSize3 = config.logoSize) === null || _config$logoSize3 === void 0 ? void 0 : _config$logoSize3.width) || 48,
+            height: (config === null || config === void 0 || (_config$logoSize4 = config.logoSize) === null || _config$logoSize4 === void 0 ? void 0 : _config$logoSize4.height) || 48
+          }
         } : undefined,
         themeColor: ((_config$page10 = config.page) === null || _config$page10 === void 0 || (_config$page10 = _config$page10.register) === null || _config$page10 === void 0 || (_config$page10 = _config$page10.ui) === null || _config$page10 === void 0 ? void 0 : _config$page10.themeColor) || '#7F56D9',
         passwordRules: transformPasswordRules((_config$auth3 = config.auth) === null || _config$auth3 === void 0 ? void 0 : _config$auth3.password),

package/es/pro/Login2.0/index.less

@@ -326,21 +326,21 @@
     .login2-submit-button {
       height: 44px;
       border-radius: 8px;
-      border: 1px solid var(--theme-color, #7f56d9);
-      background: var(--theme-color, #7f56d9);
+      border: 1px solid var(--custom-button-bg-color, var(--theme-color, #7f56d9));
+      background: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
       box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
       font-size: 16px;
       font-weight: 600;
-      color: #ffffff;
+      color: var(--custom-button-text-color, #ffffff);
 
       &:hover:not(:disabled) {
-        background: #6941c6;
-        border-color: #6941c6;
+        background: var(--custom-button-bg-color, #6941c6);
+        border-color: var(--custom-button-bg-color, #6941c6);
       }
 
       &:focus {
-        background: var(--theme-color, #7f56d9);
-        border-color: var(--theme-color, #7f56d9);
+        background: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
+        border-color: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
         box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05),
           0px 0px 0px 4px rgba(127, 86, 217, 0.1);
       }

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

@@ -43,6 +43,8 @@ var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_index = require("./index.less");
+var import_context = require("../../context");
+var import_ahooks = require("ahooks");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -66,11 +68,17 @@ var VoucherCard = (props) => {
   const productRef = (0, import_react.useRef)(products);
   const { openLoginModal } = (0, import_hooks.useAppointmentBookingLogin)();
   const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
+  const { summary } = (0, import_context.useAppointmentBookingContext)();
+  const { originTotal, total } = summary;
   const cart = (_b = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _b.cart;
   const isUserLoggedIn = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return !!((_b2 = (_a2 = utils == null ? void 0 : utils.token) == null ? void 0 : _a2.get) == null ? void 0 : _b2.call(_a2)) || false;
   }, [store]);
+  (0, import_react.useEffect)(() => {
+    const shopDiscount2 = pisellos.getModule("shopDiscount");
+    shopDiscount2.setOriginTotalAmount(originTotal);
+  }, [originTotal]);
   const availableData = (0, import_react.useMemo)(() => {
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
@@ -106,7 +114,7 @@ var VoucherCard = (props) => {
     });
     (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.batchUpdateCart) == null ? void 0 : _a2.call(appointmentBooking, items);
   };
-  const onCartChange = () => {
+  const { run: onCartChange } = (0, import_ahooks.useDebounceFn)(() => {
     var _a2, _b2, _c;
     const products2 = cart == null ? void 0 : cart.getItems();
     (_c = shopDiscount == null ? void 0 : shopDiscount.setBookingSubject) == null ? void 0 : _c.call(
@@ -115,7 +123,7 @@ var VoucherCard = (props) => {
     );
     const val = shopDiscount.calcDiscount(products2);
     batchUpdateCart(val.productList);
-  };
+  }, { wait: 200 });
   const stringifiedHolders = (0, import_react.useMemo)(() => {
     let _ret;
     try {

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

@@ -68,14 +68,15 @@ var formatProducts = (values) => {
       discountway: "num",
       discount_type: "discount",
       bundle_edit: (_c = item._extend) == null ? void 0 : _c.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle, item.is_price_include_tax),
       "product_option_item": (0, import_utils.formatProductOption)((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
       "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
       "source_product_price": (0, import_utils.getSourceProductPrice)(item),
       "main_product_selling_price": (0, import_utils.getMainProductSellingPrice)(item) ?? (0, import_utils.formatProductPrice)(item),
       "calculated_original_price": (0, import_utils.formatOriginalPrice)(item),
       "calculated_selling_price": (0, import_utils.formatSellingPrice)(item),
-      "tax_fee": item._extend.tax_fee
+      "tax_fee": item._extend.tax_fee,
+      is_price_include_tax: item.is_price_include_tax
     };
   });
   return arr;

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

@@ -402,7 +402,7 @@ var getMainProductTotal = (item) => {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const discountAmount = getDiscountAmount(bundleItem.discount_list);
       const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
-      const bundleItemTotal = bundleItemPrice.minus(discountAmount);
+      const bundleItemTotal = bundleItemPrice;
       total = total.add(bundleItemTotal);
     }
   }

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

@@ -270,6 +270,15 @@ var Footer = (props) => {
       ...getDataFromHost()
     });
   }, [state, isEdit]);
+  (0, import_react.useEffect)(() => {
+    window.dispatchEvent(
+      new CustomEvent("onOriginExpectAmountWithoutDiscountChange", {
+        detail: {
+          originExpectAmountWithoutDiscount: total == null ? void 0 : total.originExpectAmountWithoutDiscount
+        }
+      })
+    );
+  }, [total == null ? void 0 : total.originExpectAmountWithoutDiscount]);
   const orderTotalList = (0, import_react.useMemo)(() => {
     return [
       // 订单已付金额

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

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

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

@@ -96,7 +96,7 @@ var log = (data) => {
     ]
   });
 };
-var formatProductBundle = (bundle) => {
+var formatProductBundle = (bundle, is_price_include_tax) => {
   if (!bundle) {
     return;
   }
@@ -132,6 +132,7 @@ var formatProductBundle = (bundle) => {
       "option": option,
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
+      is_price_include_tax,
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
@@ -368,7 +369,7 @@ var formatProducts = (item, quantity) => {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+    "product_bundle": formatProductBundle((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle, item.is_price_include_tax),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
     "product_option_item": formatProductOption((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
     "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
@@ -378,7 +379,8 @@ var formatProducts = (item, quantity) => {
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
     "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data
+    "custom_deposit_data": item.custom_deposit_data,
+    is_price_include_tax: item.is_price_include_tax
   };
 };
 var formatAppointmentProductLists = (data) => {