feat(Order): 新增重新开票功能

- 在订单列表页面添加重新开票按钮 - 在开票抽屉表单中增加重开发票相关字段和逻辑 - 优化开票申请流程，支持重开原因和重开发票选择

feat(Order): 新增重新开票功能
- 在订单列表页面添加重新开票按钮 - 在开票抽屉表单中增加重开发票相关字段和逻辑 - 优化开票申请流程，支持重开原因和重开发票选择
曾国涛
1 parent 70550778
Showing 4 changed files with 1095 additions and 177 deletions
src/pages/Order/OrderList/InvoicingDrawerForm.tsx
src/pages/Order/OrderList/OrderList.tsx
src/services/definition.ts
src/services/request.ts
@@ -188,6 +188,7 @@ export default ({
             subOrderIds: dataListCopy.map((item) => {
               return item.id;
             }),
+            applyType: type,
           },
         });
         onClose();
@@ -213,23 +214,6 @@ export default ({
         </ProFormGroup>
       </ProFormList>
       <ProFormSelect
-        name="invoices"
-        label="invoices"
-        request={async () => {
-          let reissueIds = dataListCopy.map((item) => {
-            return item.id;
-          });
-          let res = await postServiceInvoiceWaitReissueInvoices({
-            data: reissueIds,
-          });
-          return enum2ReverseSelect(res.data);
-        }}
-        fieldProps={{
-          mode: 'multiple',
-        }}
-        placeholder="请选择要重开的发票"
-      />
-      <ProFormSelect
         name="ReissueInvoiceRecordIds"
         label="重开的发票"
         fieldProps={{
@@ -245,7 +229,21 @@ export default ({
           });
           return enum2ReverseSelect(res.data);
         }}
+        rules={
+          type === 'reissue'
+            ? [{ required: true, message: '重开发票必填' }]
+            : []
+        }
       />
+      {type === 'reissue' && (
+        <ProFormTextArea
+          name="reissueNotes"
+          label="重开原因"
+          rules={[{ required: true, message: '重开原因必填' }]}
+          placeholder="请输入重新开票的原因"
+        />
+      )}
+
       <ProFormSelect
         key="key"
         label="购方名称"
@@ -157,6 +157,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
     useState<boolean>(false);
   const [historyModalVisible, setHistoryModalVisible] =
     useState<boolean>(false);
+  const [invoicingType, setInvoicingType] = useState<string>('');
   const [isRePrintOrder, setIsRePrintOrder] = useState<boolean>(false);
   const [isSendProduct, setIsSendProduct] = useState<boolean>(false);
   const [isMainOrder, setIsMainOrder] = useState<boolean>(false);
@@ -1846,6 +1847,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                 className="p-0"
                 type="link"
                 onClick={() => {
+                  setInvoicingType('applyInvoicing');
                   setInvoicingDrawerFormVisible(true);
                   createOptObject(optRecord.id, record.id);
                   setIsEdit(false);
@@ -3476,6 +3478,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                         }
                         createOptObject(null, record.id);
+                        setInvoicingType('applyInvoicing');
                         setInvoicingDrawerFormVisible(true);
                         setIsEdit(false);
                         setIsMainOrder(false);
@@ -3517,7 +3520,6 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                           ) {
                             //是审核通过及之后的订单
                             if (
-                              orderStatus !== 'UNAUDITED' &&
                               orderStatus !== 'AUDIT_FAILED' &&
                               orderStatus !== 'LEADER_PROCESS' &&
                               orderStatus !== 'SALES_CONFIRM' &&
@@ -4467,6 +4469,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
       onClick={() => {
         setIsEdit(false);
         setIsMainOrder(true);
+        setInvoicingType('applyInvoicing');
         setInvoicingDrawerFormVisible(true);
       }}
       disabled={selectedSubOrderKeys?.length === 0}
@@ -4530,6 +4533,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               return;
             }
           });
+          setInvoicingType('applyInvoicing');
           //遍历afterInvoicingStatusList
           setInvoicingDrawerFormVisible(true);
         }}
@@ -4537,6 +4541,19 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
       >
         申请开票
       </Button>,
