Merge branch 'bugfix-0702' into 'master'

Bugfix 0702 See merge request !62

Merge branch 'bugfix-0702' into 'master'
Bugfix 0702 See merge request !62
柏杨
2 parents fa87b7a2 61e781a9
Showing 11 changed files with 322 additions and 44 deletions
src/pages/Order/FeedBack/OrderDrawer.tsx
src/pages/Order/FeedBack/constant.ts
src/pages/Order/Order/components/OrderDrawer.tsx
src/pages/Order/OrderList/HirePurchaseUploadPayBillModal.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/OrderList/PaymentRecordModal.tsx
src/pages/Order/OrderList/UploadPayBillModal.tsx
src/pages/Order/OrderWarning/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/utils/hooks.ts
@@ -1492,7 +1492,19 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           onChange={(val: any) => {
             setPaymentMethod(val);
           }}
-          options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
+          options={(() => {
+            // 使用Set记录已经处理过的选项值，避免重复
+            const processedValues = new Set();
+            const finalOptions = [];
+
+            // 处理可选项
+            enumToSelect(PAYMENT_METHOD_OPTIONS).forEach((option) => {
+              finalOptions.push(option);
+              processedValues.add(option.value);
+            });
+
+            return finalOptions;
+          })()}
           rules={[{ required: true, message: '支付方式必填' }]}
           disabled={optType('after-sales-check')}
         />
