fix: 修改支付方式

柏杨
1 parent 91b420d8
Showing 5 changed files with 125 additions and 48 deletions
src/pages/Order/FeedBack/OrderDrawer.tsx
src/pages/Order/Order/components/OrderDrawer.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/OrderWarning/components/OrderDrawer.tsx
@@ -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')}
         />
@@ -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')}
         />
@@ -1904,45 +1904,63 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           onChange={(val: any) => {
             setPaymentMethod(val);
           }}
-          options={[
-            // 默认可选项
-            ...enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD).map((option) => {
+          options={(() => {
+            // 使用Set记录已经处理过的选项值，避免重复
+            const processedValues = new Set();
+            const finalOptions = [];
+
+            // 先处理默认可选项
+            enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD).forEach((option) => {
               // 将淘宝选项设置为禁用状态，使其无法手动选择
               if (option.value === 'PAYMENT_IN_TAOBAO') {
-                return { ...option, disabled: true };
+                finalOptions.push({ ...option, disabled: true });
+              } else {
+                finalOptions.push(option);
               }
-              return option;
-            }),
-            // 强制禁用项
-            { 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,
-            },
-          ]}
+              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={{
@@ -1955,13 +1973,31 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           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={{
@@ -2752,7 +2752,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div>
                 <span className="text-[#8C8C8C]">已回款金额：￥</span>
                 <span className="text-slate-700">
-                  {record.payedMoney || '-'}
+                  {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 || '-'}
+                  {record.unPayedMoney || '0'}
                 </span>
               </div>
               <Divider type="vertical" />
@@ -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')}
         />