Merge branch 'refs/heads/znh'

# Conflicts: # src/services/request.ts

Merge branch 'refs/heads/znh'
# Conflicts: # src/services/request.ts
zhongnanhuang
2 parents d0febb15 bb005341
Showing 4 changed files with 29 additions and 456 deletions
src/pages/Invoice/constant.tsx
src/pages/Order/components/ReissueModal.tsx
src/services/definition.ts
src/services/request.ts
@@ -175,14 +175,14 @@ export const BANK_STATEMENT_COLUMNS = [
     width: 100,
   },
   {
-    dataIndex: 'collectionDate',
+    dataIndex: 'collectionDatetime',
     title: '收款时间',
     valueType: 'date',
     width: 100,
     hideInSearch: true,
   },
   {
-    dataIndex: 'collectionDateSearch',
+    dataIndex: 'collectionDatetimeSearch',
     title: '收款时间',
     valueType: 'dateRange',
     width: 100,
@@ -191,8 +191,8 @@ export const BANK_STATEMENT_COLUMNS = [
       transform: (value) => {
         if (value) {
           return {
-            collectionDateBegin: value[0],
-            collectionDateEnd: value[1],
+            collectionDatetimeBegin: value[0],
+            collectionDatetimeEnd: value[1],
           };
         }
       },
@@ -32,7 +32,7 @@ export default ({ setVisible, mainOrder, onClose }) =&gt; {
       let temInvoiceSelectList = [];
       res.data.forEach((item) => {
         temInvoiceSelectList.push({
-          label: item.id,
+          label: item.invoiceNumber,
           value: item.id,
         });
       });
@@ -1478,13 +1478,13 @@ export interface QueryBankStatementDto {
    *   collection_date
    * @format date
    */
-  collectionDateBegin?: string;
+  collectionDatetimeBegin?: string;
   /**
    * @description
    *   collection_date
    * @format date
    */
-  collectionDateEnd?: string;
+  collectionDatetimeEnd?: string;
   /** @format int32 */
   current?: number;
   /** @format int64 */
@@ -24,9 +24,6 @@ import type {
   ApiApplyAddressModifyRequest,
   ApiApplyAfterSalesRequest,
   ApiCreateOrderRequest,
-  ApiOrderConfirmReceiveRequest,
-  ApiOrderCustomersRequest,
-  ApiOrderEvaluatedRequest,
   ApiQueryOrderDetailRequest,
   ApiQueryOrderStatusCountsRequest,
   AuditDto,
@@ -52,6 +49,7 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -93,8 +91,6 @@ import type {
   UpdateHirePurchaseDto,
   UpdatePwdVO,
   UploadPaymentReceiptDTO,
-  UserAddressListRequest,
-  UserCenterInfoRequest,
   UserDetailRequest,
   UserListRequest,
 } from './definition';
@@ -411,77 +407,6 @@ export const postApiOrderApplyAfterSales = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
-/** @description request parameter type for postApiOrderConfirmReceive */
-export interface PostApiOrderConfirmReceiveOption {
-  /**
-   * @description
-   *   request
-   */
-  body: {
-    /**
-        @description
-          request */
-    request: ApiOrderConfirmReceiveRequest;
-  };
-}
-
-/** @description response type for postApiOrderConfirmReceive */
-export interface PostApiOrderConfirmReceiveResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: ServerResult;
-  /**
-   * @description
-   *   Created
-   */
-  201: any;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type PostApiOrderConfirmReceiveResponseSuccess =
-  PostApiOrderConfirmReceiveResponse[200];
-/**
- * @description
- *   确认收货
- * @tags 内部订单
- * @produces *
- * @consumes application/json
- */
-export const postApiOrderConfirmReceive = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/api/order/confirmReceive';
-  function request(
-    option: PostApiOrderConfirmReceiveOption,
-  ): Promise<PostApiOrderConfirmReceiveResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-      ...option,
-    }) as unknown as Promise<PostApiOrderConfirmReceiveResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
 /** @description request parameter type for postApiOrderCreateOrder */
 export interface PostApiOrderCreateOrderOption {
   /**
@@ -553,148 +478,6 @@ export const postApiOrderCreateOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
-/** @description request parameter type for postApiOrderCustomers */
-export interface PostApiOrderCustomersOption {
-  /**
-   * @description
-   *   request
-   */
-  body: {
-    /**
-        @description
-          request */
-    request: ApiOrderCustomersRequest;
-  };
-}
-
-/** @description response type for postApiOrderCustomers */
-export interface PostApiOrderCustomersResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: ServerResult;
-  /**
-   * @description
-   *   Created
-   */
-  201: any;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type PostApiOrderCustomersResponseSuccess =
-  PostApiOrderCustomersResponse[200];
-/**
- * @description
- *   查询订单客户信息
- * @tags 内部订单
- * @produces *
- * @consumes application/json
- */
-export const postApiOrderCustomers = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/api/order/customers';
-  function request(
-    option: PostApiOrderCustomersOption,
-  ): Promise<PostApiOrderCustomersResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-      ...option,
-    }) as unknown as Promise<PostApiOrderCustomersResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
-/** @description request parameter type for postApiOrderEvaluated */
-export interface PostApiOrderEvaluatedOption {
-  /**
-   * @description
-   *   request
-   */
-  body: {
-    /**
-        @description
-          request */
-    request: ApiOrderEvaluatedRequest;
-  };
-}
-
-/** @description response type for postApiOrderEvaluated */
-export interface PostApiOrderEvaluatedResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: ServerResult;
-  /**
-   * @description
-   *   Created
-   */
-  201: any;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type PostApiOrderEvaluatedResponseSuccess =
-  PostApiOrderEvaluatedResponse[200];
-/**
- * @description
- *   评价子订单
- * @tags 内部订单
- * @produces *
- * @consumes application/json
- */
-export const postApiOrderEvaluated = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/api/order/evaluated';
-  function request(
-    option: PostApiOrderEvaluatedOption,
-  ): Promise<PostApiOrderEvaluatedResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-      ...option,
-    }) as unknown as Promise<PostApiOrderEvaluatedResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
 /** @description request parameter type for postApiOrderInvoicedOrderList */
 export interface PostApiOrderInvoicedOrderListOption {
   /**
@@ -837,60 +620,6 @@ export const postApiOrderInvoicedRecordList = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
-/** @description response type for postApiOrderListAllSubOrderBaseInfo */
-export interface PostApiOrderListAllSubOrderBaseInfoResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: ServerResult;
-  /**
-   * @description
-   *   Created
-   */
-  201: any;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type PostApiOrderListAllSubOrderBaseInfoResponseSuccess =
-  PostApiOrderListAllSubOrderBaseInfoResponse[200];
-/**
- * @description
- *   查询所有子订单基本信息
- * @tags 内部订单
- * @produces *
- * @consumes application/json
- */
-export const postApiOrderListAllSubOrderBaseInfo = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/api/order/listAllSubOrderBaseInfo';
-  function request(): Promise<PostApiOrderListAllSubOrderBaseInfoResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-    }) as unknown as Promise<PostApiOrderListAllSubOrderBaseInfoResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
 /** @description request parameter type for postApiOrderQueryOrderDetail */
 export interface PostApiOrderQueryOrderDetailOption {
   /**
@@ -1246,148 +975,6 @@ export const postApiOrderWaitInvoiceOrderList = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
-/** @description request parameter type for postCanrdApiUserAddressList */
-export interface PostCanrdApiUserAddressListOption {
-  /**
-   * @description
-   *   request
-   */
-  body: {
-    /**
-        @description
-          request */
-    request: UserAddressListRequest;
-  };
-}
-
-/** @description response type for postCanrdApiUserAddressList */
-export interface PostCanrdApiUserAddressListResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: ServerResult;
-  /**
-   * @description
-   *   Created
-   */
-  201: any;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type PostCanrdApiUserAddressListResponseSuccess =
-  PostCanrdApiUserAddressListResponse[200];
-/**
- * @description
- *   查询地址信息
- * @tags canrd-mobile-api-controller
- * @produces *
- * @consumes application/json
- */
-export const postCanrdApiUserAddressList = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/canrd/api/user/address/list';
-  function request(
-    option: PostCanrdApiUserAddressListOption,
-  ): Promise<PostCanrdApiUserAddressListResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-      ...option,
-    }) as unknown as Promise<PostCanrdApiUserAddressListResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
-/** @description request parameter type for postCanrdApiUserCenterInfo */
-export interface PostCanrdApiUserCenterInfoOption {
-  /**
-   * @description
-   *   request
-   */
-  body: {
-    /**
-        @description
-          request */
-    request: UserCenterInfoRequest;
-  };
-}
-
-/** @description response type for postCanrdApiUserCenterInfo */
-export interface PostCanrdApiUserCenterInfoResponse {
-  /**
-   * @description
-   *   OK
-   */
-  200: ServerResult;
-  /**
-   * @description
-   *   Created
-   */
-  201: any;
-  /**
-   * @description
-   *   Unauthorized
-   */
-  401: any;
-  /**
-   * @description
-   *   Forbidden
-   */
-  403: any;
-  /**
-   * @description
-   *   Not Found
-   */
-  404: any;
-}
-
-export type PostCanrdApiUserCenterInfoResponseSuccess =
-  PostCanrdApiUserCenterInfoResponse[200];
-/**
- * @description
- *   获取会员详情
- * @tags canrd-mobile-api-controller
- * @produces *
- * @consumes application/json
- */
-export const postCanrdApiUserCenterInfo = /* #__PURE__ */ (() => {
-  const method = 'post';
-  const url = '/canrd/api/user/center/info';
-  function request(
-    option: PostCanrdApiUserCenterInfoOption,
-  ): Promise<PostCanrdApiUserCenterInfoResponseSuccess> {
-    return requester(request.url, {
-      method: request.method,
-      ...option,
-    }) as unknown as Promise<PostCanrdApiUserCenterInfoResponseSuccess>;
-  }
-
-  /** http method */
-  request.method = method;
-  /** request url */
-  request.url = url;
-  return request;
-})();
-
 /** @description request parameter type for postCanrdApiUserDetail */
 export interface PostCanrdApiUserDetailOption {
   /**
@@ -1536,9 +1123,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -1559,9 +1144,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';
@@ -1585,9 +1170,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -1613,9 +1196,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__ */ (() => {
@@ -1640,9 +1223,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -1668,9 +1249,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__ */ (() => {
@@ -1695,9 +1276,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -1718,9 +1297,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';
@@ -1744,9 +1323,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -1767,9 +1344,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__ */ (() => {
@@ -1794,9 +1371,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -1817,9 +1392,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__ */ (() => {
@@ -1844,9 +1419,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -1867,9 +1440,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__ */ (() => {