@pisell/private-materials 6.3.123 → 6.3.124

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

@@ -56,12 +56,6 @@ export declare type WalletPassDataType = {
     metadata?: {
         validity_type: string;
     };
-    /** 前端计算 可用最大金额 */
-    _available_max_amount?: number;
-    /** 前端计算 统一可用状态 */
-    _unified_available_status?: 0 | 1;
-    /** 前端计算 禁用原因 */
-    reason?: string;
 };
 declare type Shop = {
     id: number;

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

@@ -1,4 +1,4 @@
-import { formatDate, isNumber, locales } from '@pisell/utils';
+import { formatDate, locales } from '@pisell/utils';
 import { globalConfig } from '@pisell/materials';
 import { getAvailableMaxAmount } from "../../utils";
 var voucherTime = function voucherTime(data) {
@@ -25,8 +25,8 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       showDetail: false,
       showQrCode: false,
       code: item.code,
-      disabled: isNumber(item._unified_available_status) ? !item._unified_available_status : !item.unified_available_status,
-      disabledReason: isNumber(item._unified_available_status) ? item.reason : (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
+      disabled: !item.unified_available_status,
+      disabledReason: (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

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

@@ -163,9 +163,7 @@ var WalletPassBlock = function WalletPassBlock(props, ref) {
     ref: walletPassRef,
     walletSetting: walletSetting,
     onWalletPassChange: onWalletPassChange,
-    walletPass: payGroup === null || payGroup === void 0 ? void 0 : payGroup.walletPass,
-    orderDetail: payGroup === null || payGroup === void 0 ? void 0 : payGroup.orderDetail,
-    total_amount: payGroup === null || payGroup === void 0 ? void 0 : payGroup.total_amount
+    walletPass: payGroup === null || payGroup === void 0 ? void 0 : payGroup.walletPass
   }), /*#__PURE__*/React.createElement(WalletAvailable, {
     ref: walletAvailableRef,
     walletSetting: walletSetting,

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

@@ -23,14 +23,13 @@ import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
 import PaymentList from "./PaymentList";
 import PaymentMethods from "./PaymentMethods";
-import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus, getOrderBasicDetail, checkPendingPayment } from "./serve";
+import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus, checkPendingPayment } 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";
@@ -287,7 +286,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      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, _waitAmount2;
+      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, withCustomerIdList;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -300,79 +299,46 @@ var ToCPay = function ToCPay(props, ref) {
             });
             _context3.prev = 1;
             _context3.next = 4;
-            return Promise.all([getPaymentsAndWalletPass({
+            return 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:
-            _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; // 记录获取到的数据
+          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; // 记录获取到的数据
             paymentLogger.addLog({
               key: '支付数据获取',
               value: ''
             });
-            _waitAmount2 = new Decimal((order === null || order === void 0 ? void 0 : order.amount) || 0).minus(new Decimal(recommendedAmount)).toNumber(); // 设置交易组
+            withCustomerIdList = (wallet_pass_recommend_list || []).map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                customer_id: customer_id || item.customer_id
+              });
+            }); // 设置交易组
             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), {}, {
-                  // 推荐钱包
-                  cards: recommended,
-                  // 推荐金额
-                  amount: recommendedAmount,
-                  // 不可用钱包
-                  noApplicableVoucher: noApplicableVoucher,
-                  // 转换列表
-                  transformList: transformList
-                  // amount: wallet_pass_amount,
-                  // cards: wallet_pass_recommend_list,
+                  amount: wallet_pass_amount,
+                  cards: withCustomerIdList
                 }) : null,
                 total_amount: order === null || order === void 0 ? void 0 : order.amount,
-                wait_amount: Math.max(0, _waitAmount2)
+                wait_amount: remain_amount
               }
             });
 
             // 初始化支付列表
-            _context3.next = 18;
+            _context3.next = 11;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list, remain_amount || 0);
-          case 18:
+          case 11:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
@@ -383,10 +349,10 @@ var ToCPay = function ToCPay(props, ref) {
               key: '获取支付列表成功',
               value: ''
             });
-            _context3.next = 28;
+            _context3.next = 21;
             break;
