@pisell/private-materials 3.0.150 → 3.0.151

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

@@ -16,6 +16,7 @@ import { locales } from '@pisell/utils';
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import "./index.less";
+import { formatFranchiseeRoute } from "../../utils";
 /**
  * @title: Apple 支付
  * @description:
@@ -75,7 +76,7 @@ var ApplePay = function ApplePay(props, ref) {
 
               // 提取域名
               shop_domain = linkElement.hostname;
-              _href = "".concat(config.pay, "/apple-pay?order_id=").concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id);
+              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history));
               window.location.href = _href;
             } catch (err) {
               setOpen(false);

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

@@ -5,6 +5,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useImperativeHandle, forwardRef, useContext } from 'react';
 import { Context } from "../../model";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import { formatFranchiseeRoute } from "../../utils";
 import "./index.less";
 /**
  * @title: 银行转账
@@ -31,7 +32,7 @@ var BankDeposit = function BankDeposit(props, ref) {
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _context$appHelper, _context$appHelper$co;
-      var payGroup, platform, _item;
+      var payGroup, platform, _item, _href;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -52,9 +53,9 @@ var BankDeposit = function BankDeposit(props, ref) {
             });
             return _context.abrupt("return");
           case 6:
-            // h5打开银行转账页面
-            state.history.push("/pay/manual-transfer?id=".concat((payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id) || (payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id)));
-          case 7:
+            _href = "".concat(formatFranchiseeRoute("/pay/manual-transfer?id=".concat((payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id) || (payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id)), state.history)); // h5打开银行转账页面
+            state.history.push(_href);
+          case 8:
           case "end":
             return _context.stop();
         }

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

@@ -15,6 +15,7 @@ import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
 import { Context } from "../../model";
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import { formatFranchiseeRoute } from "../../utils";
 /**
  * @title: 谷歌支付
  * @description:
@@ -72,7 +73,7 @@ var GooglePay = function GooglePay(props, ref) {
 
               // 提取域名
               shop_domain = linkElement.hostname;
-              _href = "".concat(config.pay, "/google-pay?order_id=").concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id);
+              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/google-pay?order_id=".concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history));
               window.location.href = _href;
             } catch (err) {
               setOpen(false);

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

@@ -36,3 +36,14 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
  * @Date: 2024-08-30 10:06:17
  */
 export declare const getIsWalletPassAndTripartitePayment: (payGroup: PayGroup) => boolean | 0 | undefined;
+export declare const isFranchiseeShop: (path?: any, history?: any) => any;
+/**
+ * @title: 获取当前连锁加盟店铺shopid
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: chensheng.gu
+ * @Date: 2024-08-07 10:04
+ */
+export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
+export declare const formatFranchiseeRoute: (url: string, history?: any) => string;

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

