@pisell/private-materials 6.3.111 → 6.3.113

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

@@ -56,6 +56,12 @@ 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/lib/components/pay/toC/PaymentMethods/WalletPass/utils.js

@@ -53,8 +53,8 @@ var formatMachineCodeServer2CardList = (data, selectId = []) => {
       showDetail: false,
       showQrCode: false,
       code: item.code,
-      disabled: !item.unified_available_status,
-      disabledReason: (_b = item.unified_messages) == null ? void 0 : _b.title,
+      disabled: (0, import_utils.isNumber)(item._unified_available_status) ? !item._unified_available_status : !item.unified_available_status,
+      disabledReason: (0, import_utils.isNumber)(item._unified_available_status) ? item.reason : (_b = item.unified_messages) == null ? void 0 : _b.title,
       cover: (_c = item.product) == null ? void 0 : _c.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

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

@@ -166,7 +166,9 @@ var WalletPassBlock = (props, ref) => {
       ref: walletPassRef,
       walletSetting,
       onWalletPassChange,
-      walletPass: payGroup == null ? void 0 : payGroup.walletPass
+      walletPass: payGroup == null ? void 0 : payGroup.walletPass,
+      orderDetail: payGroup == null ? void 0 : payGroup.orderDetail,
+      total_amount: payGroup == null ? void 0 : payGroup.total_amount
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_WalletAvailable.default,

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

@@ -49,6 +49,7 @@ var import_usePaymentLogger = __toESM(require("../../../hooks/usePaymentLogger")
 var import_utils2 = require("../../../utils");
 var import_payGroup = require("./payGroup");
 var import_locales = __toESM(require("./locales"));
+var import_serve2 = require("./PaymentMethods/WalletPass/serve");
 var import_utils3 = require("./utils");
 var import_status = require("./status");
 var import_index = require("./index.less");
@@ -169,7 +170,7 @@ var ToCPay = (props, ref) => {
     }
   };
   const _getPaymentsAndWalletPass = async (order) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2;
     paymentLogger.addLog({
       key: "获取支付列表开始",
       value: {
@@ -177,11 +178,22 @@ var ToCPay = (props, ref) => {
       }
     });
     try {
-      const data = await (0, import_serve.getPaymentsAndWalletPass)({
-        order_id: order.order_id,
-        total_amount: order.amount,
-        sale_channel: order.sale_channel || "online-store"
-      });
+      const [data, allList, orderBasicDetail] = await Promise.all([
+        (0, import_serve.getPaymentsAndWalletPass)({
+          order_id: order.order_id,
+          total_amount: order.amount,
+          sale_channel: order.sale_channel || "online-store"
+        }),
+        (0, import_serve2.getMachineCodeList)({
+          order_id: order.order_id,
+          available: 2,
+          prepare_payments: [],
+          filter_prepare_wallet_pass: 1,
+          sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
+          other_exact_codes: []
+        }),
+        (0, import_serve.getOrderBasicDetail)(order.order_id)
+      ]);
       const {
         remain_amount = 0,
         wallet_pass_recommend_list,
@@ -189,39 +201,60 @@ var ToCPay = (props, ref) => {
         payment_list,
         walletPass
       } = data || {};
+      const products = (orderBasicDetail.detail || []).map((item) => {
+        var _a3;
+        return {
+          ...item,
+          is_price_include_tax: orderBasicDetail.is_price_include_tax,
+          product_bundle: (_a3 = item.product_bundle || []) == null ? void 0 : _a3.map((bundle) => {
+            return {
+              ...bundle,
+              is_price_include_tax: orderBasicDetail.is_price_include_tax
+            };
+          })
+        };
+      });
+      const res = utils.walletPassEvaluator.getRecommendedVouchers({
+        orderTotalAmount: Math.min(orderBasicDetail.product_unpaid_total_pay_amount, order.amount),
+        products,
+        vouchers: allList || []
+      });
+      const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
       paymentLogger.addLog({
         key: "支付数据获取",
         value: ""
       });
-      const withCustomerIdList = (wallet_pass_recommend_list || []).map(
-        (item) => {
-          return {
-            ...item,
-            customer_id: customer_id || item.customer_id
-          };
-        }
-      );
+      const waitAmount2 = new import_decimal.Decimal((order == null ? void 0 : order.amount) || 0).minus(new import_decimal.Decimal(recommendedAmount)).toNumber();
       dispatch({
         type: "setPayGroup",
         payload: {
           // ...state.payGroup,
           order_id: order == null ? void 0 : order.order_id,
           // total_amount: order?.amount,
+          orderDetail: orderBasicDetail,
           // 原订单信息
           _order: order,
           payment_group_id: order == null ? void 0 : order.payment_group_id,
           // 支付方式没有walletPass时walletPass设置null
           walletPass: walletPass ? {
-            ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
+            ...(_b2 = state.payGroup) == null ? void 0 : _b2.walletPass,
             ...walletPass,
-            amount: wallet_pass_amount,
-            cards: withCustomerIdList
+            // 推荐钱包
+            cards: recommended,
+            // 推荐金额
+            amount: recommendedAmount,
+            // 不可用钱包
+            noApplicableVoucher,
+            // 转换列表
+            transformList
+            // amount: wallet_pass_amount,
+            // cards: wallet_pass_recommend_list,
           } : null,
           total_amount: order == null ? void 0 : order.amount,
-          wait_amount: remain_amount
+          wait_amount: Math.max(0, waitAmount2)
         }
       });
-      await ((_b2 = paymentListRef.current) == null ? void 0 : _b2.init(payment_list, remain_amount || 0));
+      await ((_c2 = paymentListRef.current) == null ? void 0 : _c2.init(payment_list, remain_amount || 0));
       setTimeout(() => {
         setLoading(false);
       }, 100);

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,5 +29,13 @@ 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/lib/components/pay/toC/serve.d.ts

@@ -62,6 +62,23 @@ 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 }
@@ -72,3 +89,4 @@ export declare const checkPendingPayment: (values: {
 }) => Promise<{
     has_pending: boolean;
 }>;
+export {};

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

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   checkPendingPayment: () => checkPendingPayment,
+  getOrderBasicDetail: () => getOrderBasicDetail,
   getPaymentInit: () => getPaymentInit,
   getPaymentList: () => getPaymentList,
   getPaymentResult: () => getPaymentResult,
@@ -78,6 +79,10 @@ var getWalletNameAndPopupStatus = async (values) => {
   return data;
 };
 var getPaymentResult = (values) => import_utils.request.getRequest().get(`/h5/pay/order/payment/result`, values);
+var getOrderBasicDetail = async (order_id) => {
+  const { data } = await import_utils.request.getRequest().get(`/h5/order/order/${order_id}/basic-detail`, {});
+  return data;
+};
 var checkPendingPayment = async (values) => {
   var _a;
   const { data } = await import_utils.request.getRequest().post(`/h5/pay/payment/check`, values);
@@ -89,6 +94,7 @@ var checkPendingPayment = async (values) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkPendingPayment,
+  getOrderBasicDetail,
   getPaymentInit,
   getPaymentList,
   getPaymentResult,

package/lib/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/lib/components/pay/toC/utils.js

@@ -43,8 +43,9 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = require("decimal.js");
 var import_status = require("./status");
-var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
+var import_dayjs = __toESM(require("dayjs"));
+var import_utils2 = require("@pisell/utils");
 var calcWalletPassListAmount = (list) => {
   return list.reduce((pre, cur) => pre.add(new import_decimal.Decimal(String(getAvailableMaxAmount(cur) || 0))), new import_decimal.Decimal("0")).toNumber();
 };
@@ -97,6 +98,9 @@ var formatFranchiseeRoute = (url, history) => {
   return url;
 };
 var getAvailableMaxAmount = (data) => {
+  if ((0, import_utils.isNumber)(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
 var clientPayment = (params) => {
@@ -113,7 +117,7 @@ var clientPayment = (params) => {
   });
 };
 var getUniqueIdempotencyToken = () => {
-  return `${(0, import_dayjs.default)().format("YYYYMMDDHHmmssSSS")}-${(0, import_utils.getUniqueId)()}`;
+  return `${(0, import_dayjs.default)().format("YYYYMMDDHHmmssSSS")}-${(0, import_utils2.getUniqueId)()}`;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/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/lib/components/shoppingCart/components/Empty/index.d.ts

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

package/lib/hooks/usePaymentLogger.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/lib/plus/pisellSalesManagement/config/booking.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const getBookingStatusMap: () => Record<string, string>;
 export declare const BOOKING_STATUS_COLOR_MAP: Record<string, string>;
 export declare const getBookingPlatformMap: () => Record<string, string>;
@@ -20,7 +19,7 @@ export declare const getFilterButtonList: () => ({
         }[];
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -46,7 +45,7 @@ export declare const getFilterButtonList: () => ({
         mode?: undefined;
         maxTagCount?: undefined;
         options?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -91,7 +90,7 @@ export declare const getFilterButtonList: () => ({
         options: () => Promise<any>;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -111,7 +110,7 @@ export declare const getFilterButtonList: () => ({
         options?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -133,7 +132,7 @@ export declare const getFilterButtonList: () => ({
         maxTagCount?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         showTime?: undefined;
     };
     sort?: undefined;
@@ -152,7 +151,7 @@ export declare const getFilterButtonList: () => ({
         options?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
     };

package/lib/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;

package/lib/plus/walletEditor/components/ImageUpload/index.d.ts

@@ -3,6 +3,6 @@ export interface ImageUploadProps {
     value?: string;
     onChange?: (val: string) => void;
 }
-export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
 declare const ImageUpload: React.FC<ImageUploadProps>;
 export default ImageUpload;

package/lib/pro/Selector/Selector.d.ts

@@ -3,7 +3,7 @@ import { ItemLayout, ItemProps, PresetConfig, SelectorProps, SelectorVariant } f
 import './selector.less';
 export declare const SelectorContext: React.Context<{
     disabled?: boolean | undefined;
-    mode?: "single" | "multiple" | undefined;
+    mode?: "multiple" | "single" | undefined;
     itemLayout?: ItemLayout | undefined;
     valueType?: "object" | "primitive" | undefined;
     variant?: SelectorVariant | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.111",
+  "version": "6.3.113",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,10 +76,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/date-picker": "3.0.8",
-    "@pisell/materials": "6.3.27",
+    "@pisell/utils": "3.0.5",
+    "@pisell/materials": "6.3.29",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.5"
+    "@pisell/date-picker": "3.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",