fix: 添加付款记录接口

boyang
1 parent 99f55856
Showing 6 changed files with 125 additions and 75 deletions
src/pages/Order/Order/index.tsx
src/pages/Order/OrderList/CheckModal.tsx
src/pages/Order/OrderList/HirePurchaseUploadPayBillModal.tsx
src/pages/Order/OrderList/UploadPayBillModal.tsx
src/services/definition.ts
src/services/request.ts
@@ -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>
  
@@ -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
@@ -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 {
   /**