@@ -58,4 +58,31 @@ export var formatWalletPassParams = function formatWalletPassParams(payGroup) {
 export var getIsWalletPassAndTripartitePayment = function getIsWalletPassAndTripartitePayment(payGroup) {
   var _payGroup$walletPass, _payGroup$walletPass$, _payGroup$otherPaymen;
   return (payGroup === null || payGroup === void 0 ? void 0 : (_payGroup$walletPass = payGroup.walletPass) === null || _payGroup$walletPass === void 0 ? void 0 : (_payGroup$walletPass$ = _payGroup$walletPass.cards) === null || _payGroup$walletPass$ === void 0 ? void 0 : _payGroup$walletPass$.length) && isTripartitePayment(payGroup === null || payGroup === void 0 ? void 0 : (_payGroup$otherPaymen = payGroup.otherPayment) === null || _payGroup$otherPaymen === void 0 ? void 0 : _payGroup$otherPaymen.service);
+};
+export var isFranchiseeShop = function isFranchiseeShop(path, history) {
+  var pathname = history.location.pathname;
+  var _pathname = path || pathname;
+  return _pathname && _pathname.includes('/franchisee');
+};
+
+/**
+ * @title: 获取当前连锁加盟店铺shopid
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: chensheng.gu
+ * @Date: 2024-08-07 10:04
+ */
+export var getFranchiseeShopId = function getFranchiseeShopId(path, history) {
+  var pathname = history.location.pathname;
+  var _pathname = path || pathname;
+  var match = _pathname.match(/\/shop_(\d+)\//);
+  var shopNumber = match ? match[1] : null;
+  return Number(shopNumber);
+};
+export var formatFranchiseeRoute = function formatFranchiseeRoute(url, history) {
+  if (isFranchiseeShop(null, history)) {
+    return "/franchisee/shop/shop_".concat(getFranchiseeShopId(null, history)).concat(url);
+  }
+  return url;
 };

package/lib/components/pay/toC/PaymentMethods/ApplePay/index.js

@@ -40,6 +40,7 @@ var import_utils = require("@pisell/utils");
 var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
+var import_utils2 = require("../../utils");
 var ApplePay = (props, ref) => {
   var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
@@ -63,7 +64,10 @@ var ApplePay = (props, ref) => {
       const linkElement = document.createElement("a");
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
-      const _href = `${config.pay}/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`;
+      const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
+        `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        state.history
+      )}`;
       window.location.href = _href;
     } catch (err) {
       setOpen(false);

package/lib/components/pay/toC/PaymentMethods/BankDeposit/index.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(BankDeposit_exports);
 var import_react = require("react");
 var import_model = require("../../model");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_utils = require("../../utils");
 var import_index = require("./index.less");
 var BankDeposit = (props, ref) => {
   const { state } = (0, import_react.useContext)(import_model.Context);
@@ -53,9 +54,11 @@ var BankDeposit = (props, ref) => {
       });
       return;
     }
-    state.history.push(
-      `/pay/manual-transfer?id=${(payGroup == null ? void 0 : payGroup.order_id) || (payGroup == null ? void 0 : payGroup.order_id)}`
-    );
+    const _href = `${(0, import_utils.formatFranchiseeRoute)(
+      `/pay/manual-transfer?id=${(payGroup == null ? void 0 : payGroup.order_id) || (payGroup == null ? void 0 : payGroup.order_id)}`,
+      state.history
+    )}`;
+    state.history.push(_href);
   };
   (0, import_react.useImperativeHandle)(
     ref,

package/lib/components/pay/toC/PaymentMethods/GooglePay/index.js

@@ -39,6 +39,7 @@ var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoadi
 var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var GooglePay = (props, ref) => {
   var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
@@ -62,7 +63,10 @@ var GooglePay = (props, ref) => {
       const linkElement = document.createElement("a");
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
-      const _href = `${config.pay}/google-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`;
+      const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
+        `/google-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        state.history
+      )}`;
       window.location.href = _href;
     } catch (err) {
       setOpen(false);

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

@@ -36,3 +36,14 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
  * @Date: 2024-08-30 10:06:17
  */
 export declare const getIsWalletPassAndTripartitePayment: (payGroup: PayGroup) => boolean | 0 | undefined;
+export declare const isFranchiseeShop: (path?: any, history?: any) => any;
+/**
+ * @title: 获取当前连锁加盟店铺shopid
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: chensheng.gu
+ * @Date: 2024-08-07 10:04
+ */
+export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
+export declare const formatFranchiseeRoute: (url: string, history?: any) => string;

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

@@ -20,9 +20,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   calcWalletPassListAmount: () => calcWalletPassListAmount,
+  formatFranchiseeRoute: () => formatFranchiseeRoute,
   formatWalletPassList2PreparePayments: () => formatWalletPassList2PreparePayments,
   formatWalletPassParams: () => formatWalletPassParams,
-  getIsWalletPassAndTripartitePayment: () => getIsWalletPassAndTripartitePayment
+  getFranchiseeShopId: () => getFranchiseeShopId,
+  getIsWalletPassAndTripartitePayment: () => getIsWalletPassAndTripartitePayment,
+  isFranchiseeShop: () => isFranchiseeShop
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = require("decimal.js");
@@ -60,10 +63,31 @@ var getIsWalletPassAndTripartitePayment = (payGroup) => {
   var _a, _b, _c;
   return ((_b = (_a = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a.cards) == null ? void 0 : _b.length) && (0, import_status.isTripartitePayment)((_c = payGroup == null ? void 0 : payGroup.otherPayment) == null ? void 0 : _c.service);
 };
+var isFranchiseeShop = (path, history) => {
+  const { pathname } = history.location;
+  const _pathname = path || pathname;
+  return _pathname && _pathname.includes("/franchisee");
+};
+var getFranchiseeShopId = (path, history) => {
+  const { pathname } = history.location;
+  const _pathname = path || pathname;
+  const match = _pathname.match(/\/shop_(\d+)\//);
+  const shopNumber = match ? match[1] : null;
+  return Number(shopNumber);
+};
+var formatFranchiseeRoute = (url, history) => {
+  if (isFranchiseeShop(null, history)) {
+    return `/franchisee/shop/shop_${getFranchiseeShopId(null, history)}${url}`;
+  }
+  return url;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcWalletPassListAmount,
+  formatFranchiseeRoute,
   formatWalletPassList2PreparePayments,
   formatWalletPassParams,
-  getIsWalletPassAndTripartitePayment
+  getFranchiseeShopId,
+  getIsWalletPassAndTripartitePayment,
+  isFranchiseeShop
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.150",
+  "version": "3.0.151",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
+    "@pisell/materials": "3.0.48",
     "@pisell/utils": "1.0.42",
-    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.100",
-    "@pisell/materials": "3.0.48"
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",