feat: 开发隐私钱包页面

boyang
1 parent d6e3f08e
Showing 9 changed files with 349 additions and 56 deletions
src/pages/Order/Order/components/CheckModal.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Prepaid/PrepaidAccount/index.tsx
src/pages/Prepaid/PrepaidRecharge/index.tsx
src/pages/Prepaid/PrivatePocket/components/AddPrivatePocketModal.tsx
src/pages/Prepaid/PrivatePocket/constant.tsx
src/pages/Prepaid/components/RechargePrepaymentModal.tsx
src/services/definition.ts
src/services/request.ts
@@ -85,12 +85,37 @@ export default ({
     //   data: { subOrderIds: subOrderIds },
     // });
  
+    // 检查subOrders是否存在且有元素
+    if (!subOrders || !subOrders.length) {
+      // 如果是预存审核类型，直接返回，不需要处理售后信息
+      if (checkType(CHECK_TYPE.PREPAID_AUDIT)) {
+        return;
+      }
+
+      // 对于其他类型，设置一个空的售后信息
+      setAfterSalesInfo(
+        <div className="my-5">
+          <Row gutter={[16, 24]}>
+            <Col span={24}>
+              <span>暂无售后信息</span>
+            </Col>
+          </Row>
+        </div>,
+      );
+      return;
+    }
+
     //附件
-    let annex = subOrders[0].afterSalesAnnexList;
+    let annex = subOrders[0]?.afterSalesAnnexList || [];
     let index = 1;
     let annexLinks = annex?.map((f) => {
       return (
-        <Button className="p-0 pr-1" type="link" key="key" href={f}>
+        <Button
+          className="p-0 pr-1"
+          type="link"
+          key={`annex-${index}`}
+          href={f}
+        >
           {'附件' + index++}
         </Button>
       );
@@ -126,27 +151,36 @@ export default ({
   useEffect(() => {
     if (checkType(CHECK_TYPE.CONFIRM_DELIVER)) {
       setAPopoverTitle('确认发货');
+    } else if (checkType(CHECK_TYPE.PREPAID_AUDIT)) {
+      setAPopoverTitle('预存审核');
     }
     getOrderAfterSalesInfo();
  
     let paymentReceiptsImagesList: any[] = [];
     subOrders?.forEach((item: any) => {
-      if (item.paymentReceiptAnnexList) {
-        paymentReceiptsImagesList.push(...item.paymentReceiptAnnexList);
+      if (
+        item?.paymentReceiptsImages !== null &&
+        item?.paymentReceiptsImages !== undefined
+      ) {
+        paymentReceiptsImagesList.push(...item.paymentReceiptsImages);
       }
     });
-    //去重
-    paymentReceiptsImagesList = [...new Set(paymentReceiptsImagesList)];
     setPymentReceiptsImages(paymentReceiptsImagesList);
  
-    //预存审核的凭证
     let proofImages: any[] = [];
+    // 从subOrders获取凭证图片
     subOrders?.forEach((item) => {
-      let images = item.proofImages;
+      let images = item?.proofImages;
       if (images !== null && images !== undefined) {
         proofImages.push(...images);
       }
     });
+
+    // 对于预存审核，从data对象中获取凭证图片
+    if (checkType(CHECK_TYPE.PREPAID_AUDIT) && data?.proofImages) {
+      proofImages = [...data.proofImages];
+    }
+
     setPrepaidProofImages(proofImages);
   }, []);
  
@@ -374,12 +408,25 @@ export default ({
    * @param body
    */
   async function doPrepaidAudit(body: any) {
-    const data = await postPrepaidAudit({
-      data: body,
+    // 确保传递了需要审核的记录ID
+    const auditData = {
+      ...body,
+      ids: [data?.id], // 使用当前记录的ID
+      checkPassOrReject: body.checkPassOrReject, // 通过或驳回
+      checkNotes: body.name, // 审核意见
+    };
+
+    console.log('预存审核参数:', auditData);
+
+    const result = await postPrepaidAudit({
+      data: auditData,
     });
-    if (data.result === RESPONSE_CODE.SUCCESS) {
-      message.success(data.message);
+
+    if (result.result === RESPONSE_CODE.SUCCESS) {
+      message.success(result.message);
       onClose();
+    } else {
+      message.error(result.message || '审核失败');
     }
   }
  
@@ -230,7 +230,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
  
     // 查询当前手机号允许使用的预存账号
     if (phone) {
-      let res = await postPrepaidPhoneAvailableList({ data: { phone: phone } });
+      // 从表单中获取 salesCode
+      const salesCode = form.getFieldValue('salesCode');
+      let res = await postPrepaidPhoneAvailableList({
+        data: { phone: phone, salesCode: salesCode },
+      });
       if (res && res.result === RESPONSE_CODE.SUCCESS) {
         let uidDetails = res.data;
         for (let detail of uidDetails) {
@@ -890,9 +894,44 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           if (typeof values.erpCustomerId !== 'string') {
             values.erpCustomerId = values.erpCustomerId?.id;
           }
-          values.province = province;
-          values.city = city;
-          values.district = district;
+
+          // Handle the prepaidUid and privatePocket values for API submission
+          if (
+            values.paymentMethod === 'WITHHOLDING_ADVANCE_DEPOSIT' &&
+            values.prepaidUid
+          ) {
+            console.log('5656原始表单数据:', {
+              prepaidUid: values.prepaidUid,
+              realPrepaidUid: values.realPrepaidUid,
+              privatePocket: values.privatePocket,
+            });
+
+            // 从选项值中提取原始UID (不包含索引后缀)
+            const prepaidUidParts = values.prepaidUid.split('_');
+            if (prepaidUidParts.length > 0) {
+              // 直接使用第一部分作为实际UID值 (不使用realPrepaidUid)
+              values.prepaidUid = parseInt(prepaidUidParts[0], 10);
+              console.log('5656使用原始UID进行API提交:', values.prepaidUid);
+            }
+
+            // 确保privatePocket字段被正确设置
+            // 表单中存储的是字符串'true'或'false'，需要转换成布尔值
+            if (values.privatePocket === 'true') {
+              values.privatePocket = true;
+              console.log('设置privatePocket=true用于API提交');
+            } else {
+              values.privatePocket = false;
+              console.log('设置privatePocket=false用于API提交');
+            }
+
+            console.log('最终API提交数据:', {
+              prepaidUid: values.prepaidUid,
+              privatePocket: values.privatePocket,
+            });
+          }
+
+          console.log(values, '5656values');
+
           //新增
           if (optType('add') || optType('copy')) {
             res = await postServiceOrderAddOrder({ data: values });
@@ -1701,6 +1740,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           rules={[{ required: true, message: '支付方式必填' }]}
           disabled={optType('after-sales-check')}
         />
+        {/* 隐藏字段用于存储真实UID和privatePocket标志 */}
+        <ProFormText name="realPrepaidUid" hidden />
+        <ProFormText name="privatePocket" hidden />
+
         <ProFormSelect
           name="prepaidUid"
           key="prepaidUid"
@@ -1708,15 +1751,55 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           hidden={paymentMethod !== 'WITHHOLDING_ADVANCE_DEPOSIT'}
           showSearch
           label="预存账号"
-          onChange={(value: any) => {
+          onChange={(value: any, option: any) => {
+            console.log(value, '5656value');
+            console.log(option, '5656option');
+
+            if (!option) {
+              form.setFieldValue('prepaidUid', undefined);
+              form.setFieldValue('privatePocket', false);
+              return;
+            }
+
+            // 从选项中获取真实UID和机构信息
+            const selectedData = option || {};
+            const realUid = selectedData.uid;
+            const institution = selectedData.institution;
+
+            console.log('选中账户信息:', {
+              value: value,
+              realUid: realUid,
+              institution: institution,
+            });
+
             //检查用户额度
             let valid = checkAccountMoney(
-              value,
+              realUid, // 使用真实UID检查额度
               form.getFieldValue('totalPayment'),
             );
+
             if (!valid) {
               form.setFieldValue('prepaidUid', undefined);
+              form.setFieldValue('privatePocket', false);
+              return;
             }
+
+            // 如果机构是"隐私钱包"，则设置privatePocket为true
+            const isPrivacyWallet = institution === '隐私钱包';
+
+            // 设置真实UID和privatePocket标志
+            form.setFieldValue('realPrepaidUid', realUid);
+            // 存储为字符串'true'或'false'，这样在表单中能正确保存
+            form.setFieldValue(
+              'privatePocket',
+              isPrivacyWallet ? 'true' : 'false',
+            );
+
+            console.log('设置表单数据:', {
+              prepaidUid: value,
+              realPrepaidUid: realUid,
+              privatePocket: isPrivacyWallet,
+            });
           }}
           placeholder="请选择预存账号"
           rules={[
@@ -1762,7 +1845,17 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           //   });
           //   return options;
           // }}
-          options={accountOptions}
+          options={accountOptions.map((item, index) => ({
+            ...item,
+            // Use index to create unique value
+            value: `${item.value}_${index}`,
+            // Store original values as custom attributes
+            data: {
+              uid: item.value,
+              institution: item.institution,
+              index: index,
+            },
+          }))}
         />
         <ProFormSelect
           placeholder="选择是否需要开票"
@@ -178,37 +178,41 @@ const PrepaidAccountPage = () =&gt; {
  
       {balanceChangeRecordsModalVisible && (
         <BalanceChangeRecordsModal
-          visible={balanceChangeRecordsModalVisible}
-          onCancel={() => {
+          setVisible={setBalanceChangeRecordsModalVisible}
+          userInfoObj={currentOptUserObj}
+          onClose={() => {
             setBalanceChangeRecordsModalVisible(false);
+            reloadAccountTable();
           }}
-          record={currentOptUserObj}
         />
       )}
  
       {pointsExchangeModalVisible && (
         <PointsExchangeModal
-          visible={pointsExchangeModalVisible}
-          onCancel={() => {
-            setPointsExchangeModalVisible(false);
-          }}
-          onOk={() => {
+          setVisible={setPointsExchangeModalVisible}
+          userInfoObj={
+            currentOptUserObj
+              ? { ...currentOptUserObj, relationEntityType: 'USER' }
+              : { uid: '', relationEntityType: 'USER' }
+          }
+          onClose={() => {
             setPointsExchangeModalVisible(false);
             reloadAccountTable();
           }}
-          record={currentOptUserObj}
-          relationEntityType="USER"
         />
       )}
  
       {pointsExchangeRecordsModalVisible && (
         <PointsExchangeRecordsModal
-          visible={pointsExchangeRecordsModalVisible}
-          onCancel={() => {
+          setVisible={setPointsExchangeRecordsModalVisible}
+          userInfoObj={
+            currentOptUserObj
+              ? { ...currentOptUserObj, relationEntityType: 'USER' }
+              : { uid: '', relationEntityType: 'USER' }
+          }
+          onClose={() => {
             setPointsExchangeRecordsModalVisible(false);
           }}
-          record={currentOptUserObj}
-          relationEntityType="USER"
         />
       )}
     </div>
@@ -205,30 +205,26 @@ const PrepaidRechargePage = () =&gt; {
  
       {rechargePrepaymentModalVisible && (
         <RechargePrepaymentModal
-          visible={rechargePrepaymentModalVisible}
-          onCancel={() => {
-            setRechargePrepaymentModalVisible(false);
-          }}
-          onOk={() => {
+          setVisible={setRechargePrepaymentModalVisible}
+          prepaymentObject={currentOptPrepaymentObj}
+          onClose={() => {
             setRechargePrepaymentModalVisible(false);
             reloadPrepaidTable();
           }}
-          record={currentOptPrepaymentObj}
         />
       )}
  
       {checkVisible && (
         <CheckModal
-          visible={checkVisible}
-          onCancel={() => {
-            setCheckVisible(false);
-          }}
-          onOk={() => {
+          setCheckVisible={setCheckVisible}
+          data={currentOptPrepaymentObj}
+          subOrders={[]}
+          orderCheckType={CHECK_TYPE.PREPAID_AUDIT}
+          openOrderDrawer={null}
+          onClose={() => {
             setCheckVisible(false);
             reloadPrepaidTable();
           }}
-          record={currentOptPrepaymentObj}
-          type={CHECK_TYPE.PREPAID}
         />
       )}
     </div>
@@ -60,7 +60,7 @@ const AddPrivatePocketModal: React.FC&lt;AddPrivatePocketModalProps&gt; = ({
         },
       });
  
-      if (res?.code === 200 || res?.success) {
+      if (res?.result === 0 || res?.code === 200 || res?.success) {
         message.success('添加隐私钱包成功');
         onSuccess();
       } else {
@@ -60,11 +60,11 @@ export const PRIVATE_POCKET_COLUMNS = [
     valueType: 'dateTime',
     hideInSearch: true,
   },
-  {
-    title: '更新时间',
-    dataIndex: 'updateTime',
-    key: 'updateTime',
-    valueType: 'dateTime',
-    hideInSearch: true,
-  },
+  // {
+  //   title: '更新时间',
+  //   dataIndex: 'updateTime',
+  //   key: 'updateTime',
+  //   valueType: 'dateTime',
+  //   hideInSearch: true,
+  // },
 ];
@@ -30,8 +30,10 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
     salesCode: string;
     rechargeAmount: number;
     notes: string;
+    rechargeType: string; // 充值类型
   }>();
   const [salesCodeOptions, setSalesCodeOptions] = useState([]);
+  const [setRechargeType] = useState<string>('normal'); // 默认普通充值
   const [isCreate, setIsCreate] = useState(true);
   const [fileList, setFileList] = useState<UploadFile[]>([]);
   const [previewOpen, setPreviewOpen] = useState(false);
@@ -243,7 +245,8 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
           },
         }}
         onFinish={async (values) => {
-          if (fileList.length <= 0) {
+          // 隐私钱包充值不需要凭证
+          if (values.rechargeType !== 'privatePocket' && fileList.length <= 0) {
             message.error('凭证不能为空');
             return;
           }
@@ -278,6 +281,12 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
               }
             }
           }
+          // 所有充值类型都传递rechargeType参数
+          // 如果是隐私钱包充值且不需要凭证，直接创建空凭证数组
+          if (values.rechargeType === 'privatePocket' && fileList.length <= 0) {
+            values.proofImages = [];
+          }
+          // 普通充值流程
           let res = await postServiceOrderFileProcess({
             data: formData,
           });
@@ -302,6 +311,8 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
                 data: {
                   ...values,
                   customerName: form.getFieldValue('customerNameString'),
+                  // 传递充值类型参数
+                  rechargeType: values.rechargeType || 'normal',
                 },
               });
             } else {
@@ -312,7 +323,11 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
                 body.customerName = customerNameString;
               }
               res = await postPrepaidUpdate({
-                data: body,
+                data: {
+                  ...body,
+                  // 传递充值类型参数
+                  rechargeType: values.rechargeType || 'normal',
+                },
               });
             }
  
@@ -416,6 +431,21 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
           rules={[{ required: true, message: '销售代表必填' }]}
           options={salesCodeOptions}
         />
+        <ProFormSelect
+          name="rechargeType"
+          label="充值类型"
+          initialValue="normal"
+          valueEnum={{
+            normal: '普通充值',
+            privatePocket: '隐私钱包充值',
+          }}
+          fieldProps={{
+            onChange: (value) => {
+              setRechargeType(value);
+            },
+          }}
+          rules={[{ required: true, message: '请选择充值类型' }]}
+        />
         <ProFormDigit
           name="rechargeAmount"
           label="充值金额（￥）"
@@ -4823,6 +4823,45 @@ export interface UserNowMoneyCheckRequest {
   uid?: number;
 }
  
+export interface UserPrivatePocketBalanceUpdateRequest {
+  /**
+   * @description
+   *   用户账号
+   */
+  account: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
+  /**
+   * @description
+   *   用户余额
+   */
+  nowMoney?: number;
+  /**
+   * @description
+   *   隐私余额
+   */
+  privateMoney?: number;
+  /**
+   * @description
+   *   真实姓名
+   */
+  realName?: string;
+  /**
+   * @description
+   *   负责销售
+   */
+  salesCode: string;
+  /**
+   * @description
+   *   用户id
+   * @format int32
+   */
+  uid?: number;
+}
+
 export interface UserPrivatePocketDeleteRequest {
   /**
    * @description
@@ -5562,6 +5601,11 @@ export interface SalesRechargePrepaymentAuditRequest {
    *   手机号
    */
   phone?: string;
+  /**
+   * @description
+   *   销售代表编码
+   */
+  salescode?: string;
 }
  
 export interface SalesRechargePrepaymentCreateRequest {
@@ -5602,6 +5646,13 @@ export interface SalesRechargePrepaymentCreateRequest {
   rechargeSource?: string;
   /**
    * @description
+   *   充值类型
+   * @example
+   *   normal
+   */
+  rechargeType?: string;
+  /**
+   * @description
    *   销售代表
    */
   salesCode?: string;
@@ -167,6 +167,7 @@ import type {
   UserDetailRequest,
   UserListRequest,
   UserNowMoneyCheckRequest,
+  UserPrivatePocketBalanceUpdateRequest,
   UserPrivatePocketDeleteRequest,
   UserPrivatePocketDetailRequest,
   UserPrivatePocketListRequest,
@@ -3429,6 +3430,77 @@ export const postCanrdPrivatePocketSave = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postCanrdPrivatePocketUpdateBalance */
+export interface PostCanrdPrivatePocketUpdateBalanceOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: UserPrivatePocketBalanceUpdateRequest;
+  };
+}
+
+/** @description response type for postCanrdPrivatePocketUpdateBalance */
+export interface PostCanrdPrivatePocketUpdateBalanceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostCanrdPrivatePocketUpdateBalanceResponseSuccess =
+  PostCanrdPrivatePocketUpdateBalanceResponse[200];
+/**
+ * @description
+ *   更新用户隐私钱包余额
+ * @tags user-private-pocket-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postCanrdPrivatePocketUpdateBalance = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/canrd/privatePocket/updateBalance';
+  function request(
+    option: PostCanrdPrivatePocketUpdateBalanceOption,
+  ): Promise<PostCanrdPrivatePocketUpdateBalanceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostCanrdPrivatePocketUpdateBalanceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postCommonAudit */
 export interface PostCommonAuditOption {
   /**