Merge branch 'feature-installment2' into 'dev'

Feature installment2 See merge request !57

Merge branch 'feature-installment2' into 'dev'
Feature installment2 See merge request !57
boyang
2 parents 630d5f83 e82d7a13
Showing 14 changed files with 509 additions and 110 deletions
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/constant.tsx
src/pages/Order/Order/index.tsx
src/pages/Order/OrderList/CheckModal.tsx
src/pages/Order/OrderList/HirePurchaseUploadPayBillModal.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/OrderList/PaymentRecordModal.tsx
src/pages/Order/OrderList/UploadPayBillModal.tsx
src/pages/Order/OrderList/index.css
src/pages/Order/OrderList/index.less
src/pages/OrderReport/index.tsx
src/pages/ResearchGroup/ResearchGroup/constant.tsx
src/services/definition.ts
src/services/request.ts
@@ -52,6 +52,11 @@ const InvoiceRecord = () =&gt; {
       let dataIndex = item.dataIndex;
       let dataType = item.valueType;
+      // 如果是mainOrderIds列并且已经有自己的render函数，不要覆盖
+      if (dataIndex === 'mainOrderIds' && item.render) {
+        return newItem;
+      }
+
       newItem.render = (text, record) => {
         let textValue = record[dataIndex];
@@ -108,16 +113,17 @@ const InvoiceRecord = () =&gt; {
         if (record.paths?.includes('edit')) {
           btns.push(
             <a
+              className="p-0"
               key="editable"
               onClick={() => {
                 action?.startEditable?.(record.id);
               }}
+              style={{ marginRight: 8, whiteSpace: 'nowrap' }}
             >
               编辑
             </a>,
           );
         }
-
         if (record.paths?.includes('writeOff') && !record.writeOffId) {
           btns.push(
             <InvoiceWriteOffModal
+import EllipsisDiv from '@/components/Div/EllipsisDiv';
 import { enumToProTableEnumValue } from '@/utils';
 import { PAYEE_OPTIONS } from '../Order/constant';
@@ -45,6 +46,53 @@ export const INVOICE_COLUMNS = [
     width: 100,
   },
   {
+    dataIndex: 'mainOrderIds',
+    title: '主订单id',
+    valueType: 'text',
+    width: 160,
+    hideInTable: false,
+    hideInSearch: true,
+    readonly: true,
+    render: (text: any, record: any) => {
+      if (!record.mainOrderIds || record.mainOrderIds.length === 0) {
+        return '-';
+      }
+
+      let content = '';
+
+      // 直接从text参数中处理，可能是已处理过的数组
+      if (text && Array.isArray(text)) {
+        content = text.join(', ');
+      }
+      // 如果record.mainOrderIds是数组，直接join
+      else if (Array.isArray(record.mainOrderIds)) {
+        content = record.mainOrderIds.join(', ');
+      }
+      // 如果是字符串，检查是否为JSON格式的数组
+      else if (typeof record.mainOrderIds === 'string') {
+        try {
+          // 尝试解析JSON
+          const parsedData = JSON.parse(record.mainOrderIds);
+          if (Array.isArray(parsedData)) {
+            content = parsedData.join(', ');
+          } else {
+            content = record.mainOrderIds;
+          }
+        } catch (e) {
+          // 不是JSON格式，使用原始字符串
+          content = record.mainOrderIds;
+        }
+      }
+      // 其他情况直接返回原值
+      else {
+        content = String(record.mainOrderIds);
+      }
+
+      // 使用EllipsisDiv组件显示带省略号的内容
+      return <EllipsisDiv text={content} />;
+    },
+  },
+  {
     dataIndex: 'mainOrderId',
     title: '主订单id',
     valueType: 'text',
@@ -65,7 +113,7 @@ export const INVOICE_COLUMNS = [
     title: '状态',
     dataIndex: 'statusText',
     valueType: 'text',
-    width: 180,
+    width: 100,
     readonly: true,
     hideInSearch: true,
   },
@@ -73,7 +121,7 @@ export const INVOICE_COLUMNS = [
     title: '状态',
     dataIndex: 'writeOffIdIsNull',
     valueType: 'select',
-    width: 100,
+    width: 80,
     valueEnum: {
       true: {
         text: '未核销',
@@ -120,7 +120,7 @@ const OrderPage = () =&gt; {
     <div className="order-page-container">
       <div id="resizeDiv"></div>
       <div id="resizeDiv"></div>
-      {roleCode !== 'SALES_MANAGER' && (
+      {roleCode === 'SALES_MANAGER' && (
         <Modal
           title="订单预警提醒"
           open={open}
@@ -707,12 +707,6 @@ export default ({
                   </Image.PreviewGroup>
                 </div>
               </Col>
-              <Col span={24}>
-                <div className="mb-2">
-                  <span className="font-semibold">备注：</span>
-                  <span>{data?.installmentComment || '-'}</span>
-                </div>
-              </Col>
             </Row>
             <Divider></Divider>
           </>
@@ -5,7 +5,7 @@ import {
 } from '@/services';
 import { transImageFile } from '@/utils';
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Modal, Radio, Upload, message } from 'antd';
+import { Button, Form, Input, Modal, Upload, message } from 'antd';
 import { RcFile } from 'antd/lib/upload';
 import { UploadFile, UploadProps } from 'antd/lib/upload/interface';
 import { cloneDeep } from 'lodash';
@@ -41,7 +41,7 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
   const remainingMoney = totalPayment - installedMoney;
   const [form] = Form.useForm();
   const [fileList, setFileList] = useState<UploadFile[]>([]);
-  const [paymentType, setPaymentType] = useState<string>('INSTALLMENT');
+  const [paymentType] = useState<string>('INSTALLMENT');
   const [previewOpen, setPreviewOpen] = useState(false);
   const [previewImage, setPreviewImage] = useState('');
   const [previewTitle, setPreviewTitle] = useState('');
@@ -65,17 +65,17 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
     </div>
   );
-  const handleTypeChange = (e: any) => {
-    const newType = e.target.value;
-    setPaymentType(newType);
+  // const handleTypeChange = (e: any) => {
+  //   const newType = e.target.value;
+  //   setPaymentType(newType);
-    // 如果选择全部回款，自动填入待回款金额
-    if (newType === 'FULL') {
-      form.setFieldsValue({
-        amount: remainingMoney.toFixed(2),
-      });
-    }
-  };
+  //   // 如果选择全部回款，自动填入待回款金额
+  //   if (newType === 'FULL') {
+  //     form.setFieldsValue({
+  //       amount: remainingMoney.toFixed(2),
+  //     });
+  //   }
+  // };
   // 验证回款金额不能超过待回款金额
   const validateAmount = (_: any, value: string) => {
@@ -332,18 +332,6 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
               <span>{remainingMoney.toFixed(2)}元</span>
             </div>
           </div>
-
-          <Form.Item
-            label="回款类型"
-            name="paymentType"
-            initialValue={paymentType}
-          >
-            <Radio.Group onChange={handleTypeChange}>
-              <Radio value="INSTALLMENT">分期回款</Radio>
-              <Radio value="FULL">全部回款</Radio>
-            </Radio.Group>
-          </Form.Item>
-
           <Form.Item
             label="回款金额"
             name="amount"
@@ -371,10 +359,6 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
                 : ''}
             </Upload>
           </Form.Item>
-
-          <Form.Item label="备注" name="remarks">
-            <Input.TextArea rows={4} placeholder="请输入备注信息" />
-          </Form.Item>
         </Form>
       </Modal>
@@ -2,6 +2,7 @@ import ButtonConfirm from &#39;@/components/ButtomConfirm&#39;;
 import { RESPONSE_CODE } from '@/constants/enum';
 import ImportExpressBillModal from '@/pages/Order/OrderList/ImportExpressBillModal';
 import InvoicingDrawerForm from '@/pages/Order/OrderList/InvoicingDrawerForm';
+import PaymentRecordModal from '@/pages/Order/OrderList/PaymentRecordModal';
 import ReissueModal from '@/pages/Order/OrderList/ReissueModal';
 import ReissueModal_old from '@/pages/Order/OrderList/ReissueModal_old';
 import {
@@ -151,6 +152,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
     hirePurchaseUploadPayBillModalVisible,
     setHirePurchaseUploadPayBillModalVisible,
   ] = useState<boolean>(false);
+  const [paymentRecordModalVisible, setPaymentRecordModalVisible] =
+    useState<boolean>(false);
   const [
     feedbackRegistrationModalVisible,
     setFeedbackRegistrationModalVisible,
@@ -1454,20 +1457,6 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                 }}
               />
             )}
-            {optRecord.paths?.includes('uploadPaymentReceiptBill') ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  createOptObject(optRecord.id, record.id);
-                  setUploadPayBillModalVisible(true);
-                }}
-              >
-                回款
-              </Button>
-            ) : (
-              ''
-            )}
             {optRecord.paths?.includes('confirmReissue_old') ? (
               <Button
@@ -1536,22 +1525,6 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               ''
             )}
-            {optRecord.paths?.includes('auditPaymentReceipt') ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  createOptObject(optRecord.id, record.id);
-                  setCheckVisible(true);
-                  setOrderCheckType(CHECK_TYPE.PAYMENT_RECEIPTS_AUDIT);
-                }}
-              >
-                回款审核
-              </Button>
-            ) : (
-              ''
-            )}
-
             {optRecord.paths?.includes('modifiedAuditRequest') ? (
               <Button
                 className="p-0"
@@ -2986,6 +2959,21 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                     ''
                   )}
+                  {record.paths?.includes('refundHistory') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        createOptObject(record.id, record.id);
+                        setPaymentRecordModalVisible(true);
+                      }}
+                    >
+                      付款记录
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
                   {/* 输出日志以检查权限和支付方式 */}
                   {console.log('Order info:', record.id, record.paths)}
                   {record.paths?.includes('auditPartialPaymentReceipt') ? (
@@ -4379,6 +4367,13 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
           refreshTable();
         }}
         defaultValue={0}
+        style={{
+          display: 'flex',
+          flexDirection: 'row',
+          alignItems: 'center',
+          gap: 8,
+          whiteSpace: 'nowrap',
+        }}
       >
         {radios}
       </Radio.Group>
@@ -5366,6 +5361,17 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
         />
       )}
+      {paymentRecordModalVisible && currentOptMainId && (
+        <PaymentRecordModal
+          visible={paymentRecordModalVisible}
+          mainOrderId={currentOptMainId}
+          onClose={() => {
+            setPaymentRecordModalVisible(false);
+            clearOptObject();
+          }}
+        />
+      )}
+
       {feedbackRegistrationModalVisible && (
         <FeedbackRegistrationModal
           setVisible={(val: boolean) => {
+import { postServiceOrderRefundHistory } from '@/services';
+import { Button, Empty, Image, Modal } from 'antd';
+import React, { useEffect, useState } from 'react';
+
+interface PaymentRecordModalProps {
+  visible: boolean;
+  mainOrderId: number;
+  onClose: () => void;
+}
+
+interface PaymentRecord {
+  id: number;
+  mainOrderId: number;
+  refundMoney: number;
+  createTime: string;
+  annex: string;
+  isAudit: number;
+  isDel: number;
+  updateTime: string | null;
+  paymentReceiptAnnexPartial: string | null;
+}
+
+const PaymentRecordModal: React.FC<PaymentRecordModalProps> = ({
+  visible,
+  mainOrderId,
+  onClose,
+}) => {
+  const [paymentRecords, setPaymentRecords] = useState<PaymentRecord[]>([]);
+
+  const fetchPaymentRecords = async () => {
+    if (!mainOrderId) return;
+
+    try {
+      const response = await postServiceOrderRefundHistory({
+        data: { mainOrderId },
+      });
+
+      if (response.result === 0 && response.data) {
+        setPaymentRecords(response.data);
+      } else {
+        setPaymentRecords([]);
+      }
+    } catch (error) {
+      console.error('Failed to fetch payment records:', error);
+      setPaymentRecords([]);
+    }
+  };
+
+  useEffect(() => {
+    if (visible && mainOrderId) {
+      fetchPaymentRecords();
+    }
+  }, [visible, mainOrderId]);
+
+  const parseAnnex = (annexString: string): string[] => {
+    try {
+      const parsed = JSON.parse(annexString);
+      return parsed.map((item: { url: string }) => item.url);
+    } catch (e) {
+      console.error('Failed to parse annex:', e);
+      return [];
+    }
+  };
+
+  return (
+    <Modal
+      title="付款记录"
+      open={visible}
+      onCancel={onClose}
+      footer={[
+        <Button key="close" onClick={onClose}>
+          关闭
+        </Button>,
+      ]}
+      width={500}
+    >
+      <div className="payment-record-container">
+        {paymentRecords.length > 0 ? (
+          paymentRecords.map((record, index) => {
+            const imageUrls = record.annex ? parseAnnex(record.annex) : [];
+
+            return (
+              <div key={record.id} className="payment-record-item">
+                <div className="payment-record-header">
+                  {index < paymentRecords.length - 1 && (
+                    <div className="payment-record-line" />
+                  )}
+                  <div className="payment-record-circle" />
+                </div>
+                <div className="payment-record-content">
+                  <div className="payment-record-info">
+                    <p>
+                      <strong>提交时间：</strong> {record.createTime}
+                    </p>
+                    <p>
+                      <strong>付款金额：</strong>{' '}
+                      {record.refundMoney.toFixed(2)}
+                    </p>
+                    {imageUrls.length > 0 && (
+                      <p>
+                        <strong>付款凭证：</strong>
+                      </p>
+                    )}
+                  </div>
+                  {imageUrls.length > 0 && (
+                    <div className="payment-record-images">
+                      <Image.PreviewGroup>
+                        {imageUrls.map((url, imgIndex) => (
+                          <Image
+                            key={imgIndex}
+                            width={120}
+                            src={url}
+                            className="payment-record-image"
+                          />
+                        ))}
+                      </Image.PreviewGroup>
+                    </div>
+                  )}
+                </div>
+              </div>
+            );
+          })
+        ) : (
+          <Empty description="暂无付款记录" className="payment-record-empty" />
+        )}
+      </div>
+    </Modal>
+  );
+};
+
+export default PaymentRecordModal;
@@ -216,10 +216,24 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
         }}
         onOpenChange={setVisible}
       >
-        <div className="pb-4 text-xs decoration-gray-50">可复制照片粘贴</div>
-        <Upload {...props}>
-          {fileList.length < COMFIR_RECEIPT_IMAGES_NUMBER ? uploadButton : ''}
-        </Upload>
+        <div className="pb-4 text-base font-medium">
+          付款金额：￥{mainOrder?.totalPayment?.toLocaleString() || '0.00'}
+        </div>
+        <div className="flex items-start pb-4 text-base font-medium">
+          <div>付款凭证：</div>
+
+          <div className="flex flex-col items-start ml-2">
+            <div className="mb-1 text-xs decoration-gray-50">
+              可复制照片粘贴
+            </div>
+
+            <Upload {...props}>
+              {fileList.length < COMFIR_RECEIPT_IMAGES_NUMBER
+                ? uploadButton
+                : null}
+            </Upload>
+          </div>
+        </div>
       </ModalForm>
       <Modal
@@ -2,6 +2,14 @@
   margin-inline: 0 !important;
 }
+.order-page-container .ant-table-cell {
+  word-break: break-word;
+  white-space: normal !important;
+  overflow: hidden;
+  max-width: 500px;
+  box-sizing: border-box;
+}
+
 .order-page-container td {
   font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
     'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
@@ -53,6 +61,8 @@
 .order-page-container .ant-table-thead .ant-table-cell {
   background-color: #fff !important;
   border-radius: 8px !important;
+  overflow: hidden;
+  white-space: normal !important;
 }
 #sub-table tbody td {
@@ -98,3 +108,78 @@
   /* 设置行与行之间分割线的颜色 */
 }
+
+/* 付款记录样式 */
+.payment-record-container {
+  padding: 10px 0;
+}
+
+.payment-record-item {
+  position: relative;
+  display: flex;
+  margin-bottom: 16px;
+}
+
+.payment-record-header {
+  position: relative;
+  width: 24px;
+  margin-right: 12px;
+}
+
+.payment-record-line {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 50%;
+  width: 1px;
+  background-color: #e8e8e8;
+  transform: translateX(-50%);
+  z-index: 1;
+}
+
+.payment-record-circle {
+  position: absolute;
+  top: 12px;
+  left: 50%;
+  width: 12px;
+  height: 12px;
+  background-color: #d4b106;
+  border-radius: 50%;
+  transform: translateX(-50%);
+  z-index: 2;
+}
+
+.payment-record-content {
+  flex: 1;
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 12px 16px;
+}
+
+.payment-record-info p {
+  margin-bottom: 8px;
+}
+
+.payment-record-images {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 8px;
+}
+
+.payment-record-image {
+  border: 1px solid #e8e8e8;
+  border-radius: 4px;
+}
+
+.payment-record-divider {
+  height: 1px;
+  background-color: #e8e8e8;
+  margin: 16px 0;
+}
+
+.payment-record-empty {
+  text-align: center;
+  color: #999;
+  padding: 20px 0;
+}
@@ -106,3 +106,78 @@
 // .order-tooltip .ant-tooltip-inner{
 //   color: black !important;
 // }
+
+/* 付款记录样式 */
+.payment-record-container {
+  padding: 10px 0;
+}
+
+.payment-record-item {
+  position: relative;
+  display: flex;
+  margin-bottom: 16px;
+}
+
+.payment-record-header {
+  position: relative;
+  width: 24px;
+  margin-right: 12px;
+}
+
+.payment-record-line {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 50%;
+  width: 1px;
+  background-color: #e8e8e8;
+  transform: translateX(-50%);
+  z-index: 1;
+}
+
+.payment-record-circle {
+  position: absolute;
+  top: 12px;
+  left: 50%;
+  width: 12px;
+  height: 12px;
+  background-color: #d4b106;
+  border-radius: 50%;
+  transform: translateX(-50%);
+  z-index: 2;
+}
+
+.payment-record-content {
+  flex: 1;
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 12px 16px;
+}
+
+.payment-record-info p {
+  margin-bottom: 8px;
+}
+
+.payment-record-images {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 8px;
+}
+
+.payment-record-image {
+  border: 1px solid #e8e8e8;
+  border-radius: 4px;
+}
+
+.payment-record-divider {
+  height: 1px;
+  background-color: #e8e8e8;
+  margin: 16px 0;
+}
+
+.payment-record-empty {
+  text-align: center;
+  color: #999;
+  padding: 20px 0;
+}
@@ -181,7 +181,6 @@ const OrderReportPage = () =&gt; {
   }, [selectedMonth, selectedYear]);
   useEffect(() => {
-    loadData();
     getSalesCodeOptions();
   }, []);
@@ -20,7 +20,6 @@ export const RESEARCH_GROUP_COLUMNS = [
     key: 'id',
     valueType: 'index',
     hideInSearch: true,
-    hideInTable: true,
   },
   {
     title: '课题组名称',
@@ -1601,7 +1601,6 @@ export interface InstallmentPaymentDTO {
   /**
    * @description
    *   分期付款金额
-   * @format int64
    */
   installmentMoney?: number;
   /**
@@ -4401,6 +4400,7 @@ export interface SubOrder {
   paymentChannel?: string;
   paymentMethod?: string;
   paymentReceiptAnnex?: string;
+  paymentReceiptAnnexPartial?: string;
   paymentReceiptNotes?: string;
   paymentReceiptStatus?: string;
   paymentStatus?: string;
@@ -75,6 +75,7 @@ import type {
   MeasureUnitListRes,
   MergeIntegralDto,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -4267,9 +4268,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -4290,9 +4289,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -4316,9 +4315,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -4344,9 +4341,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -4371,9 +4368,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -4399,9 +4394,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -4426,9 +4421,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4449,9 +4442,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -4475,9 +4468,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4498,9 +4489,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -4525,9 +4516,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4548,9 +4537,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -4575,9 +4564,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4598,9 +4585,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -25903,6 +25890,77 @@ export const postServiceOrderQuerySupplier = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderRefundHistory */
+export interface PostServiceOrderRefundHistoryOption {
+  /**
+   * @description
+   *   mainOrderId
+   */
+  body: {
+    /**
+        @description
+          mainOrderId */
+    mainOrderId: number;
+  };
+}
+
+/** @description response type for postServiceOrderRefundHistory */
+export interface PostServiceOrderRefundHistoryResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderRefundHistoryResponseSuccess =
+  PostServiceOrderRefundHistoryResponse[200];
+/**
+ * @description
+ *   根据主订单ID查询退款历史记录
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderRefundHistory = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/refundHistory';
+  function request(
+    option: PostServiceOrderRefundHistoryOption,
+  ): Promise<PostServiceOrderRefundHistoryResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderRefundHistoryResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderRemindShipping */
 export interface PostServiceOrderRemindShippingOption {
   /**