@@ -24,9 +24,10 @@ export const RECEIPTS_RECORD_TYPES = {
 export const PAYMENT_METHOD_OPTIONS = {
   UNPAID: '未付款',
   TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
-  OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
-  PAYMENT_IN_ADVANCE: '预付款',
-  WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
+  OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网已付',
+  PAYMENT_IN_ADVANCE: '预付',
+  PAYMENT_IN_TAOBAO: '淘宝',
+  WITHHOLDING_ADVANCE_DEPOSIT: '预付',
   PLATFORM_SETTLEMENT: '平台结算',
   CASH_ON_DELIVERY: '货到付款',
   HIRE_PURCHASE: '分期付款',
@@ -1501,7 +1501,19 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           onChange={(val: any) => {
             setPaymentMethod(val);
           }}
-          options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
+          options={(() => {
+            // 使用Set记录已经处理过的选项值，避免重复
+            const processedValues = new Set();
+            const finalOptions = [];
+
+            // 处理可选项
+            enumToSelect(PAYMENT_METHOD_OPTIONS).forEach((option) => {
+              finalOptions.push(option);
+              processedValues.add(option.value);
+            });
+
+            return finalOptions;
+          })()}
           rules={[{ required: true, message: '支付方式必填' }]}
           disabled={optType('after-sales-check')}
         />
@@ -22,6 +22,14 @@ interface HirePurchaseUploadPayBillModalProps {
   subOrders?: any[];
 }
+// Helper function to display dash for empty values
+// const displayValue = (value: any, formatter?: (val: any) => string): string => {
+//   if (value === null || value === undefined || value === '') {
+//     return '-';
+//   }
+//   return formatter ? formatter(value) : String(value);
+// };
+
 const HirePurchaseUploadPayBillModal: React.FC<
   HirePurchaseUploadPayBillModalProps
 > = ({
@@ -309,7 +317,12 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
               }}
             >
               <span>订单总金额：</span>
-              <span>{totalPayment.toFixed(2)}元</span>
+              <span>
+                {totalPayment !== null && totalPayment !== undefined
+                  ? totalPayment.toFixed(2)
+                  : '-'}
+                元
+              </span>
             </div>
             <div
               style={{
@@ -319,7 +332,12 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
               }}
             >
               <span>已回款金额：</span>
-              <span>{installedMoney.toFixed(2)}元</span>
+              <span>
+                {installedMoney !== null && installedMoney !== undefined
+                  ? installedMoney.toFixed(2)
+                  : '-'}
+                元
+              </span>
             </div>
             <div
               style={{
@@ -329,7 +347,12 @@ const HirePurchaseUploadPayBillModal: React.FC&lt;
               }}
             >
               <span>待回款金额：</span>
-              <span>{remainingMoney.toFixed(2)}元</span>
+              <span>
+                {remainingMoney !== null && remainingMoney !== undefined
+                  ? remainingMoney.toFixed(2)
+                  : '-'}
+                元
+              </span>
             </div>
           </div>
           <Form.Item
@@ -156,7 +156,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     let entity_number = await getTeacherCustomFieldNumber();
     //在单位详细信息中拿到自定义字段的值
-    let customField = res?.custom_field;
+    let customField = res?.customField;
     if (customField) {
       let teacherName = customField[entity_number];
       //填充到课题组老师表单字段中
@@ -1199,8 +1199,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               const currentPaymentMethod = form.getFieldValue('paymentMethod');
               if (!currentPaymentMethod) {
-                form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
-                setPaymentMethod('PAYMENT_IN_ADVANCE');
+                form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
+                setPaymentMethod('PAYMENT_IN_TAOBAO');
               }
             } else if (!optType('copy')) {
               // 非复制操作时，清空支付渠道和支付方式
@@ -1218,9 +1218,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 form.setFieldsValue({ paymentChannel: 'TAOBAO' });
                 setPaymentChannelDisabled(true);
-                // 支付方式默认锁定为预付
-                form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
-                setPaymentMethod('PAYMENT_IN_ADVANCE');
+                // 支付方式默认锁定为淘宝
+                form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
+                setPaymentMethod('PAYMENT_IN_TAOBAO');
                 setPaymentMethodDisabled(true);
               } else {
                 // 如果不是淘宝销售代码，解除锁定
@@ -1895,20 +1895,109 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             disabled={optType('after-sales-check')}
           />
         </div>
+        <ProFormSelect
+          placeholder="请输入支付方式"
+          name="paymentMethod"
+          width="lg"
+          key="paymentMethod"
+          label="支付方式"
+          onChange={(val: any) => {
+            setPaymentMethod(val);
+          }}
+          options={(() => {
+            // 使用Set记录已经处理过的选项值，避免重复
+            const processedValues = new Set();
+            const finalOptions = [];
+
+            // 先处理默认可选项
+            enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD).forEach((option) => {
+              // 将淘宝选项设置为禁用状态，使其无法手动选择
+              if (option.value === 'PAYMENT_IN_TAOBAO') {
+                finalOptions.push({ ...option, disabled: true });
+              } else {
+                finalOptions.push(option);
+              }
+              processedValues.add(option.value);
+            });
+
+            // 添加强制禁用项，但只添加尚未存在的选项
+            const disabledOptions = [
+              { label: '未付款', value: 'UNPAID', disabled: true },
+              {
+                label: '淘宝订单已付款',
+                value: 'TAOBAO_ORDER_HAS_BEEN_PAID',
+                disabled: true,
+              },
+              {
+                label: '官网已付',
+                value: 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID',
+                disabled: true,
+              },
+              { label: '淘宝', value: 'PAYMENT_IN_TAOBAO', disabled: true },
+              {
+                label: '预付',
+                value: 'WITHHOLDING_ADVANCE_DEPOSIT',
+                disabled: true,
+              },
+              {
+                label: '平台结算',
+                value: 'PLATFORM_SETTLEMENT',
+                disabled: true,
+              },
+              { label: '已回款', value: 'PAYMENT_RECEIPT', disabled: true },
+              {
+                label: '预存款无需发货',
+                value: 'PREPAID_NO_NEED_SEND',
+                disabled: true,
+              },
+            ];
+
+            disabledOptions.forEach((option) => {
+              if (!processedValues.has(option.value)) {
+                finalOptions.push(option);
+                processedValues.add(option.value);
+              }
+            });
+            return finalOptions;
+          })()}
+          rules={[{ required: true, message: '支付方式必填' }]}
+          disabled={optType('after-sales-check') || paymentMethodDisabled}
+          fieldProps={{
+            style: paymentMethodDisabled ? { backgroundColor: '#f5f5f5' } : {},
+          }}
+        />
         <ProFormSelect
           placeholder="请输入支付渠道"
           name="paymentChannel"
           width="lg"
           key="paymentChannel"
           label="支付渠道"
-          options={enumToSelect(PAYMENT_CHANNEL_OPTIONS).map((option) => {
-            // 将淘宝选项设置为禁用状态，使其无法手动选择
-            if (option.value === 'TAOBAO') {
-              return { ...option, disabled: true };
-            }
-            return option;
-          })}
+          options={(() => {
+            // 获取当前支付方式
+            const currentPaymentMethod =
+              paymentMethod || form.getFieldValue('paymentMethod');
+
+            return enumToSelect(PAYMENT_CHANNEL_OPTIONS).map((option) => {
+              // 将淘宝选项设置为禁用状态，使其无法手动选择
+              if (option.value === 'TAOBAO') {
+                return { ...option, disabled: true };
+              }
+
+              // 如果选择了"预存款无需发货"，禁用"平台结算"和"官网已付"选项
+              if (currentPaymentMethod === 'PREPAID_NO_NEED_SEND') {
+                if (
+                  option.value === 'PLATFORM' ||
+                  option.value === 'OFFICIAL_WEBSITE' ||
+                  option.value === 'BALANCE'
+                ) {
+                  return { ...option, disabled: true };
+                }
+              }
+
+              return option;
+            });
+          })()}
           rules={[{ required: true, message: '支付渠道必填' }]}
           disabled={optType('after-sales-check') || paymentChannelDisabled}
           fieldProps={{
@@ -1924,17 +2013,17 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               });
               setPaymentMethod('WITHHOLDING_ADVANCE_DEPOSIT');
             } else if (val === 'TAOBAO') {
-              // 支付渠道为淘宝时，支付方式设置为预付
+              // 支付渠道为淘宝时，支付方式设置为淘宝
               setPaymentMethodDisabled(true);
-              form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
-              setPaymentMethod('PAYMENT_IN_ADVANCE');
+              form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_TAOBAO' });
+              setPaymentMethod('PAYMENT_IN_TAOBAO');
             } else {
               // 支付渠道修改为其他的去除锁定状态
               setPaymentMethodDisabled(false);
             }
           }}
         />
