From 241ad03f51d8299b681d40c3d453f9e268e90db5 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 29 May 2022 17:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=AE=A1=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinancialTerminal/ProcurementAuditViewModel.cs         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
index 889a52a3..089cbd38 100644
--- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
+++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
@@ -353,6 +353,10 @@ namespace BBWY.Client.ViewModels
                 foreach (var line in importResult.Lines)
                 {
                     var array = line.CSVstrToArry();
+                    var sourceMerchantOrderNo = array[2].FormatString();
+                    if (!string.IsNullOrEmpty(sourceMerchantOrderNo) && sourceMerchantOrderNo.StartsWith("XP"))
+                        continue; //暂时不支持此类商户单号
+
                     var expenditureAmount = decimal.Parse(array[7].FormatString());
                     if (expenditureAmount == 0)  //支出为0的账单不参与审计
                         continue;
@@ -364,7 +368,7 @@ namespace BBWY.Client.ViewModels
                         BelongFileName = importResult.FileName,
                         PayBillNo = payBillNo,
                         PayBillType = PayBillType.AliPay,
-                        SourceMerchantOrderNo = array[2].FormatString(),
+                        SourceMerchantOrderNo = sourceMerchantOrderNo,
                         ProductName = array[3].FormatString(),
                         PayTime = DateTime.Parse(array[4].FormatString()),
                         OppositeAccount = array[5].FormatString(),
@@ -373,6 +377,7 @@ namespace BBWY.Client.ViewModels
                     payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo;
                     if (payBill.SourceMerchantOrderNo.StartsWith("T50060NP"))
                         payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo.Substring(8);
+
                     AuditPayBillList.Add(payBill);
                 }
             }