Merge branch 'dev' into 'feature-installment'

Dev See merge request !49

Merge branch 'dev' into 'feature-installment'
Dev See merge request !49
boyang
2 parents 08b51e1d a7bdcfd1
Showing 2 changed files with 59 additions and 21 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/constant.ts
@@ -250,6 +250,30 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     console.log(newAccountOptions);
     setAccountOptions(newAccountOptions);
+
+    // 如果privatePocket为true且有隐私钱包选项，自动选择隐私钱包
+    if (copyData.privatePocket === true || copyData.privatePocket === 'true') {
+      console.log('检测到privatePocket为true，尝试自动选择隐私钱包');
+
+      // 查找隐私钱包选项
+      const privacyWalletOption = newAccountOptions.find(
+        (option) => option.institution === '隐私钱包',
+      );
+
+      if (privacyWalletOption) {
+        // 找到了隐私钱包选项，获取其索引
+        const index = newAccountOptions.indexOf(privacyWalletOption);
+        // 构造包含索引的value值 (与ProFormSelect的options映射保持一致)
+        const valueWithIndex = `${privacyWalletOption.value}_${index}`;
+
+        // 设置表单字段值
+        form.setFieldValue('prepaidUid', valueWithIndex);
+        form.setFieldValue('realPrepaidUid', privacyWalletOption.uid);
+        form.setFieldValue('privatePocket', 'true');
+      } else {
+        console.log('未找到可用的隐私钱包选项');
+      }
+    }
   }
   /**
@@ -933,24 +957,35 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             values.erpCustomerId = values.erpCustomerId?.id;
           }
+          values.province = province;
+          values.city = city;
+          values.district = district;
+
           // Handle the prepaidUid and privatePocket values for API submission
           if (
             values.paymentMethod === 'WITHHOLDING_ADVANCE_DEPOSIT' &&
             values.prepaidUid
           ) {
-            console.log('5656原始表单数据:', {
-              prepaidUid: values.prepaidUid,
-              realPrepaidUid: values.realPrepaidUid,
-              privatePocket: values.privatePocket,
-            });
-
             // 从选项值中提取原始UID (不包含索引后缀)
-            const prepaidUidParts = values.prepaidUid.split('_');
-            if (prepaidUidParts.length > 0) {
-              // 直接使用第一部分作为实际UID值 (不使用realPrepaidUid)
-              values.prepaidUid = parseInt(prepaidUidParts[0], 10);
-              console.log('5656使用原始UID进行API提交:', values.prepaidUid);
+            // 检查prepaidUid是否为字符串类型并包含下划线
+            if (
+              values.prepaidUid &&
+              typeof values.prepaidUid === 'string' &&
+              values.prepaidUid.includes('_')
+            ) {
+              const prepaidUidParts = values.prepaidUid.split('_');
+              if (prepaidUidParts.length > 0) {
+                // 直接使用第一部分作为实际UID值 (不使用realPrepaidUid)
+                values.prepaidUid = parseInt(prepaidUidParts[0], 10);
+              }
+            } else if (
+              values.prepaidUid &&
+              typeof values.prepaidUid === 'string'
+            ) {
+              // 处理纯字符串情况 (没有索引后缀)
+              values.prepaidUid = parseInt(values.prepaidUid, 10);
             }
+            // 如果是数字类型，则无需处理
             // 确保privatePocket字段被正确设置
             // 表单中存储的是字符串'true'或'false'，需要转换成布尔值
@@ -968,8 +1003,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             });
           }
-          console.log(values, '5656values');
-
           //新增
           if (optType('add') || optType('copy')) {
             res = await postServiceOrderAddOrder({ data: values });
@@ -1102,7 +1135,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             autoFillSalesInfo(option);
             // 检查是否是特殊的淘宝销售代码
-            const isTaobaoSalesCode = ['TB', 'TBHC', 'HCTB'].includes(value);
+            const isTaobaoSalesCode = ['TB', 'TBC', 'HCTB'].includes(value);
             if (isTaobaoSalesCode) {
               // 设置支付渠道为淘宝并锁定
@@ -1802,8 +1835,16 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           rules={[{ required: true, message: '支付渠道必填' }]}
           disabled={optType('after-sales-check') || paymentChannelDisabled}
           onChange={(val: any) => {
-            // 当支付渠道选为扣预存或淘宝时，付款方式默认锁定为预付
-            if (val === 'BALANCE' || val === 'TAOBAO') {
+            // 根据支付渠道设置不同的支付方式
+            if (val === 'BALANCE') {
+              // 支付渠道为扣预存时，支付方式设置为扣预存
+              setPaymentMethodDisabled(true);
+              form.setFieldsValue({
+                paymentMethod: 'WITHHOLDING_ADVANCE_DEPOSIT',
+              });
+              setPaymentMethod('WITHHOLDING_ADVANCE_DEPOSIT');
+            } else if (val === 'TAOBAO') {
+              // 支付渠道为淘宝时，支付方式设置为预付
               setPaymentMethodDisabled(true);
               form.setFieldsValue({ paymentMethod: 'PAYMENT_IN_ADVANCE' });
               setPaymentMethod('PAYMENT_IN_ADVANCE');
@@ -1838,7 +1879,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               disabled: true,
             },
             {
-              label: '扣预存',
+              label: '预付',
               value: 'WITHHOLDING_ADVANCE_DEPOSIT',
               disabled: true,
             },
@@ -1865,9 +1906,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           showSearch
           label="预存账号"
           onChange={async (value: any, option: any) => {
-            console.log(value, '5656value');
-            console.log(option, '5656option');
-
             if (!option) {
               form.setFieldValue('prepaidUid', undefined);
               form.setFieldValue('privatePocket', false);
@@ -28,7 +28,7 @@ export const PAYMENT_METHOD_OPTIONS = {
   TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
   OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
   PAYMENT_IN_ADVANCE: '预付款',
-  WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
+  WITHHOLDING_ADVANCE_DEPOSIT: '预付',
   PLATFORM_SETTLEMENT: '平台结算',
   CASH_ON_DELIVERY: '货到付款',
   HIRE_PURCHASE: '分期付款',