-        <ProFormSelect
+        {/* <ProFormSelect
           placeholder="请输入支付方式"
           name="paymentMethod"
           width="lg"
@@ -1945,7 +2034,13 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           }}
           options={[
             // 默认可选项
-            ...enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD),
+            ...enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD).map(option => {
+              // 将淘宝选项设置为禁用状态，使其无法手动选择
+              if (option.value === 'PAYMENT_IN_TAOBAO') {
+                return { ...option, disabled: true };
+              }
+              return option;
+            }),
             // 强制禁用项
             { label: '未付款', value: 'UNPAID', disabled: true },
             {
@@ -1960,7 +2055,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             },
             {
               label: '淘宝',
-              value: 'PAYMENT_IN_ADVANCE',
+              value: 'PAYMENT_IN_TAOBAO',
               disabled: true,
             },
             {
@@ -1981,7 +2076,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           fieldProps={{
             style: paymentMethodDisabled ? { backgroundColor: '#f5f5f5' } : {},
           }}
-        />
+        /> */}
         {/* 隐藏字段用于存储真实UID和privatePocket标志 */}
         <ProFormText name="realPrepaidUid" hidden />
         <ProFormText name="privatePocket" hidden />
@@ -1084,14 +1084,14 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                   </span>
                 </div>
                 {/* 回款状态 */}
