best-unit 2.1.5 → 2.1.11

package/dist/types/global.d.ts

@@ -37,6 +37,11 @@ export interface BalanceData {
   pendingAmount: string;
   status: string;
   createdAt: string;
+  merchantBalances: Array<{
+    fundBalanceId: string;
+    merchantId: number;
+    bizType: string;
+  }>;
 }
 
 export interface InitParams {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "best-unit",
   "private": false,
-  "version": "2.1.5",
+  "version": "2.1.11",
   "type": "module",
   "main": "dist/best-unit.cjs",
   "module": "dist/best-unit.js",

package/src/api/index.ts

@@ -7,51 +7,19 @@ export interface MerchantBalanceItem {
   bizType: string;
 }
 
-export const getAllBalances = async () => {
-  const fundUnitParams = JSON.parse(
-    sessionStorage.getItem("fund_unit_params") || "{}",
-  );
-  return http()
-    .post("/merchant/all-balances", {
-      merchant_id: Number(fundUnitParams.merchantId),
-    })
-    .then((res) => {
-      const allBalances: MerchantBalanceItem[] = (
-        Array.isArray(res?.data) ? res.data : []
-      ).map((item: any) => ({
-        fundBalanceId: String(item.fund_balance_id || ""),
-        merchantId: Number(item.merchant_id || 0),
-        bizType: String(item.biz_type || ""),
-      }));
-
-      sessionStorage.setItem("allBalances", JSON.stringify(allBalances));
-      return allBalances;
-    });
-};
-
 // 获取余额
 export async function getBalance() {
   const fundUnitParams = JSON.parse(
     sessionStorage.getItem("fund_unit_params") || "{}",
   );
-
-  const balanceRequest = http().get("/balance", {
+  const res = await http().get("/balance", {
     params: {
       merchant_id: fundUnitParams.merchantId,
       biz_type: fundUnitParams.bizType,
       fund_balance_id: fundUnitParams.fundBalanceId,
     },
   });
-  const [balanceRes, allBalancesRes] = await Promise.allSettled([
-    balanceRequest,
-    getAllBalances(),
-  ]);
-
-  if (balanceRes.status !== "fulfilled") {
-    throw balanceRes.reason;
-  }
-
-  const data = balanceRes.value.data;
+  const data = res.data;
   const balanceData = {
     fundBalanceId: data.fund_balance_id,
     merchantId: data.merchant_id,
@@ -67,12 +35,16 @@ export async function getBalance() {
     pendingAmount: data.pending_amount,
     status: data.status,
     createdAt: data.created_at,
+    merchantBalances: (Array.isArray(data.merchant_balances)
+      ? data.merchant_balances
+      : []
+    ).map((item: any) => ({
+      fundBalanceId: item.fund_balance_id,
+      merchantId: item.merchant_id,
+      bizType: item.biz_type,
+    })),
   };
 
-  if (allBalancesRes.status !== "fulfilled") {
-    console.error("获取子业务账户列表失败:", allBalancesRes.reason);
-  }
-
   sessionStorage.setItem("balanceData", JSON.stringify(balanceData));
   return balanceData;
 }
@@ -156,6 +128,7 @@ export const createOfflineRecharge = async (data: any) => {
     allocation_ratios: Boolean(data.useFundAllocation)
       ? (data.allocationRatios || []).map((item: any) => ({
           fund_balance_id: item.fundBalanceId,
+          biz_type: item.bizType,
           ratio: String(item.ratio),
         }))
       : [],

package/src/components/business/payment-sdk/offline-payment/fund-allocation.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from "preact/hooks";
 import { t } from "@/local";
-import { getAllBalances, type MerchantBalanceItem } from "@/api";
+import { type MerchantBalanceItem } from "@/api";
+import { getBalanceData } from "@/utils/business";
 
 interface FundAllocationSectionProps {
   theme: any;
@@ -19,6 +20,25 @@ function getBizTypeLabel(bizType: string) {
   return bizType;
 }
 
+function getBizTypePlaceholder(bizType: string) {
+  const prefix = t("请输入");
+  const label = getBizTypeLabel(bizType);
+  return /[A-Za-z]$/.test(prefix) ? `${prefix} ${label}` : `${prefix}${label}`;
+}
+
+function formatPercentageInput(value: string) {
+  let nextValue = value.replace(/[^\d.]/g, "");
+  nextValue = nextValue.replace(/\.(?=.*\.)/g, "");
+  nextValue = nextValue.replace(/^(\d+)(\.\d{0,2})?.*$/, "$1$2");
+  nextValue = nextValue.replace(/^0+(\d)/, "$1");
+
+  if (nextValue.startsWith(".")) {
+    nextValue = `0${nextValue}`;
+  }
+
+  return nextValue;
+}
+
 export function useFundAllocation() {
   const [subBusinesses, setSubBusinesses] = useState<MerchantBalanceItem[]>([]);
   const [useFundAllocation, setUseFundAllocation] = useState(false);
@@ -45,17 +65,24 @@ export function useFundAllocation() {
       );
     };
 
-    const cached = JSON.parse(sessionStorage.getItem("allBalances") || "[]");
-    if (Array.isArray(cached) && cached.length > 0) {
-      applySubBusinesses(cached);
+    const cached = JSON.parse(sessionStorage.getItem("balanceData") || "{}");
+    const cachedMerchantBalances = Array.isArray(cached?.merchantBalances)
+      ? cached.merchantBalances
+      : [];
+    if (cachedMerchantBalances.length > 0) {
+      applySubBusinesses(cachedMerchantBalances);
     }
 
-    getAllBalances()
-      .then((items) => {
-        applySubBusinesses(items);
+    getBalanceData()
+      .then((balanceData: any) => {
+        applySubBusinesses(
+          Array.isArray(balanceData?.merchantBalances)
+            ? balanceData.merchantBalances
+            : [],
+        );
       })
       .catch(() => {
-        if (!Array.isArray(cached)) {
+        if (cachedMerchantBalances.length === 0) {
           applySubBusinesses([]);
         }
       });
@@ -123,6 +150,7 @@ export function useFundAllocation() {
 
     return subBusinesses.map((item) => ({
       fundBalanceId: item.fundBalanceId,
+      bizType: item.bizType,
       ratio: String(subBizPercentages[item.bizType] || ""),
     }));
   };
@@ -191,16 +219,16 @@ export function FundAllocationSection({
                   {" (%)"}
                 </label>
                 <input
-                  type="number"
-                  min="0"
-                  max="100"
-                  step="0.01"
-                  placeholder="0"
+                  type="text"
+                  inputMode="decimal"
+                  placeholder={getBizTypePlaceholder(item.bizType)}
                   value={subBizPercentages[item.bizType] || ""}
                   onChange={(e) => {
                     onPercentageChange(
                       item.bizType,
-                      (e.target as HTMLInputElement).value,
+                      formatPercentageInput(
+                        (e.target as HTMLInputElement).value,
+                      ),
                     );
                   }}
                   style={{

package/src/demo/App.tsx

@@ -39,13 +39,13 @@ export default function DemoApp() {
     initFundUnit({
       token:
         "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjaGFudF9pZCI6MTAwMiwidGltZXN0YW1wIjoxNzUzNDMwNjkyLCJleHAiOjE3NTM0MzQyOTJ9.OPYKUxLQ3C36rKiAmCnUwxTkvM9eKgtsnoxrB9Ntrag",
-      fund_balance_id: "FB1FNZ5Q55M7QP2C",
+      // fund_balance_id: "FB1FNZ5Q55M7QP2C",
       user_id: "19b8a77c-d3fc-45da-9520-4a07463123df",
       locale: locale as Locale,
       theme: theme ?? Theme.WHITE,
       env: env ?? currentEnv,
       size: Size.SMALL,
-      biz_type: "fulfill",
+      biz_type: "ad",
       merchant_id: "1128",
       // theme_config: {
       //   white: {

package/src/local/en.ts

@@ -131,6 +131,7 @@ export const en: Record<string, string> = {
   提交审核: "Submit for Review",
   请选择转账时间: "Please select transfer time",
   请输入转账金额: "Please enter transfer amount",
+  请输入: "Please enter",
   是否使用资金分配: "Use fund allocation",
   是: "Yes",
   否: "No",

package/src/local/zh.ts

@@ -94,6 +94,7 @@ export const zh: Record<string, string> = {
   提交审核: "提交审核",
   请选择转账时间: "请选择转账时间",
   请输入转账金额: "请输入转账金额",
+  请输入: "请输入",
   是否使用资金分配: "是否使用资金分配",
   是: "是",
   否: "否",

package/src/types/global.d.ts

@@ -37,6 +37,11 @@ export interface BalanceData {
   pendingAmount: string;
   status: string;
   createdAt: string;
+  merchantBalances: Array<{
+    fundBalanceId: string;
+    merchantId: number;
+    bizType: string;
+  }>;
 }
 
 export interface InitParams {

package/src/utils/business/index.ts

@@ -1,6 +1,7 @@
 import { getAllDicts, getBalance } from "@/api";
 import { resetHttpInstance } from "@/api/axiosInstance";
 import { Locale, Size, Theme, type Env } from "@/types";
+import type { MerchantBalanceItem } from "@/api";
 
 // 余额数据结构接口
 export interface BalanceData {
@@ -17,6 +18,7 @@ export interface BalanceData {
   pendingAmount: string;
   status: string;
   createdAt: string;
+  merchantBalances: MerchantBalanceItem[];
 }
 
 interface ThemeConfig {