feat: 开发用户列表积分显示与积分兑换

boyang
1 parent 7d171173
Showing 5 changed files with 372 additions and 50 deletions
src/pages/Prepaid/components/PointsExchangeModal.tsx
src/pages/Prepaid/constant.tsx
src/pages/Prepaid/index.tsx
src/services/definition.ts
src/services/request.ts
+import { postIntegralExchangeIntegral } from '@/services/request';
+import {
+  ModalForm,
+  ProFormInstance,
+  ProFormTextArea,
+} from '@ant-design/pro-components';
+import { Form, Input, message } from 'antd';
+import React, { useRef } from 'react';
+import '../index.less';
+
+interface PointsExchangeModalProps {
+  setVisible: (visible: boolean) => void;
+  userInfoObj: {
+    uid: string;
+    nickname?: string;
+    realName?: string;
+    [key: string]: any;
+  };
+  onClose: () => void;
+}
+
+const PointsExchangeModal: React.FC<PointsExchangeModalProps> = ({
+  setVisible,
+  userInfoObj,
+  onClose,
+}) => {
+  const [form] = Form.useForm<{ delta: string; remark: string }>();
+  const formRef = useRef<ProFormInstance>();
+  const uid = userInfoObj?.uid;
+  const userName = userInfoObj?.nickname || userInfoObj?.realName || '';
+
+  return (
+    <div className="prepaid-index">
+      <ModalForm<{
+        delta: string;
+        remark: string;
+      }>
+        width={600}
+        open
+        title="积分兑换"
+        form={form}
+        formRef={formRef}
+        autoFocusFirstInput
+        submitter={{
+          searchConfig: {
+            submitText: '确认兑换',
+            resetText: '取消',
+          },
+        }}
+        modalProps={{
+          destroyOnClose: true,
+          onCancel: () => {
+            setVisible(false);
+          },
+        }}
+        onFinish={async (values) => {
+          try {
+            // 调用积分兑换API
+            await postIntegralExchangeIntegral({
+              data: {
+                id: Number(uid), // 使用用户的uid作为id参数
+                delta: values.delta, // 将delta设为负数
+                remark: values.remark, // 兑换说明
+                createByName: userName, // 使用昵称或真实姓名作为createByName
+              },
+            });
+
+            message.success('积分兑换成功');
+            setVisible(false);
+            onClose();
+            return true;
+          } catch (error) {
+            console.error(error);
+            return false;
+          }
+        }}
+        onOpenChange={setVisible}
+      >
+        <Form.Item
+          label="兑换积分"
+          name="delta"
+          rules={[{ required: true, message: '请输入兑换积分' }]}
+        >
+          <Input style={{ height: '30px' }} placeholder="请输入兑换积分数量" />
+        </Form.Item>
+
+        <Form.Item
+          label="兑换说明"
+          name="remark"
+          rules={[{ required: true, message: '请输入兑换说明' }]}
+        >
+          <ProFormTextArea
+            style={{ height: '100px' }}
+            placeholder="请输入兑换说明"
+          />
+        </Form.Item>
+      </ModalForm>
+    </div>
+  );
+};
+
+export default PointsExchangeModal;
@@ -187,6 +187,27 @@ export const ACCOUNT_COLUMNS = [
     hideInSearch: true,
   },
   {
+    title: '账户积分',
+    dataIndex: 'delta',
+    key: 'delta',
+    valueType: 'number',
+    hideInSearch: true,
+  },
+  {
+    title: '待领取积分',
+    dataIndex: 'pendingDelta',
+    key: 'pendingDelta',
+    valueType: 'number',
+    hideInSearch: true,
+  },
+  {
+    title: '已扣除积分',
+    dataIndex: 'deleteDelta',
+    key: 'deleteDelta',
+    valueType: 'number',
+    hideInSearch: true,
+  },
+  {
     title: '账号',
     dataIndex: 'account',
     key: 'account',
@@ -16,6 +16,7 @@ import React, { useRef, useState } from &#39;react&#39;;
 import CheckModal from '../Order/Order/components/CheckModal';
 import { CHECK_TYPE } from '../Order/constant';
 import BalanceChangeRecordsModal from './components/BalanceChangeRecordsModal';
+import PointsExchangeModal from './components/PointsExchangeModal';
 import RechargePrepaymentModal from './components/RechargePrepaymentModal';
 import {
   ACCOUNT_COLUMNS,
@@ -23,18 +24,21 @@ import {
   SALES_RECHARGE_PREPAYMENT_COLUMNS,
 } from './constant';
 import './index.less';
+
 const PrepaidPage = () => {
   const prepaidActionRef = useRef<ActionType>();
   const accountActionRef = useRef<ActionType>();
   const [rechargePrepaymentModalVisible, setRechargePrepaymentModalVisible] =
-    useState(false);
+    useState<boolean>(false);
   const [currentOptPrepaymentObj, setCurrentOptPrepaymentObj] = useState(null);
   const [currentOptUserObj, setCurrentOptUserObj] = useState(null);
-  const [checkVisible, setCheckVisible] = useState(false);
+  const [checkVisible, setCheckVisible] = useState<boolean>(false);
   const [
     balanceChangeRecordsModalVisible,
     setBalanceChangeRecordsModalVisible,
-  ] = useState(false);
+  ] = useState<boolean>(false);
+  const [pointsExchangeModalVisible, setPointsExchangeModalVisible] =
+    useState<boolean>(false);
  
   const reloadPrepaidTable = () => {
     prepaidActionRef.current?.reload();
@@ -194,11 +198,24 @@ const PrepaidPage = () =&gt; {
       valueType: 'option',
       key: 'option',
       fixed: 'right',
-      width: 120,
+      width: 200,
       render: (text, record) => {
         let btns = [];
         btns.push(
           <Button
+            className="p-0 ml-2"
+            key="points"
+            type="link"
+            onClick={() => {
+              setCurrentOptUserObj(record);
+              setPointsExchangeModalVisible(true);
+            }}
+          >
+            积分兑换
+          </Button>,
+        );
+        btns.push(
+          <Button
             className="p-0"
             key="view"
             type="link"
@@ -377,6 +394,19 @@ const PrepaidPage = () =&gt; {
           }}
         />
       )}
+
+      {pointsExchangeModalVisible && currentOptUserObj && (
+        <PointsExchangeModal
+          setVisible={(val: boolean) => {
+            setPointsExchangeModalVisible(val);
+          }}
+          userInfoObj={currentOptUserObj}
+          onClose={() => {
+            setPointsExchangeModalVisible(false);
+            reloadAccountTable();
+          }}
+        />
+      )}
     </div>
   );
 };
@@ -1521,30 +1521,12 @@ export interface Entry {
   unEmpInsuranceC?: string;
 }
  
-export interface File {
-  absolute?: boolean;
-  absoluteFile?: File;
-  absolutePath?: string;
-  canonicalFile?: File;
-  canonicalPath?: string;
-  directory?: boolean;
-  executable?: boolean;
-  file?: boolean;
-  /** @format int64 */
-  freeSpace?: number;
-  hidden?: boolean;
-  /** @format int64 */
-  lastModified?: number;
-  name?: string;
-  parent?: string;
-  parentFile?: File;
-  path?: string;
-  readable?: boolean;
-  /** @format int64 */
-  totalSpace?: number;
+export interface ExchangeIntegralDto {
+  createByName?: string;
+  delta?: number;
   /** @format int64 */
-  usableSpace?: number;
-  writable?: boolean;
+  id?: number;
+  remark?: string;
 }
  
 export interface FilePathDto {
@@ -1687,6 +1669,11 @@ export interface InvoiceDto {
   orderTypeText?: string;
   /**
    * @description
+   *   买方税号
+   */
+  partyATaxid?: string;
+  /**
+   * @description
    *   权限路径
    */
   path?: Array<string>;
@@ -4102,7 +4089,7 @@ export interface ResetPwdVO {
  
 export interface Resource {
   description?: string;
-  file?: File;
+  file?: TsgFile;
   filename?: string;
   inputStream?: InputStream;
   open?: boolean;
@@ -4810,6 +4797,32 @@ export interface CompanyInfo {
   taxIdIsNotNull?: boolean;
 }
  
+export interface TsgFile {
+  absolute?: boolean;
+  absoluteFile?: TsgFile;
+  absolutePath?: string;
+  canonicalFile?: TsgFile;
+  canonicalPath?: string;
+  directory?: boolean;
+  executable?: boolean;
+  file?: boolean;
+  /** @format int64 */
+  freeSpace?: number;
+  hidden?: boolean;
+  /** @format int64 */
+  lastModified?: number;
+  name?: string;
+  parent?: string;
+  parentFile?: TsgFile;
+  path?: string;
+  readable?: boolean;
+  /** @format int64 */
+  totalSpace?: number;
+  /** @format int64 */
+  usableSpace?: number;
+  writable?: boolean;
+}
+
 export interface InvoiceDetail {
   createByName?: string;
   /** @format date-time */
@@ -56,6 +56,7 @@ import type {
   DistrictDo,
   DistrictSearchDo,
   Dto,
+  ExchangeIntegralDto,
   FeedbackRegistrationDTO,
   InventoryMaterialStockReq,
   InvoiceBatchDownloadDto,
@@ -71,7 +72,6 @@ import type {
   MeasureUnitListRes,
   MergeIntegralDto,
   MessageQueryDTO,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -3830,7 +3830,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -3851,9 +3853,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -3877,7 +3879,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -3903,9 +3907,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -3930,7 +3934,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -3956,9 +3962,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -3983,7 +3989,9 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -4004,9 +4012,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -4030,7 +4038,9 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -4051,9 +4061,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -4078,7 +4088,9 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -4099,9 +4111,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -4126,7 +4138,9 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -4147,9 +4161,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -4238,6 +4252,77 @@ export const postFileDirectDown = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postIntegralExchangeIntegral */
+export interface PostIntegralExchangeIntegralOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ExchangeIntegralDto;
+  };
+}
+
+/** @description response type for postIntegralExchangeIntegral */
+export interface PostIntegralExchangeIntegralResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostIntegralExchangeIntegralResponseSuccess =
+  PostIntegralExchangeIntegralResponse[200];
+/**
+ * @description
+ *   积分兑换
+ * @tags 积分接口
+ * @produces *
+ * @consumes application/json
+ */
+export const postIntegralExchangeIntegral = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/integral/exchangeIntegral';
+  function request(
+    option: PostIntegralExchangeIntegralOption,
+  ): Promise<PostIntegralExchangeIntegralResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostIntegralExchangeIntegralResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postIntegralGetIntegralRecordTypes */
 export interface PostIntegralGetIntegralRecordTypesResponse {
   /**
@@ -21212,6 +21297,77 @@ export const postServiceOrderExport = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postServiceOrderExportLockOrders */
+export interface PostServiceOrderExportLockOrdersOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: QueryWarningOrderStatistics;
+  };
+}
+
+/** @description response type for postServiceOrderExportLockOrders */
+export interface PostServiceOrderExportLockOrdersResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: any;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderExportLockOrdersResponseSuccess =
+  PostServiceOrderExportLockOrdersResponse[200];
+/**
+ * @description
+ *   exportLockOrders
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderExportLockOrders = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/exportLockOrders';
+  function request(
+    option: PostServiceOrderExportLockOrdersOption,
+  ): Promise<PostServiceOrderExportLockOrdersResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderExportLockOrdersResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceOrderExportTemplate */
 export interface PostServiceOrderExportTemplateResponse {
   /**