-          case 22:
-            _context3.prev = 22;
+          case 15:
+            _context3.prev = 15;
             _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
 
@@ -409,11 +375,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 28:
+          case 21:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 22]]);
+      }, _callee3, null, [[1, 15]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);
@@ -430,7 +396,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:46
    */
   var handlePaymentByType = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
       var _state$payGroup3;
       var paymentType, currentPayGroup, _paymentMethodsRef$cu;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -490,7 +456,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee4, null, [[3, 12]]);
     }));
     return function handlePaymentByType(_x4, _x5) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -502,7 +468,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:41
    */
   var paymentInit = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
       var _state$payGroup4;
       var orderId, _state$payGroup5, data;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -576,7 +542,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee5, null, [[3, 12]]);
     }));
     return function paymentInit(_x6) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -635,7 +601,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-30 10:23:48
    */
   var getIsShowDetectIncognitoConfirm = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
       var _yield$detectIncognit, isPrivate;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -653,7 +619,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee6);
     }));
     return function getIsShowDetectIncognitoConfirm(_x7) {
-      return _ref8.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -665,7 +631,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:25
    */
   var onSubmit = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
+    var _ref8 = _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) {
@@ -743,7 +709,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee7, null, [[2, 20]]);
     }));
     return function onSubmit(_x8) {
-      return _ref9.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -800,7 +766,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-09 14:25
    */
   var payCallback = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
       var _res$data, _state$payGroup20, _props$callback;
       var orderId, _res$data2;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -840,7 +806,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee8);
     }));
     return function payCallback(_x9) {
-      return _ref10.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,6 +29,12 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
     front_order_uuid?: string;
-    orderDetail: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -62,23 +62,6 @@ 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>;
 /**
  * @title: 检测订单是否有正在处理中的交易
  * @param {object} values - { order_id: string }
@@ -89,4 +72,3 @@ export declare const checkPendingPayment: (values: {
 }) => Promise<{
     has_pending: boolean;
 }>;
-export {};

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

@@ -186,69 +186,42 @@ 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);
-  };
-}();
+
 /**
  * @title: 检测订单是否有正在处理中的交易
  * @param {object} values - { order_id: string }
  * @return {Promise<{ has_pending: boolean }>}
  */
 export var checkPendingPayment = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(values) {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(values) {
     var _data$payment_handlin;
-    var _yield$request$getReq6, data;
-    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+    var _yield$request$getReq5, data;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          _context6.next = 2;
+          _context5.next = 2;
           return request.getRequest().post("/h5/pay/payment/check", values);
         case 2:
-          _yield$request$getReq6 = _context6.sent;
-          data = _yield$request$getReq6.data;
+          _yield$request$getReq5 = _context5.sent;
+          data = _yield$request$getReq5.data;
           if (!(data !== null && data !== void 0 && data.payment_handling_list && (data === null || data === void 0 || (_data$payment_handlin = data.payment_handling_list) === null || _data$payment_handlin === void 0 ? void 0 : _data$payment_handlin.length) > 0)) {
-            _context6.next = 6;
+            _context5.next = 6;
             break;
           }
-          return _context6.abrupt("return", {
+          return _context5.abrupt("return", {
             has_pending: true
           });
         case 6:
-          return _context6.abrupt("return", {
+          return _context5.abrupt("return", {
             has_pending: false
           });
         case 7:
         case "end":
-          return _context6.stop();
+          return _context5.stop();
       }
-    }, _callee6);
+    }, _callee5);
   }));
-  return function checkPendingPayment(_x6) {
-    return _ref6.apply(this, arguments);
+  return function checkPendingPayment(_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 | number;
+        amount: string;
         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 | number;
+export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
 export declare const clientPayment: (params: {
     order_id: number;
     type: "aliPay" | "wxPay" | 'google_pay';

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

@@ -6,7 +6,6 @@ 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";
 import dayjs from "dayjs";
 import { getUniqueId } from "@pisell/utils";
 /**
@@ -98,9 +97,6 @@ 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/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/plus/selectHolder/components/ErrorTip/index.d.ts

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