-                <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
+                {/* <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
                   <span className="text-slate-700">
                     {enumValueToLabel(
                       optRecord.paymentReceiptStatus,
                       PAYMENT_RECEIPTS_STATUS_OPTIONS,
                     )}
                   </span>
-                </div>
+                </div> */}
                 {/* 回款审核状态 */}
                 {optRecord.paymentReceiptStatus !== null ? (
                   <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap">
@@ -2752,7 +2752,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div>
                 <span className="text-[#8C8C8C]">已回款金额：￥</span>
                 <span className="text-slate-700">
-                  {record.payedMoney || '0.00'}
+                  {record.payedMoney || '0'}
                 </span>
               </div>
               <Divider type="vertical" />
@@ -2761,7 +2761,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div>
                 <span className="text-[#8C8C8C]">未回款金额：￥</span>
                 <span className="text-slate-700">
-                  {record.unPayedMoney || '0.00'}
+                  {record.unPayedMoney || '0'}
                 </span>
               </div>
               <Divider type="vertical" />
@@ -2770,7 +2770,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div>
                 <span className="text-[#8C8C8C]">发票核销金额：￥</span>
                 <span className="text-slate-700">
-                  {record.invoiceMoney || '0.00'}
+                  {record.invoiceMoney || '-'}
                 </span>
               </div>
               <Divider type="vertical" />
@@ -2852,7 +2852,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                   <div>
                     <span className="text-[#8C8C8C]">总金额：￥</span>
                     <span className="text-lg font-medium">
-                      {record.totalPayment}
+                      {record.totalPayment || '-'}
                     </span>
                   </div>
                 ) : (
@@ -20,6 +20,14 @@ interface PaymentRecord {
   paymentReceiptAnnexPartial: string | null;
 }
+// Helper function to display dash for empty values
+const displayValue = (value: any, formatter?: (val: any) => string): string => {
+  if (value === null || value === undefined || value === '') {
+    return '-';
+  }
+  return formatter ? formatter(value) : String(value);
+};
+
 const PaymentRecordModal: React.FC<PaymentRecordModalProps> = ({
   visible,
   mainOrderId,
@@ -90,11 +98,14 @@ const PaymentRecordModal: React.FC&lt;PaymentRecordModalProps&gt; = ({
                 <div className="payment-record-content">
                   <div className="payment-record-info">
                     <p>
-                      <strong>提交时间：</strong> {record.createTime}
+                      <strong>提交时间：</strong>{' '}
+                      {displayValue(record.createTime)}
                     </p>
                     <p>
                       <strong>付款金额：</strong>{' '}
-                      {record.refundMoney.toFixed(2)}
+                      {displayValue(record.refundMoney, (val) =>
+                        val.toFixed(2),
+                      )}
                     </p>
                     {imageUrls.length > 0 && (
                       <p>
@@ -217,7 +217,10 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
         onOpenChange={setVisible}
       >
         <div className="pb-4 text-base font-medium">
-          付款金额：￥{mainOrder?.totalPayment?.toLocaleString() || '0.00'}
+          付款金额：￥
+          {mainOrder?.totalPayment
+            ? mainOrder.totalPayment.toLocaleString()
+            : '-'}
         </div>
         <div className="flex items-start pb-4 text-base font-medium">
           <div>付款凭证：</div>
@@ -1611,7 +1611,24 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           onChange={(val: any) => {
             setPaymentMethod(val);
           }}
-          options={enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD)}
+          options={(() => {
+            // 使用Set记录已经处理过的选项值，避免重复
+            const processedValues = new Set();
+            const finalOptions = [];
+
+            // 先处理默认可选项
+            enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD).forEach((option) => {
+              // 将淘宝选项设置为禁用状态，使其无法手动选择
+              if (option.value === 'PAYMENT_IN_TAOBAO') {
+                finalOptions.push({ ...option, disabled: true });
+              } else {
+                finalOptions.push(option);
+              }
+              processedValues.add(option.value);
+            });
+
+            return finalOptions;
+          })()}
           rules={[{ required: true, message: '支付方式必填' }]}
           disabled={optType('after-sales-check')}
         />
@@ -24,22 +24,25 @@ export const RECEIPTS_RECORD_TYPES = {
 };
 export const PAYMENT_METHOD_OPTIONS = {
-  UNPAID: '未付款',
-  TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
-  OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
-  PAYMENT_IN_ADVANCE: '预付款',
-  WITHHOLDING_ADVANCE_DEPOSIT: '预付',
+  // UNPAID: '未付款',
+  // TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
+  OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网已付',
+  PAYMENT_IN_ADVANCE: '预付',
+  PAYMENT_IN_TAOBAO: '淘宝',
+  WITHHOLDING_ADVANCE_DEPOSIT: '预付(扣预存)',
   PLATFORM_SETTLEMENT: '平台结算',
   CASH_ON_DELIVERY: '货到付款',
   HIRE_PURCHASE: '分期付款',
-  PAYMENT_RECEIPT: '已回款',
+  // PAYMENT_RECEIPT: '已回款',
   PREPAID_NO_NEED_SEND: '预存款无需发货',
 };
 export const PAYMENT_METHOD_OPTIONS_4_ADD = {
   PAYMENT_IN_ADVANCE: '预付',
+  PAYMENT_IN_TAOBAO: '淘宝',
   CASH_ON_DELIVERY: '货到付款',
   HIRE_PURCHASE: '分期付款',
+  PREPAID_NO_NEED_SEND: '预存款无需发货',
 };
 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
@@ -197,6 +200,12 @@ export const PAYMENT_RECEIPTS_STATUS_OPTIONS = {
   PARTIAL_RECEIVED: '待提交',
 };
+export const PAYMENT_AUDIT_STATUS_OPTIONS = {
+  WAIT_PAYMENT: '待付款',
+  PARTIAL_PAYMENT: '部分付款',
+  COMPLETE_PAYMENT: '已付款',
+};
+
 export const ORDER_STATUS_OPTIONS = {
   WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
   SALES_CONFIRM: '销售待确认',
@@ -596,6 +605,13 @@ export const MAIN_ORDER_COLUMNS = [
     valueEnum: enumToProTableEnumValue(ORDER_STATUS_OPTIONS),
   },
   {
+    title: '付款状态',
+    dataIndex: 'paymentAuditStatus',
+    valueType: 'select',
+    hideInTable: true,
+    valueEnum: enumToProTableEnumValue(PAYMENT_AUDIT_STATUS_OPTIONS),
+  },
+  {
     title: '修改审核状态',
     dataIndex: 'modifiedAuditStatus',
     valueType: 'select',
+import { useRef } from 'react';
+
+/**
+ * Custom hook to track and manage API requests with debouncing and manual refresh capabilities
+ * @param cooldownMs - Cooldown time in milliseconds between automatic requests
+ * @returns Object with tracking state and utility functions
+ */
+export const useRequestTracker = (cooldownMs = 5000) => {
+  // Use a ref to persist the state between renders
+  const trackerRef = useRef({
+    initialRequestMade: false,
+    pendingRequest: false,
+    lastRequestTime: 0,
+    manualRefresh: false,
+  });
+
+  /**
+   * Checks if a request should be executed based on tracking state
+   * @returns boolean - Whether the request should proceed
+   */
+  const shouldExecuteRequest = () => {
+    const now = Date.now();
+    const tracker = trackerRef.current;
+
+    // Always execute if it's a manual refresh
+    if (tracker.manualRefresh) {
+      console.log(
+        '[Request Tracker] Manual refresh triggered, executing request',
+      );
+      tracker.manualRefresh = false;
+      tracker.lastRequestTime = now;
+      return true;
+    }
+
+    // If there's a pending request, don't execute another
+    if (tracker.pendingRequest) {
+      console.log('[Request Tracker] Request already in progress, skipping');
+      return false;
+    }
+
+    // For automatic requests (not manually triggered), apply cooldown
+    if (
+      tracker.initialRequestMade &&
+      now - tracker.lastRequestTime < cooldownMs
+    ) {
+      console.log(
+        `[Request Tracker] Cooldown active (${cooldownMs}ms), skipping automatic request`,
+      );
+      return false;
+    }
+
+    // Otherwise, allow the request
+    console.log('[Request Tracker] Executing request');
+    tracker.lastRequestTime = now;
+    return true;
+  };
+
+  /**
+   * Marks the beginning of a request
+   */
+  const startRequest = () => {
+    trackerRef.current.pendingRequest = true;
+  };
+
+  /**
+   * Marks the completion of a request
+   */
+  const finishRequest = () => {
+    const tracker = trackerRef.current;
+    tracker.pendingRequest = false;
+    tracker.initialRequestMade = true;
+  };
+
+  /**
+   * Marks a request as manually triggered (will bypass cooldown)
+   */
+  const markAsManualRefresh = () => {
+    trackerRef.current.manualRefresh = true;
+  };
+
+  return {
+    tracker: trackerRef.current,
+    shouldExecuteRequest,
+    startRequest,
+    finishRequest,
+    markAsManualRefresh,
+  };
+};