feat: update 收货人选项清除后报错修复

zhongnanhuang
1 parent 60aa1cb0
Showing 4 changed files with 437 additions and 5 deletions
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/services/definition.ts
src/services/request.ts
@@ -498,13 +498,16 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    * @param option 收货人信息
    */
   async function autoFillCustomerInfo(option: any) {
-    if (option.type === 'add') {
+    if (option === undefined || option === null || option.type === 'add') {
       form.setFieldValue('customerShippingAddress', undefined);
       form.setFieldValue('customerContactNumber', undefined);
       form.setFieldValue('institution', undefined);
       form.setFieldValue('institutionContactName', undefined);
       form.setFieldValue('customerShippingAddress', undefined);
-      form.setFieldValue('customerNameString', option.name);
+
+      if (option !== undefined && option !== null) {
+        form.setFieldValue('customerNameString', option.name);
+      }
     } else {
       form.setFieldValue('customerShippingAddress', option.fullAddress);
       form.setFieldValue('customerContactNumber', option.phone);
@@ -1073,7 +1076,21 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             width="lg"
             key="totalPayment"
             label="支付总额（￥）"
-            rules={[{ required: true, message: '支付总额必填' }]}
+            rules={[
+              { required: true, message: '支付总额必填' },
+              {
+                validator: (_, value) => {
+                  if (value <= 0) {
+                    return Promise.reject(
+                      new Error(
+                        '支付总额必须大于0 （扣预存的订单现在也必须填写实际金额）',
+                      ),
+                    );
+                  }
+                  return Promise.resolve();
+                },
+              },
+            ]}
             tooltip="点击计算，合计所有子订单金额"
             fieldProps={{
               addonAfter: (
@@ -8,6 +8,7 @@ export const PAYMENT_CHANNEL_OPTIONS = {
   WECHAT: '微信',
   BANK_TRANSFER: '银行转账',
   BALANCE: '预存款',
+  OFFLINE: '线下付款',
 };
  
 export const RECEIPTS_RECORD_TYPES = {
@@ -1478,13 +1478,13 @@ export interface QueryBankStatementDto {
    *   collection_date
    * @format date
    */
-  collectionDatetimeBegin?: string;
+  collectionDateBegin?: string;
   /**
    * @description
    *   collection_date
    * @format date
    */
-  collectionDatetimeEnd?: string;
+  collectionDateEnd?: string;
   /** @format int32 */
   current?: number;
   /** @format int64 */
@@ -24,6 +24,9 @@ import type {
   ApiApplyAddressModifyRequest,
   ApiApplyAfterSalesRequest,
   ApiCreateOrderRequest,
+  ApiOrderConfirmReceiveRequest,
+  ApiOrderCustomersRequest,
+  ApiOrderEvaluatedRequest,
   ApiQueryOrderDetailRequest,
   ApiQueryOrderStatusCountsRequest,
   AuditDto,
@@ -91,6 +94,8 @@ import type {
   UpdateHirePurchaseDto,
   UpdatePwdVO,
   UploadPaymentReceiptDTO,
+  UserAddressListRequest,
+  UserCenterInfoRequest,
   UserDetailRequest,
   UserListRequest,
 } from './definition';
@@ -407,6 +412,77 @@ 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 {
   /**
@@ -478,6 +554,148 @@ 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 {
   /**
@@ -620,6 +838,60 @@ 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 {
   /**
@@ -975,6 +1247,148 @@ 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 {
   /**