feat: update

zhongnanhuang
1 parent 7293ba72
Showing 10 changed files with 555 additions and 213 deletions
.umirc.ts
src/app.ts
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
src/services/definition.ts
src/services/order.ts
src/services/request.ts
src/tsg.config.ts
@@ -13,7 +13,8 @@ export default defineConfig({
   },
   proxy: {
     '/service/': {
-      target: 'http://39.108.227.113:8085/',
+      target: 'http://localhost:8085/',
+      // target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
       // pathRewrite: { '^/api': '' },
     },
@@ -91,7 +91,7 @@ export const request: RequestConfig = {
         // 不再需要异步处理读取返回体内容，可直接在data中读出，部分字段可在 config 中找到
         const { data = {} as any } = response;
         if (data.result !== RESPONSE_CODE.SUCCESS) {
-          message.error('服务器错误，请稍后再试！');
+          message.error(data.message);
         }
         // do something
         return response;
+import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderCheckOrder } from '@/services';
 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
@@ -12,13 +13,11 @@ export default ({ setCheckVisible, data, onClose }) =&gt; {
     subOrderIds = subOrderList.map((subOrder) => subOrder.id);
   }
   async function doCheck(body: object) {
-    const res = await postServiceOrderCheckOrder({
+    const data = await postServiceOrderCheckOrder({
       data: body,
     });
-    if (res.result === 0) {
-      message.success(res.message);
-    } else {
-      message.error(res.message);
+    if (data.result === RESPONSE_CODE.SUCCESS) {
+      message.success(data.message);
     }
     onClose();
     return true;
+import { RESPONSE_CODE } from '@/constants/enum';
+import { postServiceOrderSendProduct } from '@/services';
 import { enumToSelect } from '@/utils';
 import {
   ProColumns,
@@ -6,7 +8,7 @@ import {
   ProFormText,
   ProTable,
 } from '@ant-design/pro-components';
-import { Button, InputNumber, Modal } from 'antd';
+import { Button, Input, InputNumber, Modal, Select, message } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 import { LOGISTICS_STATUS_OPTIONS } from '../constant';
@@ -19,49 +21,67 @@ const DeliverModal = ({ data: propsData, onClose }) =&gt; {
     setData(propsData);
   }, [propsData]);
-  const handleChange = (key: string, index: number) => (e) => {
-    const newData = cloneDeep(data);
-    newData[index][key] = e.target.value;
-    setData(newData);
-  };
+  // const handleChange = (key: string, index: number) => (e) => {
+  //   const newData = cloneDeep(data);
+  //   newData[index][key] = e.target.value;
+  //   setData(newData);
+  // };
   const columns: ProColumns<any>[] = [
     {
+      title: 'ID',
+      width: 80,
+      dataIndex: 'id',
+      render: (_, record) => <Input value={record.id} disabled />,
+    },
+    {
       title: '商品编号',
       width: 80,
-      dataIndex: 'name',
+      dataIndex: 'productCode',
+      render: (_, record) => <Input value={record.productCode} disabled />,
     },
     {
       title: '商品名称',
-      dataIndex: 'containers',
+      dataIndex: 'productName',
       align: 'right',
+      width: 80,
+      render: (_, record) => <Input value={record.productName} disabled />,
+    },
+    {
+      title: '商品参数',
+      dataIndex: 'parameters',
+      align: 'right',
+      width: 80,
+      render: (_, record) => <Input value={record.parameters} disabled />,
     },
     {
       title: '商品数量',
       width: 80,
       dataIndex: 'status',
+      render: (_, record) => <InputNumber value={record.quantity} disabled />,
     },
     {
       title: '物流方式',
-      width: 180,
+      width: 150,
       key: 'logisticsMethod',
-      render: () => (
-        <ProFormSelect
+      render: (_, record) => (
+        <Select
           placeholder="请输入物流方式"
-          name="logisticsMethod"
-          width="lg"
-          label="物流方式"
+          value={record.logisticsMethod}
           options={enumToSelect(LOGISTICS_STATUS_OPTIONS)}
+          onChange={(value) => (record.logisticsMethod = value)} //修改时更改record数据
         />
       ),
     },
     {
       title: '物流单号',
-      width: 180,
+      width: 150,
       key: 'serialNumber',
-      render: (_, record, index) => (
-        <InputNumber
-          value={record.productCode}
-          onChange={handleChange('productCode', index)}
+      render: (_, record) => (
+        <Input
+          placeholder="请输入物流单号"
+          value={record.serialNumber}
+          onChange={(event) => (record.serialNumber = event.target.value)}
+          // onChange={handleChange('productCode', index)}
         />
       ),
     },
@@ -72,9 +92,23 @@ const DeliverModal = ({ data: propsData, onClose }) =&gt; {
       open
       width={800}
       title="发货"
-      onOk={() => {
-        console.log(data);
-        onClose();
+      onOk={async () => {
+        //请求体封装
+        let list = data.map((item) => {
+          return {
+            id: item.id,
+            logisticsMethod: item.logisticsMethod,
+            serialNumber: item.serialNumber,
+          };
+        });
+        let body = { id: data[0].mainOrderId, list: list };
+        console.log(body);
+        //发货请求
+        const res = await postServiceOrderSendProduct({ data: body });
+        if (res.result === RESPONSE_CODE.SUCCESS) {
+          message.success(res.message);
+          onClose();
+        }
       }}
       onCancel={() => {
         onClose();
@@ -87,8 +121,14 @@ const DeliverModal = ({ data: propsData, onClose }) =&gt; {
         className="mb-8"
         formRef={form}
       >
-        <ProFormText name="paymentChannel" label="物流方式"></ProFormText>
-        <ProFormText name="productCode" label="物流单号"></ProFormText>
+        <ProFormSelect
+          placeholder="请输入物流方式"
+          name="logisticsMethod"
+          width="sm"
+          label="物流方式"
+          options={enumToSelect(LOGISTICS_STATUS_OPTIONS)}
+        />
+        <ProFormText name="serialNumber" label="物流单号"></ProFormText>
         <Button
           type="primary"
           onClick={() => {
@@ -96,8 +136,8 @@ const DeliverModal = ({ data: propsData, onClose }) =&gt; {
             let newData = cloneDeep(data);
             newData = newData.map((item) => ({
               ...item,
-              paymentChannel: values.paymentChannel,
-              productCode: values.productCode, // 物流单号？
+              logisticsMethod: values.logisticsMethod,
+              serialNumber: values.serialNumber, // 物流单号？
             }));
             setData(newData);
           }}
@@ -108,7 +148,7 @@ const DeliverModal = ({ data: propsData, onClose }) =&gt; {
       <ProTable<any>
         className="px-0"
         dataSource={data}
-        rowKey="key"
+        rowKey="id"
         pagination={false}
         columns={columns}
         search={false}
+import { RESPONSE_CODE } from '@/constants/enum';
 import {
   postServiceOrderAddOrder,
   postServiceOrderQueryProductInformation,
@@ -145,8 +146,10 @@ export default ({ onClose, data }) =&gt; {
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
-        await postServiceOrderAddOrder({ data: values });
-        message.success('提交成功');
+        const data = await postServiceOrderAddOrder({ data: values });
+        if (data.result === RESPONSE_CODE.SUCCESS) {
+          message.success(data.message);
+        }
         // 不返回不会关闭弹框
         onClose();
         return true;
@@ -361,9 +364,8 @@ export default ({ onClose, data }) =&gt; {
           },
         ]}
         actionGuard={{
-          beforeAddRow: async (defaultValue, insertIndex) => {
+          beforeAddRow: async () => {
             return new Promise((resolve) => {
-              console.log(defaultValue, insertIndex);
               rowNumber.current = 1;
               setTimeout(() => resolve(true), 1000);
             });
@@ -371,7 +373,7 @@ export default ({ onClose, data }) =&gt; {
           beforeRemoveRow: async (index) => {
             return new Promise((resolve) => {
               if (index === 0) {
-                message.error('这行不能删');
+                message.error('第一行数据不能删除');
                 resolve(false);
                 return;
               }
 import ButtonConfirm from '@/components/ButtomConfirm';
-import { postServiceOrderQueryServiceOrder } from '@/services';
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postServiceOrderExport,
+  postServiceOrderOrderCancel,
+  postServiceOrderPrintOrder,
+  postServiceOrderQueryServiceOrder,
+} from '@/services';
+import { orderExport } from '@/services/order';
 import { enumValueToLabel } from '@/utils';
+import { DownOutlined } from '@ant-design/icons';
 import {
   PageContainer,
   ProColumns,
   ProTable,
 } from '@ant-design/pro-components';
-import { Button, Checkbox, Divider, Flex, Space, Tag, message } from 'antd';
+import {
+  Button,
+  Checkbox,
+  Divider,
+  Dropdown,
+  Flex,
+  MenuProps,
+  Space,
+  Tag,
+  message,
+} from 'antd';
+import { cloneDeep } from 'lodash';
 import { Key, useRef, useState } from 'react';
 import CheckModal from './components/CheckModal';
 import DeliverModal from './components/DeliverModal';
 import OrderDrawer from './components/OrderDrawer';
 import {
   INVOCING_STATUS_OPTIONS,
+  LOGISTICS_STATUS_OPTIONS,
   MAIN_ORDER_COLUMNS,
   ORDER_STATUS_OPTIONS,
   PAYMENT_CHANNEL_OPTIONS,
@@ -29,6 +49,7 @@ const OrderPage = () =&gt; {
   const [expandedRowKeys, setExpandedRowKeys] = useState<Key[]>([]);
   const [orderRow, setOrderRow] = useState<Partial<OrderType>>({});
   const [mainOrderAllItemKeys, setMainOrderAllItemKeys] = useState([]);
+  const [rolePath, setRolePath] = useState([]); //当前角色权限（新增跟打印按钮）
   const [selectedRows, setSelectedRows] = useState({});
   const [selectedRowObj, setSelectedRowObj] = useState({});
@@ -126,60 +147,94 @@ const OrderPage = () =&gt; {
                 总金额：<span className="text-lg">{record.totalPayment}￥</span>
               </div>
               <Space>
-                <Button
-                  className="p-0"
-                  type="link"
-                  onClick={() => {
-                    if (!selectedRowObj[record.id]?.length) {
-                      return message.error('请选择选择子订单');
-                    }
-                    setSelectedRows(selectedRowObj[record.id]);
-                    setDeliverVisible(true);
-                  }}
-                >
-                  发货
-                </Button>
-                <Button
-                  className="p-0"
-                  type="link"
-                  onClick={() => {
-                    window.print();
-                  }}
-                >
-                  打印
-                </Button>
-                <ButtonConfirm
-                  className="p-0"
-                  title="确认开票？"
-                  text="开票"
-                  onConfirm={() => {}}
-                />
-                <Button
-                  className="p-0"
-                  type="link"
-                  onClick={() => {
-                    setOrderDrawerVisible(true);
-                    setOrderRow(record);
-                  }}
-                >
-                  编辑
-                </Button>
-                <Button
-                  className="p-0"
-                  type="link"
-                  onClick={() => {
-                    setOrderRow(record);
-                    setCheckVisible(true);
-                  }}
-                >
-                  审核
-                </Button>
-                <ButtonConfirm
-                  className="p-0"
-                  title="确认作废？"
-                  text="作废"
-                  onConfirm={() => {}}
-                />
+                {record.mainPath.includes('sendProduct') ? (
+                  <Button
+                    className="p-0"
+                    type="link"
+                    onClick={() => {
+                      if (!selectedRowObj[record.id]?.length) {
+                        return message.error('请选择选择子订单');
+                      }
+                      setSelectedRows(selectedRowObj[record.id]);
+                      setDeliverVisible(true);
+                    }}
+                  >
+                    发货
+                  </Button>
+                ) : (
+                  ''
+                )}
+                {record.mainPath.includes('printOrder') ? (
+                  <Button
+                    className="p-0"
+                    type="link"
+                    onClick={() => {
+                      window.print();
+                    }}
+                  >
+                    打印
+                  </Button>
+                ) : (
+                  ''
+                )}
+                {record.mainPath.includes('confirmReceipt') ? (
+                  <ButtonConfirm
+                    className="p-0"
+                    title="确认开票？"
+                    text="开票"
+                    onConfirm={() => {}}
+                  />
+                ) : (
+                  ''
+                )}
+                {record.mainPath.includes('updateOrder') ? (
+                  <Button
+                    className="p-0"
+                    type="link"
+                    onClick={() => {
+                      setOrderDrawerVisible(true);
+                      setOrderRow(record);
+                    }}
+                  >
+                    编辑
+                  </Button>
+                ) : (
+                  ''
+                )}
+                {record.mainPath.includes('checkOrder') ? (
+                  <Button
+                    className="p-0"
+                    type="link"
+                    onClick={() => {
+                      setOrderRow(record);
+                      setCheckVisible(true);
+                    }}
+                  >
+                    审核
+                  </Button>
+                ) : (
+                  ''
+                )}
+
+                {record.mainPath.includes('OrderCancel') ? (
+                  <ButtonConfirm
+                    className="p-0"
+                    title="确认作废？"
+                    text="作废"
+                    onConfirm={async () => {
+                      let body = { id: record.id };
+                      const data = await postServiceOrderOrderCancel({
+                        data: body,
+                      });
+                      if (data.result === RESPONSE_CODE.SUCCESS) {
+                        message.success(data.message);
+                        mainTableRef.current?.reload();
+                      }
+                    }}
+                  />
+                ) : (
+                  ''
+                )}
               </Space>
             </Space.Compact>
             <Space.Compact direction="vertical">
@@ -225,7 +280,6 @@ const OrderPage = () =&gt; {
                 ...item,
                 render: (text: string) => {
                   let label = enumValueToLabel(text, ORDER_STATUS_OPTIONS);
-                  console.log('label：' + label);
                   if (label === undefined) {
                     label = enumValueToLabel(text, INVOCING_STATUS_OPTIONS);
                   }
@@ -239,7 +293,11 @@ const OrderPage = () =&gt; {
             }
             //枚举字段处理
-            if (item.key === 'paymentMethod' || item.key === 'paymentChannel') {
+            if (
+              item.key === 'paymentMethod' ||
+              item.key === 'paymentChannel' ||
+              item.key === 'logisticsMethod'
+            ) {
               return {
                 ...item,
                 render: (text: string) => {
@@ -247,6 +305,9 @@ const OrderPage = () =&gt; {
                   if (label === undefined) {
                     label = enumValueToLabel(text, PAYMENT_METHOD_OPTIONS);
                   }
+                  if (label === undefined) {
+                    label = enumValueToLabel(text, LOGISTICS_STATUS_OPTIONS);
+                  }
                   return label;
                 },
               };
@@ -261,32 +322,92 @@ const OrderPage = () =&gt; {
               align: 'center',
               render: (optText, optRecord) => (
                 <Flex>
-                  <Button
-                    type="link"
-                    size="small"
-                    onClick={() => {
-                      mainTableRef.current?.reload();
-                    }}
-                  >
-                    编辑
-                  </Button>
-                  <Button
-                    type="link"
-                    size="small"
-                    onClick={() => {
-                      setCheckVisible(true);
-                      setOrderRow(optRecord);
-                    }}
-                  >
-                    审核
-                  </Button>
+                  {optRecord.subPath.includes('sendProduct') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        optRecord.mainOrderId = record.id;
+                        setSelectedRows([cloneDeep(optRecord)]); //克隆一份数据，避免后续修改污染
+                        setDeliverVisible(true);
+                      }}
+                    >
+                      发货
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+                  {optRecord.subPath.includes('printOrder') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={async () => {
+                        //调用打印接口
+                        let body = { subIds: [optRecord.id] };
+                        const data = await postServiceOrderPrintOrder({
+                          data: body,
+                        });
+                        if (data.result === RESPONSE_CODE.SUCCESS) {
+                          message.success(data.message);
+                          window.print();
+                          mainTableRef.current?.reload();
+                        }
+                      }}
+                    >
+                      打印
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+                  {optRecord.subPath.includes('confirmReceipt') ? (
+                    <ButtonConfirm
+                      className="p-0"
+                      title="确认开票？"
+                      text="开票"
+                      onConfirm={() => {}}
+                    />
+                  ) : (
+                    ''
+                  )}
+                  {optRecord.subPath.includes('updateOrder') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setOrderDrawerVisible(true);
+                        setOrderRow(optRecord);
+                      }}
+                    >
+                      编辑
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+                  {optRecord.subPath.includes('checkOrder') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setOrderRow(optRecord);
+                        setCheckVisible(true);
+                      }}
+                    >
+                      审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
-                  <Button type="link" size="small">
-                    备注
-                  </Button>
-                  <Button type="link" size="small">
-                    作废
-                  </Button>
+                  {/* {optRecord.subPath.includes("OrderCancel") ?
+                  <ButtonConfirm
+                    className="p-0"
+                    title="确认作废？"
+                    text="作废"
+                    onConfirm={() => {
+                     }}
+                  />
+                  : ''
+                } */}
                 </Flex>
               ),
             },
@@ -304,7 +425,6 @@ const OrderPage = () =&gt; {
           ])}
         rowSelection={{
           onChange: (selectedRowKeys: any, selectedRows: any) => {
-            console.log(selectedRowKeys, selectedRows);
             setSelectedRowObj({
               ...setSelectedRowObj,
               [record.id]: selectedRows,
@@ -325,6 +445,101 @@ const OrderPage = () =&gt; {
     );
   };
+  function toolBarRender() {
+    let toolBtns = [];
+
+    //导出按钮配置
+    const items: MenuProps['items'] = [
+      {
+        label: '导出已选中订单',
+        key: '1',
+        onClick: async () => {
+          if (selectedItems.length === 0) {
+            message.error('请选择订单');
+            return;
+          }
+          let body = { flag: true, ids: selectedItems };
+          // const data = await postServiceOrderExport({ data: { flag: true, ids: selectedItems } });
+          orderExport(body);
+          // if (data.result === RESPONSE_CODE.SUCCESS) {
+          //   message.success(data.message);
+          // }
+        },
+      },
+      {
+        label: '导出当前页订单',
+        key: '2',
+        onClick: async () => {
+          if (mainOrderAllItemKeys.length === 0) {
+            message.error('当前没有订单');
+            return;
+          }
+          const data = await postServiceOrderExport({
+            data: { flag: true, ids: mainOrderAllItemKeys },
+          });
+          if (data.result === RESPONSE_CODE.SUCCESS) {
+            message.success(data.message);
+          }
+        },
+      },
+      {
+        label: '导出所有订单',
+        key: '3',
+        onClick: async () => {
+          const data = await postServiceOrderExport({
+            data: { flag: false, ids: [] },
+          });
+          if (data.result === RESPONSE_CODE.SUCCESS) {
+            message.success(data.message);
+          }
+        },
+      },
+    ];
+
+    const menuProps = {
+      items,
+      onClick: () => {},
+    };
+
+    if (rolePath.includes('addOrder')) {
+      toolBtns.push(
+        <Button
+          type="primary"
+          key="out"
+          onClick={() => setOrderDrawerVisible(true)}
+        >
+          新增
+        </Button>,
+      );
+    }
+
+    toolBtns.push(
+      <Dropdown menu={menuProps}>
+        <Button>
+          <Space>
+            导出
+            <DownOutlined />
+          </Space>
+        </Button>
+      </Dropdown>,
+    );
+
+    toolBtns.push(
+      <Button
+        key="show"
+        onClick={() => {
+          handleAllExpand();
+        }}
+      >
+        {mainOrderAllItemKeys?.length !== expandedRowKeys.length
+          ? '一键展开'
+          : '一键收起'}
+      </Button>,
+    );
+
+    return toolBtns;
+  }
+
   return (
     <PageContainer
       header={{
@@ -363,30 +578,21 @@ const OrderPage = () =&gt; {
             filter,
             data: params,
           });
-          setMainOrderAllItemKeys(data?.data?.map((d) => d.id)); //存储所有主订单的key，一键展开用
+          let mainOrderIds = data?.data?.map((d) => d.id);
+          if (mainOrderAllItemKeys === undefined) {
+            setMainOrderAllItemKeys([]);
+          } else {
+            setMainOrderAllItemKeys(mainOrderIds);
+          }
+          setRolePath(data.specialPath);
           return {
             data: data?.data || [],
             total: data?.total || 0,
           };
         }}
-        toolBarRender={() => [
-          <Button
-            key="show"
-            onClick={() => {
-              handleAllExpand();
-            }}
-          >
-            {mainOrderAllItemKeys.length !== expandedRowKeys.length
-              ? '一键展开'
-              : '一键收起'}
-          </Button>,
-          <Button key="out" onClick={() => setOrderDrawerVisible(true)}>
-            新增
-          </Button>,
-          <Button key="primary" type="primary" onClick={() => {}}>
-            导出
-          </Button>,
-        ]}
+        toolBarRender={() => {
+          return toolBarRender();
+        }}
       />
       {orderDrawerVisible && (
@@ -416,8 +622,9 @@ const OrderPage = () =&gt; {
         <DeliverModal
           data={selectedRows}
           onClose={() => {
-            setCheckVisible(false);
+            setDeliverVisible(false);
             setOrderRow({});
+            mainTableRef.current?.reload();
           }}
         />
       )}
@@ -365,6 +365,30 @@ export interface DictionaryVO {
   sort?: number;
 }
+export interface InvoicingDto {
+  /**
+   * @description
+   *   收款时间
+   * @format date-time
+   * @example
+   *   2023-11-12 16:12
+   */
+  collectMoneyTime?: string;
+  /**
+   * @description
+   *   开票时间
+   * @format date-time
+   * @example
+   *   2023-11-12 16:12
+   */
+  invoicingTime?: string;
+  /**
+   * @description
+   *   子订单id集合
+   */
+  subIds?: Array<number>;
+}
+
 export interface ModelAndView {
   empty?: boolean;
   model?: any;
@@ -485,6 +509,15 @@ export interface OrderBaseInfoVO {
   smallPicUrl?: string;
 }
+export interface OrderCancelDto {
+  /**
+   * @description
+   *   订单id
+   * @format int64
+   */
+  id?: number;
+}
+
 export interface OrderCompletionReportFieldVO {
   ideaManualRate?: string;
   ideaSource?: string;
+import axios from 'axios';
+
+export const orderExport = async (data: any = {}) => {
+  // const res = await defHttp.post<any>({ url: Api.EXPORT, data });
+
+  axios({
+    url: '/service/order/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+    .then((response) => {
+      // 创建一个新的 Blob 对象，它包含了服务器响应的数据（即你的 Excel 文件）
+      const blob = new Blob([response.data]); // Excel 的 MIME 类型
+      const downloadUrl = window.URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = downloadUrl;
+      a.download = '订单.xlsx'; // 你可以为文件命名
+      document.body.appendChild(a);
+      a.click(); // 模拟点击操作来下载文件
+      URL.revokeObjectURL(downloadUrl); // 释放掉 blob 对象所占用的内存
+      document.body.removeChild(a);
+    })
+    .catch((error) => {
+      // 处理错误
+      console.error('导出错误', error);
+    });
+};
@@ -26,9 +26,12 @@ import type {
   DictionaryQueryVO,
   DictionaryVO,
   Dto,
+  InvoicingDto,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
+  OrderCancelDto,
   OrderFieldLockApplyQueryVO,
   OrderOptLogQueryVO,
   OrderProfitAnalysisVo,
@@ -217,9 +220,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -240,9 +241,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';
@@ -266,9 +267,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -294,9 +293,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__ */ (() => {
@@ -321,9 +320,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -349,9 +346,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__ */ (() => {
@@ -376,9 +373,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -399,9 +394,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';
@@ -425,9 +420,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -448,9 +441,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__ */ (() => {
@@ -475,9 +468,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -498,9 +489,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__ */ (() => {
@@ -525,9 +516,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -548,9 +537,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__ */ (() => {
@@ -4708,24 +4697,22 @@ export const postOrderErpUsersUpdatePass = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
-/** @description request parameter type for getServiceOrderOrderCancelId */
-export interface GetServiceOrderOrderCancelIdOption {
+/** @description request parameter type for postServiceOrderOrderCancel */
+export interface PostServiceOrderOrderCancelOption {
   /**
    * @description
-   *   id
-   * @format int64
+   *   dto
    */
-  path: {
+  body: {
     /**
         @description
-          id
-        @format int64 */
-    id: number;
+          dto */
+    dto: OrderCancelDto;
   };
 }
-/** @description response type for getServiceOrderOrderCancelId */
-export interface GetServiceOrderOrderCancelIdResponse {
+/** @description response type for postServiceOrderOrderCancel */
+export interface PostServiceOrderOrderCancelResponse {
   /**
    * @description
    *   OK
@@ -4733,6 +4720,11 @@ export interface GetServiceOrderOrderCancelIdResponse {
   200: ServerResult;
   /**
    * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
    *   Unauthorized
    */
   401: any;
@@ -4748,24 +4740,25 @@ export interface GetServiceOrderOrderCancelIdResponse {
   404: any;
 }
-export type GetServiceOrderOrderCancelIdResponseSuccess =
-  GetServiceOrderOrderCancelIdResponse[200];
+export type PostServiceOrderOrderCancelResponseSuccess =
+  PostServiceOrderOrderCancelResponse[200];
 /**
  * @description
  *   订单作废
  * @tags 内部订单
  * @produces *
+ * @consumes application/json
  */
-export const getServiceOrderOrderCancelId = /* #__PURE__ */ (() => {
-  const method = 'get';
-  const url = '/service/order/OrderCancel/:id';
+export const postServiceOrderOrderCancel = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/OrderCancel';
   function request(
-    option: GetServiceOrderOrderCancelIdOption,
-  ): Promise<GetServiceOrderOrderCancelIdResponseSuccess> {
+    option: PostServiceOrderOrderCancelOption,
+  ): Promise<PostServiceOrderOrderCancelResponseSuccess> {
     return requester(request.url, {
       method: request.method,
       ...option,
-    }) as unknown as Promise<GetServiceOrderOrderCancelIdResponseSuccess>;
+    }) as unknown as Promise<PostServiceOrderOrderCancelResponseSuccess>;
   }
   /** http method */
@@ -4917,8 +4910,8 @@ export const postServiceOrderCheckOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
-/** @description request parameter type for getServiceOrderConfirmReceipt */
-export interface GetServiceOrderConfirmReceiptOption {
+/** @description request parameter type for postServiceOrderConfirmReceipt */
+export interface PostServiceOrderConfirmReceiptOption {
   /**
    * @description
    *   file
@@ -4931,14 +4924,14 @@ export interface GetServiceOrderConfirmReceiptOption {
   };
 }
-/** @description request parameter type for getServiceOrderConfirmReceipt */
-export interface GetServiceOrderConfirmReceiptOption {
+/** @description request parameter type for postServiceOrderConfirmReceipt */
+export interface PostServiceOrderConfirmReceiptOption {
   /**
    * @description
    *   id
    * @format int64
    */
-  path: {
+  query: {
     /**
         @description
           id
@@ -4947,8 +4940,8 @@ export interface GetServiceOrderConfirmReceiptOption {
   };
 }
-/** @description response type for getServiceOrderConfirmReceipt */
-export interface GetServiceOrderConfirmReceiptResponse {
+/** @description response type for postServiceOrderConfirmReceipt */
+export interface PostServiceOrderConfirmReceiptResponse {
   /**
    * @description
    *   OK
@@ -4956,6 +4949,11 @@ export interface GetServiceOrderConfirmReceiptResponse {
   200: ServerResult;
   /**
    * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
    *   Unauthorized
    */
   401: any;
@@ -4971,8 +4969,8 @@ export interface GetServiceOrderConfirmReceiptResponse {
   404: any;
 }
-export type GetServiceOrderConfirmReceiptResponseSuccess =
-  GetServiceOrderConfirmReceiptResponse[200];
+export type PostServiceOrderConfirmReceiptResponseSuccess =
+  PostServiceOrderConfirmReceiptResponse[200];
 /**
  * @description
  *   确认收货
@@ -4980,16 +4978,16 @@ export type GetServiceOrderConfirmReceiptResponseSuccess =
  * @produces *
  * @consumes multipart/form-data
  */
-export const getServiceOrderConfirmReceipt = /* #__PURE__ */ (() => {
-  const method = 'get';
+export const postServiceOrderConfirmReceipt = /* #__PURE__ */ (() => {
+  const method = 'post';
   const url = '/service/order/confirmReceipt';
   function request(
-    option: GetServiceOrderConfirmReceiptOption,
-  ): Promise<GetServiceOrderConfirmReceiptResponseSuccess> {
+    option: PostServiceOrderConfirmReceiptOption,
+  ): Promise<PostServiceOrderConfirmReceiptResponseSuccess> {
     return requester(request.url, {
       method: request.method,
       ...option,
-    }) as unknown as Promise<GetServiceOrderConfirmReceiptResponseSuccess>;
+    }) as unknown as Promise<PostServiceOrderConfirmReceiptResponseSuccess>;
   }
   /** http method */
@@ -5070,6 +5068,20 @@ export const postServiceOrderExport = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderInvoicing */
+export interface PostServiceOrderInvoicingOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: InvoicingDto;
+  };
+}
+
 /** @description response type for postServiceOrderInvoicing */
 export interface PostServiceOrderInvoicingResponse {
   /**
@@ -5111,9 +5123,12 @@ export type PostServiceOrderInvoicingResponseSuccess =
 export const postServiceOrderInvoicing = /* #__PURE__ */ (() => {
   const method = 'post';
   const url = '/service/order/invoicing';
-  function request(): Promise<PostServiceOrderInvoicingResponseSuccess> {
+  function request(
+    option: PostServiceOrderInvoicingOption,
+  ): Promise<PostServiceOrderInvoicingResponseSuccess> {
     return requester(request.url, {
       method: request.method,
+      ...option,
     }) as unknown as Promise<PostServiceOrderInvoicingResponseSuccess>;
   }
@@ -5124,6 +5139,20 @@ export const postServiceOrderInvoicing = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderPrintOrder */
+export interface PostServiceOrderPrintOrderOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
 /** @description response type for postServiceOrderPrintOrder */
 export interface PostServiceOrderPrintOrderResponse {
   /**
@@ -5165,9 +5194,12 @@ export type PostServiceOrderPrintOrderResponseSuccess =
 export const postServiceOrderPrintOrder = /* #__PURE__ */ (() => {
   const method = 'post';
   const url = '/service/order/printOrder';
-  function request(): Promise<PostServiceOrderPrintOrderResponseSuccess> {
+  function request(
+    option: PostServiceOrderPrintOrderOption,
+  ): Promise<PostServiceOrderPrintOrderResponseSuccess> {
     return requester(request.url, {
       method: request.method,
+      ...option,
     }) as unknown as Promise<PostServiceOrderPrintOrderResponseSuccess>;
   }
@@ -33,7 +33,7 @@ const projects: Project[] = [
      * openapi 文档地址，可以是远程的json文件，也可以是本地的json文件
      * 如果使用本地文件，相对路径以当前'tsg.config.ts'为基准
      * */
-    source: 'http://localhost:8085/request.json',
+    source: 'http://localhost:8085/v2/api-docs',
     // source: 'https://petstore3.swagger.io/api/v3/openapi.json',
     // source: './fixture/pet.json',