Merge branch 'feature-PrivatePocket' into 'dev'

feat: 检查隐私余额 See merge request !39

Merge branch 'feature-PrivatePocket' into 'dev'
feat: 检查隐私余额 See merge request !39
boyang
2 parents 005c1fbd 1c214613
Showing 3 changed files with 147 additions and 10 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
src/services/definition.ts
src/services/request.ts
@@ -3,6 +3,7 @@ import {
   postCanrdApiUserAddressList,
   postCanrdApiUserDetail,
   postCanrdApiUserNowMoneyCheck,
+  postCanrdPrivatePocketPrivateMoneyCheck,
   postDistrictSelectByLevel,
   postDistrictSelectByNameAndLevel,
   postDistrictSelOrderProvince,
@@ -648,6 +649,41 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   };
  
   /**
+   * 检查隐私钱包余额
+   * @param uid 用户ID
+   * @param phone 手机号
+   * @param subPrice 金额
+   */
+  const checkPrivateWalletMoney = async (
+    uid: any,
+    phone: any,
+    subPrice: any,
+  ) => {
+    let res = await postCanrdPrivatePocketPrivateMoneyCheck({
+      data: { uid: uid, phone: phone, subPrice: subPrice },
+    });
+    if (res && res.result === RESPONSE_CODE.SUCCESS && res.data) {
+      let data = res.data;
+      let isEnough = data.isEnough;
+      if (isEnough) {
+        return true;
+      }
+
+      message.error(
+        '隐私钱包余额不足，当前预减的金额为：' +
+          data.subPrice +
+          '，当前隐私钱包余额为：' +
+          data.privateMoney,
+      );
+      return false;
+    }
+
+    return false;
+  };
+
+  // 已在prepaidUid字段的onChange处理器中直接实现账户选择逻辑
+
+  /**
    * 总金额改变触发事件
    * 如果是预存单，需要检查余额
    * @param value
@@ -1759,7 +1795,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           hidden={paymentMethod !== 'WITHHOLDING_ADVANCE_DEPOSIT'}
           showSearch
           label="预存账号"
-          onChange={(value: any, option: any) => {
+          onChange={async (value: any, option: any) => {
             console.log(value, '5656value');
             console.log(option, '5656option');
  
@@ -1773,18 +1809,31 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             const selectedData = option || {};
             const realUid = selectedData.uid;
             const institution = selectedData.institution;
+            const phone = selectedData.phone;
  
             console.log('选中账户信息:', {
               value: value,
               realUid: realUid,
               institution: institution,
+              phone: phone,
             });
  
-            //检查用户额度
-            let valid = checkAccountMoney(
-              realUid, // 使用真实UID检查额度
-              form.getFieldValue('totalPayment'),
-            );
+            // 检查是否是隐私钱包
+            const isPrivacyWallet = institution === '隐私钱包';
+            const totalPayment = form.getFieldValue('totalPayment');
+            let valid;
+
+            if (isPrivacyWallet) {
+              // 使用隐私钱包检查方式
+              valid = await checkPrivateWalletMoney(
+                realUid,
+                phone,
+                totalPayment,
+              );
+            } else {
+              // 使用普通账户检查方式
+              valid = await checkAccountMoney(realUid, totalPayment);
+            }
  
             if (!valid) {
               form.setFieldValue('prepaidUid', undefined);
@@ -1792,9 +1841,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               return;
             }
  
-            // 如果机构是"隐私钱包"，则设置privatePocket为true
-            const isPrivacyWallet = institution === '隐私钱包';
-
             // 设置真实UID和privatePocket标志
             form.setFieldValue('realPrepaidUid', realUid);
             // 存储为字符串'true'或'false'，这样在表单中能正确保存
@@ -1807,6 +1853,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               prepaidUid: value,
               realPrepaidUid: realUid,
               privatePocket: isPrivacyWallet,
+              accountType: isPrivacyWallet ? '隐私钱包' : '普通账户',
             });
           }}
           placeholder="请选择预存账号"
@@ -4849,6 +4849,24 @@ export interface UserNowMoneyCheckRequest {
   uid?: number;
 }
  
+export interface UserPrivateMoneyCheckRequest {
+  /**
+   * @description
+   *   手机号码
+   */
+  phone?: string;
+  /**
+   * @description
+   *   金额
+   */
+  subPrice?: number;
+  /**
+   * @description
+   *   用户ID
+   */
+  uid?: string;
+}
+
 export interface UserPrivatePocketBalanceUpdateRequest {
   /**
    * @description
@@ -5605,7 +5623,7 @@ export interface SalesRechargePrepaymentAuditRequest {
    * @description
    *   销售代表编码
    */
-  salescode?: string;
+  salesCode?: string;
 }
  
 export interface SalesRechargePrepaymentCreateRequest {
@@ -168,6 +168,7 @@ import type {
   UserDetailRequest,
   UserListRequest,
   UserNowMoneyCheckRequest,
+  UserPrivateMoneyCheckRequest,
   UserPrivatePocketBalanceUpdateRequest,
   UserPrivatePocketDeleteRequest,
   UserPrivatePocketDetailRequest,
@@ -3360,6 +3361,77 @@ export const postCanrdPrivatePocketList = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postCanrdPrivatePocketPrivateMoneyCheck */
+export interface PostCanrdPrivatePocketPrivateMoneyCheckOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: UserPrivateMoneyCheckRequest;
+  };
+}
+
+/** @description response type for postCanrdPrivatePocketPrivateMoneyCheck */
+export interface PostCanrdPrivatePocketPrivateMoneyCheckResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostCanrdPrivatePocketPrivateMoneyCheckResponseSuccess =
+  PostCanrdPrivatePocketPrivateMoneyCheckResponse[200];
+/**
+ * @description
+ *   检查用户隐私钱包余额是否足够
+ * @tags user-private-pocket-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postCanrdPrivatePocketPrivateMoneyCheck = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/canrd/privatePocket/privateMoney/check';
+  function request(
+    option: PostCanrdPrivatePocketPrivateMoneyCheckOption,
+  ): Promise<PostCanrdPrivatePocketPrivateMoneyCheckResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostCanrdPrivatePocketPrivateMoneyCheckResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postCanrdPrivatePocketSave */
 export interface PostCanrdPrivatePocketSaveOption {
   /**