+      <Button
+        type="primary"
+        key="inv"
+        onClick={() => {
+          setIsMainOrder(true);
+          setInvoicingType('reissue');
+          //遍历afterInvoicingStatusList
+          setInvoicingDrawerFormVisible(true);
+        }}
+        disabled={selectedSubOrderKeys?.length === 0}
+      >
+        重新开票
+      </Button>,
     );
     if (rolePath?.includes('addOrder')) {
@@ -5211,6 +5228,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               ? [...subOrderSelectedMap.values()].flat()
               : buildSubOrders()
           }
+          type={invoicingType}
           setVisible={(val: boolean) => {
             setInvoicingDrawerFormVisible(val);
             if (!val) {
@@ -99,6 +99,11 @@ export interface AdminClientDto {
   address?: string;
   /**
    * @description
+   *   关联销售
+   */
+  affiliateSales?: Array<any>;
+  /**
+   * @description
    *   市
    */
   city?: string;
@@ -561,6 +566,16 @@ export interface ApiCreateOrderRequest {
   institutionContactName?: string;
   /**
    * @description
+   *   发票备注
+   */
+  invoiceIdentificationNumber?: string;
+  /**
+   * @description
+   *   发票状态
+   */
+  invoicingStatus?: string;
+  /**
+   * @description
    *   商品列表
    */
   list?: Array<ApiCreateProductRequest>;
@@ -584,6 +599,8 @@ export interface ApiCreateOrderRequest {
    *   支付方式
    */
   paymentMethod?: string;
+  /** @format int64 */
+  researchGroupId?: number;
   /**
    * @description
    *   销售代表
@@ -1079,6 +1096,13 @@ export interface CaptchaMessageVO {
   type?: string;
 }
+export interface ClaimPointsDto {
+  orderIds?: Array<number>;
+  /** @format int32 */
+  uid?: number;
+  userPhone?: string;
+}
+
 export interface CommonAuditRequest {
   extend?: any;
   /**
@@ -2172,6 +2196,21 @@ export interface MeasureUnitListResRow {
   precision?: string;
 }
+export interface MergeIntegralDto {
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  /** @format int64 */
+  groupId?: number;
+  logicDelete?: boolean;
+  paths?: Array<string>;
+  /** @format int32 */
+  uid?: number;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+}
+
 export interface MessageQueryDTO {
   createByName?: string;
   /** @format int32 */
@@ -2976,6 +3015,28 @@ export interface QueryCustomerInformationDto {
   name?: string;
 }
+export interface QueryGroupIntegralRecordDto {
+  createByName?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
+  /** @format int32 */
+  current?: number;
+  detalGe?: number;
+  /** @format int32 */
+  end?: number;
+  /** @format int64 */
+  groupId?: number;
+  /** @format int32 */
+  pageSize?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+  type?: string;
+}
+
 export interface QueryHistoryRecordDto {
   /**
    * @description
@@ -3240,6 +3301,16 @@ export interface QueryProcureReturnBillDto {
   total?: number;
 }
+export interface QueryRelatedProducts {
+  productName?: string;
+  userPhone?: string;
+}
+
+export interface QueryRelatedSchools {
+  productNames?: Array<string>;
+  userPhone?: string;
+}
+
 export interface QueryReportFormsDto {
   /**
    * @description
@@ -3290,8 +3361,24 @@ export interface QueryUseOldInvoicingDto {
   total?: number;
 }
+export interface QueryUserIntegralRecordDto {
+  createByName?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /** @format int32 */
+  pageSize?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+  uid?: string;
+}
+
 export interface QueryWarningOrderStatistics {
   excludeWhiteList?: boolean;
+  querySelf?: boolean;
   salesCode?: string;
   /** @format date-time */
   waitConfirmInvoiceStatusDateTimeLe?: string;
@@ -3303,6 +3390,8 @@ export interface QueryWarningOrderStatistics {
   waitConfirmReiceptStatusDateTimeLe?: string;
   /** @format date-time */
   waitFeedbackStatusDateTimeLe?: string;
+  /** @format date-time */
+  waitInvoicingStatusDateTimeLe?: string;
 }
 export interface QueryWarningOrderWhiteListDto {
@@ -3359,55 +3448,6 @@ export interface ReissueInvoiceDto {
   purchaser?: string;
 }
-export interface ResearchGroupAddRequest {
-  accounts?: Array<ResearchGroupAccounts>;
-  /**
-   * @description
-   *   单位名称
-   */
-  companyName?: string;
-  createByName?: string;
-  /** @format date-time */
-  createTime?: string;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   负责人
-   */
-  leaderName?: string;
-  logicDelete?: boolean;
-  members?: Array<ResearchGroupMembers>;
-  paths?: Array<string>;
-  /**
-   * @description
-   *   状态
-   */
-  status?: string;
-  /**
-   * @description
-   *   冗余字段，当前状态备注
-   */
-  statusNotes?: string;
-  /**
-   * @description
-   *   状态文本
-   */
-  statusText?: string;
-  updateByName?: string;
-  /** @format date-time */
-  updateTime?: string;
-}
-
 export interface ResearchGroupDeleteRequest {
   /**
    * @description
@@ -3454,6 +3494,7 @@ export interface ResearchGroupEditRequest {
   logicDelete?: boolean;
   members?: Array<ResearchGroupMembers>;
   paths?: Array<string>;
+  requestStatus?: string;
   /**
    * @description
    *   状态
@@ -3480,6 +3521,7 @@ export interface ResearchGroupListRequest {
    *   预存账号手机号
    */
   accountPhone?: string;
+  addAuditPass?: boolean;
   /**
    * @description
    *   公司名称
@@ -3502,6 +3544,11 @@ export interface ResearchGroupListRequest {
   idIn?: Array<number>;
   /**
    * @description
+   *   是否包含正在申请的课题组
+   */
+  includeApplying?: boolean;
+  /**
+   * @description
    *   课题组负责人
    */
   leaderName?: string;
@@ -3516,6 +3563,8 @@ export interface ResearchGroupListRequest {
    */
   memberPhone?: string;
   /** @format int32 */
+  page?: number;
+  /** @format int32 */
   pageSize?: number;
   /** @format int32 */
   start?: number;
@@ -3614,7 +3663,62 @@ export interface ResearchGroupMemberRequestDetailRequest {
   id?: number;
 }
-export interface ResearchGroupMemberRequestEditRequest {
+export interface ResearchGroupMemberRequestsRequest {
+  /**
+   * @description
+   *   审核备注
+   */
+  auditNotes?: string;
+  /**
+   * @description
+   *   审核状态
+   */
+  auditStatus?: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /**
+   * @description
+   *   课题组id
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  idIn?: Array<number>;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+  /** @format int32 */
+  pageSize?: number;
+  /**
+   * @description
+   *   申请备注
+   */
+  requestNotes?: string;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+}
+
+export interface ResearchGroupRequestsDto {
   /**
    * @description
    *   审核备注
@@ -3682,52 +3786,54 @@ export interface ResearchGroupMemberRequestEditRequest {
   updateTime?: string;
 }
-export interface ResearchGroupMemberRequestsRequest {
+export interface ResearchGroupsDTO {
+  accounts?: Array<ResearchGroupAccounts>;
   /**
    * @description
-   *   审核备注
+   *   单位名称
    */
-  auditNotes?: string;
+  companyName?: string;
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
   /**
    * @description
-   *   审核状态
+   *   课题组名称
    */
-  auditStatus?: string;
+  groupName?: string;
   /**
    * @description
-   *   创建人
+   *   主键id
+   * @format int64
    */
-  createByName?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
+  id?: number;
   /**
    * @description
-   *   课题组名称
+   *   负责人
    */
-  groupName?: string;
+  leaderName?: string;
+  logicDelete?: boolean;
+  members?: Array<ResearchGroupMembers>;
+  paths?: Array<string>;
+  requestStatus?: string;
   /**
    * @description
-   *   成员名称
+   *   状态
    */
-  memberName?: string;
+  status?: string;
   /**
    * @description
-   *   成员手机号
+   *   冗余字段，当前状态备注
    */
-  memberPhone?: string;
-  /** @format int32 */
-  pageSize?: number;
+  statusNotes?: string;
   /**
    * @description
-   *   申请备注
+   *   状态文本
    */
-  requestNotes?: string;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
+  statusText?: string;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
 }
 export interface ResetPwdVO {
@@ -3808,6 +3914,9 @@ export interface SubOrder {
   /** @format int64 */
   id?: number;
   image?: string;
+  integral?: number;
+  /** @format date-time */
+  integralCollectionTime?: string;
   invoiceApplyUsername?: string;
   invoiceConfirmStatus?: string;
   /** @format date-time */
@@ -3878,6 +3987,8 @@ export interface SubOrder {
   quantity?: number;
   receivingCompany?: string;
   reissueNotes?: string;
+  /** @format int64 */
+  researchGroupId?: number;
   serialNumber?: string;
   shippingWarehouse?: string;
   /** @format date-time */
@@ -4360,6 +4471,7 @@ export interface ClientCommunicationInfo {
   logicDelete?: boolean;
   ticketsAttachments?: string;
   ticketsDetail?: string;
+  ticketsStatus?: string;
   ticketsType?: string;
   ticketsTypeText?: string;
   /**
@@ -4521,6 +4633,7 @@ export interface ResearchGroupAccounts {
    */
   id?: number;
   logicDelete?: boolean;
+  paths?: Array<string>;
   updateByName?: string;
   /** @format date-time */
   updateTime?: string;
@@ -4542,6 +4655,12 @@ export interface ResearchGroupMembers {
    * @format int64
    */
   id?: number;
+  /**
+   * @description
+   *   成员等级
+   * @format int64
+   */
+  levelStatus?: number;
   logicDelete?: boolean;
   /**
    * @description
@@ -38,6 +38,7 @@ import type {
   CancelInvoiceRecordDto,
   CancelSendOrderDto,
   CaptchaMessageVO,
+  ClaimPointsDto,
   ClientCommunicationInfo,
   CommonAuditRequest,
   CompanyInfo,
@@ -66,8 +67,8 @@ import type {
   MaterialStockRes,
   MaterialUnitListRes,
   MeasureUnitListRes,
+  MergeIntegralDto,
   MessageQueryDTO,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -97,20 +98,23 @@ import type {
   QueryClientDto,
   QueryCommunicationInfoDto,
   QueryCustomerInformationDto,
+  QueryGroupIntegralRecordDto,
   QueryHistoryRecordDto,
   QueryInvoiceDetailDto,
   QueryInvoiceProjectDto,
   QueryInvoiceRecordDto,
   QueryMainOrderDto,
   QueryProcureReturnBillDto,
+  QueryRelatedProducts,
+  QueryRelatedSchools,
   QueryReportFormsDto,
   QueryUseOldInvoicingDto,
+  QueryUserIntegralRecordDto,
   QueryWarningOrderStatistics,
   QueryWarningOrderWhiteListDto,
   QueryWarningUserWhiteListDto,
   QueryWriteOffRecordDto,
   ReissueInvoiceDto,
-  ResearchGroupAddRequest,
   ResearchGroupDeleteRequest,
   ResearchGroupDetailRequest,
   ResearchGroupEditRequest,
@@ -118,8 +122,9 @@ import type {
   ResearchGroupMemberRequestAddRequest,
   ResearchGroupMemberRequestDeleteRequest,
   ResearchGroupMemberRequestDetailRequest,
-  ResearchGroupMemberRequestEditRequest,
   ResearchGroupMemberRequestsRequest,
+  ResearchGroupRequestsDto,
+  ResearchGroupsDTO,
   ResetPwdVO,
   SalOrderSaveDto,
   SalesRechargePrepaymentAuditRequest,
@@ -1363,6 +1368,77 @@ export const postApiOrderApplyAfterSales = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postApiOrderClaimPoints */
+export interface PostApiOrderClaimPointsOption {
+  /**
+   * @description
+   *   claimPointsDto
+   */
+  body: {
+    /**
+        @description
+          claimPointsDto */
+    claimPointsDto: ClaimPointsDto;
+  };
+}
+
+/** @description response type for postApiOrderClaimPoints */
+export interface PostApiOrderClaimPointsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostApiOrderClaimPointsResponseSuccess =
+  PostApiOrderClaimPointsResponse[200];
+/**
+ * @description
+ *   领取积分
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postApiOrderClaimPoints = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/api/order/claimPoints';
+  function request(
+    option: PostApiOrderClaimPointsOption,
+  ): Promise<PostApiOrderClaimPointsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostApiOrderClaimPointsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postApiOrderConfirmReceive */
 export interface PostApiOrderConfirmReceiveOption {
   /**
@@ -2056,6 +2132,148 @@ export const postApiOrderQueryServiceOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postApiOrderRelatedProducts */
+export interface PostApiOrderRelatedProductsOption {
+  /**
+   * @description
+   *   queryRelatedProducts
+   */
+  body: {
+    /**
+        @description
+          queryRelatedProducts */
+    queryRelatedProducts: QueryRelatedProducts;
+  };
+}
+
+/** @description response type for postApiOrderRelatedProducts */
+export interface PostApiOrderRelatedProductsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostApiOrderRelatedProductsResponseSuccess =
+  PostApiOrderRelatedProductsResponse[200];
+/**
+ * @description
+ *   获取用户购买某个商品关联的其他商品
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postApiOrderRelatedProducts = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/api/order/relatedProducts';
+  function request(
+    option: PostApiOrderRelatedProductsOption,
+  ): Promise<PostApiOrderRelatedProductsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostApiOrderRelatedProductsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postApiOrderRelatedSchools */
+export interface PostApiOrderRelatedSchoolsOption {
+  /**
+   * @description
+   *   queryRelatedSchools
+   */
+  body: {
+    /**
+        @description
+          queryRelatedSchools */
+    queryRelatedSchools: QueryRelatedSchools;
+  };
+}
+
+/** @description response type for postApiOrderRelatedSchools */
+export interface PostApiOrderRelatedSchoolsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostApiOrderRelatedSchoolsResponseSuccess =
+  PostApiOrderRelatedSchoolsResponse[200];
+/**
+ * @description
+ *   获取购买某个商品的学校
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postApiOrderRelatedSchools = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/api/order/relatedSchools';
+  function request(
+    option: PostApiOrderRelatedSchoolsOption,
+  ): Promise<PostApiOrderRelatedSchoolsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostApiOrderRelatedSchoolsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postApiOrderStoreApplyInvoice */
 export interface PostApiOrderStoreApplyInvoiceOption {
   /**
@@ -3318,7 +3536,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -3339,9 +3559,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';
@@ -3365,7 +3585,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -3391,9 +3613,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__ */ (() => {
@@ -3418,7 +3640,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -3444,9 +3668,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__ */ (() => {
@@ -3471,12 +3695,349 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
+  /**
+   * @description
+   *   No Content
+   */
+  204: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+}
+
+export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
+/**
+ * @description
+ *   error
+ * @tags basic-error-controller
+ * @produces *
+ */
+export const deleteError = /* #__PURE__ */ (() => {
+  const method = 'delete';
+  const url = '/error';
+  function request(): Promise<DeleteErrorResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<DeleteErrorResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description response type for optionsError */
+export interface OptionsErrorResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: {
+    [propertyName: string]: any;
+  };
+  /**
+   * @description
+   *   No Content
+   */
+  204: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+}
+
+export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
+/**
+ * @description
+ *   error
+ * @tags basic-error-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const optionsError = /* #__PURE__ */ (() => {
+  const method = 'options';
+  const url = '/error';
+  function request(): Promise<OptionsErrorResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<OptionsErrorResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description response type for headError */
+export interface HeadErrorResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: {
+    [propertyName: string]: any;
+  };
+  /**
+   * @description
+   *   No Content
+   */
+  204: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+}
+
+export type HeadErrorResponseSuccess = HeadErrorResponse[200];
+/**
+ * @description
+ *   error
+ * @tags basic-error-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const headError = /* #__PURE__ */ (() => {
+  const method = 'head';
+  const url = '/error';
+  function request(): Promise<HeadErrorResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<HeadErrorResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description response type for patchError */
+export interface PatchErrorResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: {
+    [propertyName: string]: any;
+  };
+  /**
+   * @description
+   *   No Content
+   */
+  204: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+}
+
+export type PatchErrorResponseSuccess = PatchErrorResponse[200];
+/**
+ * @description
+ *   error
+ * @tags basic-error-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const patchError = /* #__PURE__ */ (() => {
+  const method = 'patch';
+  const url = '/error';
+  function request(): Promise<PatchErrorResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PatchErrorResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postFileDirectDown */
+export interface PostFileDirectDownOption {
+  /**
+   * @description
+   *   urls
+   */
+  body: {
+    /**
+        @description
+          urls */
+    urls: Array<string>;
+  };
+}
+
+/** @description response type for postFileDirectDown */
+export interface PostFileDirectDownResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: any;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostFileDirectDownResponseSuccess = PostFileDirectDownResponse[200];
+/**
+ * @description
+ *   directDownFile
+ * @tags file-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postFileDirectDown = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/file/directDown';
+  function request(
+    option: PostFileDirectDownOption,
+  ): Promise<PostFileDirectDownResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostFileDirectDownResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description response type for postIntegralGetIntegralRecordTypes */
+export interface PostIntegralGetIntegralRecordTypesResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostIntegralGetIntegralRecordTypesResponseSuccess =
+  PostIntegralGetIntegralRecordTypesResponse[200];
+/**
+ * @description
+ *   获取积分记录类型
+ * @tags 积分接口
+ * @produces *
+ * @consumes application/json
+ */
+export const postIntegralGetIntegralRecordTypes = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/integral/getIntegralRecordTypes';
+  function request(): Promise<PostIntegralGetIntegralRecordTypesResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostIntegralGetIntegralRecordTypesResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postIntegralMergeUserIntegralToGroup */
+export interface PostIntegralMergeUserIntegralToGroupOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: MergeIntegralDto;
+  };
+}
+
+/** @description response type for postIntegralMergeUserIntegralToGroup */
+export interface PostIntegralMergeUserIntegralToGroupResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
   /**
    * @description
-   *   No Content
+   *   Created
    */
-  204: any;
+  201: any;
   /**
    * @description
    *   Unauthorized
@@ -3487,22 +4048,32 @@ export interface DeleteErrorResponse {
    *   Forbidden
    */
   403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
 }
-export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
+export type PostIntegralMergeUserIntegralToGroupResponseSuccess =
+  PostIntegralMergeUserIntegralToGroupResponse[200];
 /**
  * @description
- *   errorHtml
- * @tags basic-error-controller
- * @produces text/html
+ *   并入积分到课题组
+ * @tags 积分接口
+ * @produces *
+ * @consumes application/json
  */
-export const deleteError = /* #__PURE__ */ (() => {
-  const method = 'delete';
-  const url = '/error';
-  function request(): Promise<DeleteErrorResponseSuccess> {
+export const postIntegralMergeUserIntegralToGroup = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/integral/mergeUserIntegralToGroup';
+  function request(
+    option: PostIntegralMergeUserIntegralToGroupOption,
+  ): Promise<PostIntegralMergeUserIntegralToGroupResponseSuccess> {
     return requester(request.url, {
       method: request.method,
-    }) as unknown as Promise<DeleteErrorResponseSuccess>;
+      ...option,
+    }) as unknown as Promise<PostIntegralMergeUserIntegralToGroupResponseSuccess>;
   }
   /** http method */
@@ -3512,18 +4083,32 @@ export const deleteError = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
-/** @description response type for optionsError */
-export interface OptionsErrorResponse {
+/** @description request parameter type for postIntegralQueryByGroup */
+export interface PostIntegralQueryByGroupOption {
+  /**
+   * @description
+   *   query
+   */
+  body: {
+    /**
+        @description
+          query */
+    query: QueryGroupIntegralRecordDto;
+  };
+}
+
+/** @description response type for postIntegralQueryByGroup */
+export interface PostIntegralQueryByGroupResponse {
   /**
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: ServerResult;
   /**
    * @description
-   *   No Content
+   *   Created
    */
-  204: any;
+  201: any;
   /**
    * @description
    *   Unauthorized
@@ -3534,23 +4119,32 @@ export interface OptionsErrorResponse {
    *   Forbidden
    */
   403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
 }
-export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
+export type PostIntegralQueryByGroupResponseSuccess =
+  PostIntegralQueryByGroupResponse[200];
 /**
  * @description
- *   errorHtml
- * @tags basic-error-controller
- * @produces text/html
+ *   查询课题组积分记录
+ * @tags 积分接口
+ * @produces *
  * @consumes application/json
  */
-export const optionsError = /* #__PURE__ */ (() => {
-  const method = 'options';
-  const url = '/error';
-  function request(): Promise<OptionsErrorResponseSuccess> {
+export const postIntegralQueryByGroup = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/integral/queryByGroup';
+  function request(
+    option: PostIntegralQueryByGroupOption,
+  ): Promise<PostIntegralQueryByGroupResponseSuccess> {
     return requester(request.url, {
       method: request.method,
-    }) as unknown as Promise<OptionsErrorResponseSuccess>;
+      ...option,
+    }) as unknown as Promise<PostIntegralQueryByGroupResponseSuccess>;
   }
   /** http method */
@@ -3560,18 +4154,32 @@ export const optionsError = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
-/** @description response type for headError */
-export interface HeadErrorResponse {
+/** @description request parameter type for postIntegralQueryByUser */
+export interface PostIntegralQueryByUserOption {
+  /**
+   * @description
+   *   query
+   */
+  body: {
+    /**
+        @description
+          query */
+    query: QueryUserIntegralRecordDto;
+  };
+}
+
+/** @description response type for postIntegralQueryByUser */
+export interface PostIntegralQueryByUserResponse {
   /**
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: ServerResult;
   /**
    * @description
-   *   No Content
+   *   Created
    */
-  204: any;
+  201: any;
   /**
    * @description
    *   Unauthorized
@@ -3582,23 +4190,32 @@ export interface HeadErrorResponse {
    *   Forbidden
    */
   403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
 }
-export type HeadErrorResponseSuccess = HeadErrorResponse[200];
+export type PostIntegralQueryByUserResponseSuccess =
+  PostIntegralQueryByUserResponse[200];
 /**
  * @description
- *   errorHtml
- * @tags basic-error-controller
- * @produces text/html
+ *   查询用户积分记录
+ * @tags 积分接口
+ * @produces *
  * @consumes application/json
  */
-export const headError = /* #__PURE__ */ (() => {
-  const method = 'head';
-  const url = '/error';
-  function request(): Promise<HeadErrorResponseSuccess> {
+export const postIntegralQueryByUser = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/integral/queryByUser';
+  function request(
+    option: PostIntegralQueryByUserOption,
+  ): Promise<PostIntegralQueryByUserResponseSuccess> {
     return requester(request.url, {
       method: request.method,
-    }) as unknown as Promise<HeadErrorResponseSuccess>;
+      ...option,
+    }) as unknown as Promise<PostIntegralQueryByUserResponseSuccess>;
   }
   /** http method */
@@ -3608,18 +4225,32 @@ export const headError = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
-/** @description response type for patchError */
-export interface PatchErrorResponse {
+/** @description request parameter type for postIntegralQuerySumByGroup */
+export interface PostIntegralQuerySumByGroupOption {
+  /**
+   * @description
+   *   query
+   */
+  body: {
+    /**
+        @description
+          query */
+    query: QueryGroupIntegralRecordDto;
+  };
+}
+
+/** @description response type for postIntegralQuerySumByGroup */
+export interface PostIntegralQuerySumByGroupResponse {
   /**
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: ServerResult;
   /**
    * @description
-   *   No Content
+   *   Created
    */
-  204: any;
+  201: any;
   /**
    * @description
    *   Unauthorized
@@ -3630,23 +4261,32 @@ export interface PatchErrorResponse {
    *   Forbidden
    */
   403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
 }
-export type PatchErrorResponseSuccess = PatchErrorResponse[200];
+export type PostIntegralQuerySumByGroupResponseSuccess =
+  PostIntegralQuerySumByGroupResponse[200];
 /**
  * @description
- *   errorHtml
- * @tags basic-error-controller
- * @produces text/html
+ *   查询课题组积分总额
+ * @tags 积分接口
+ * @produces *
  * @consumes application/json
  */
-export const patchError = /* #__PURE__ */ (() => {
-  const method = 'patch';
-  const url = '/error';
-  function request(): Promise<PatchErrorResponseSuccess> {
+export const postIntegralQuerySumByGroup = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/integral/querySumByGroup';
+  function request(
+    option: PostIntegralQuerySumByGroupOption,
+  ): Promise<PostIntegralQuerySumByGroupResponseSuccess> {
     return requester(request.url, {
       method: request.method,
-    }) as unknown as Promise<PatchErrorResponseSuccess>;
+      ...option,
+    }) as unknown as Promise<PostIntegralQuerySumByGroupResponseSuccess>;
   }
   /** http method */
@@ -3656,27 +4296,27 @@ export const patchError = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
-/** @description request parameter type for postFileDirectDown */
-export interface PostFileDirectDownOption {
+/** @description request parameter type for postIntegralQuerySumByUser */
+export interface PostIntegralQuerySumByUserOption {
   /**
    * @description
-   *   urls
+   *   query
    */
   body: {
     /**
         @description
-          urls */
-    urls: Array<string>;
+          query */
+    query: QueryUserIntegralRecordDto;
   };
 }
-/** @description response type for postFileDirectDown */
-export interface PostFileDirectDownResponse {
+/** @description response type for postIntegralQuerySumByUser */
+export interface PostIntegralQuerySumByUserResponse {
   /**
    * @description
    *   OK
    */
-  200: any;
+  200: ServerResult;
   /**
    * @description
    *   Created
@@ -3699,24 +4339,25 @@ export interface PostFileDirectDownResponse {
   404: any;
 }
-export type PostFileDirectDownResponseSuccess = PostFileDirectDownResponse[200];
+export type PostIntegralQuerySumByUserResponseSuccess =
+  PostIntegralQuerySumByUserResponse[200];
 /**
  * @description
- *   directDownFile
- * @tags file-controller
+ *   查询用户积分总额
+ * @tags 积分接口
  * @produces *
  * @consumes application/json
  */
-export const postFileDirectDown = /* #__PURE__ */ (() => {
+export const postIntegralQuerySumByUser = /* #__PURE__ */ (() => {
   const method = 'post';
-  const url = '/file/directDown';
+  const url = '/integral/querySumByUser';
   function request(
-    option: PostFileDirectDownOption,
-  ): Promise<PostFileDirectDownResponseSuccess> {
+    option: PostIntegralQuerySumByUserOption,
+  ): Promise<PostIntegralQuerySumByUserResponseSuccess> {
     return requester(request.url, {
       method: request.method,
       ...option,
-    }) as unknown as Promise<PostFileDirectDownResponseSuccess>;
+    }) as unknown as Promise<PostIntegralQuerySumByUserResponseSuccess>;
   }
   /** http method */
@@ -12551,7 +13192,7 @@ export interface PostResearchGroupMemberRequestsEditOption {
     /**
         @description
           request */
-    request: ResearchGroupMemberRequestEditRequest;
+    request: ResearchGroupRequestsDto;
   };
 }
@@ -12693,7 +13334,7 @@ export interface PostResearchGroupsAddOption {
     /**
         @description
           request */
-    request: ResearchGroupAddRequest;
+    request: ResearchGroupsDTO;
   };
 }
@@ -12754,6 +13395,77 @@ export const postResearchGroupsAdd = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postResearchGroupsAudit */
+export interface PostResearchGroupsAuditOption {
+  query?: {
+    extend?: any;
+    /**
+        @description
+          id集合 */
+    ids?: Array<string>;
+    notes?: string;
+    pass?: boolean;
+    type?: string;
+  };
+}
+
+/** @description response type for postResearchGroupsAudit */
+export interface PostResearchGroupsAuditResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: any;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostResearchGroupsAuditResponseSuccess =
+  PostResearchGroupsAuditResponse[200];
+/**
+ * @description
+ *   审核
+ * @tags research-groups-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postResearchGroupsAudit = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/research/groups/audit';
+  function request(
+    option?: PostResearchGroupsAuditOption,
+  ): Promise<PostResearchGroupsAuditResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostResearchGroupsAuditResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postResearchGroupsDelete */
 export interface PostResearchGroupsDeleteOption {
   /**
@@ -17134,6 +17846,77 @@ export const postServiceInvoiceReissueOld = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceInvoiceSucessInvoices */
+export interface PostServiceInvoiceSucessInvoicesOption {
+  /**
+   * @description
+   *   ids
+   */
+  body: {
+    /**
+        @description
+          ids */
+    ids: Array<number>;
+  };
+}
+
+/** @description response type for postServiceInvoiceSucessInvoices */
+export interface PostServiceInvoiceSucessInvoicesResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceSucessInvoicesResponseSuccess =
+  PostServiceInvoiceSucessInvoicesResponse[200];
+/**
+ * @description
+ *   获取待重新开票的开票记录
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceSucessInvoices = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/sucessInvoices';
+  function request(
+    option: PostServiceInvoiceSucessInvoicesOption,
+  ): Promise<PostServiceInvoiceSucessInvoicesResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceSucessInvoicesResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceUrgentInvoicing */
 export interface PostServiceInvoiceUrgentInvoicingOption {
   /**