Commit 7c4771f4 by 陶然

优化

parent 68854abf
...@@ -16,7 +16,8 @@ namespace Com.Bocom.OpenApi ...@@ -16,7 +16,8 @@ namespace Com.Bocom.OpenApi
/// 测试环境 /// 测试环境
/// </summary> /// </summary>
//internal static string APIGW_URL_ADDRESS = "https://open.test.bankcomm.com:9443/uat";//"https://117.184.192.242:9443"; //internal static string APIGW_URL_ADDRESS = "https://open.test.bankcomm.com:9443/uat";//"https://117.184.192.242:9443";
internal static string basicUrlQrCode = "https://open.test.bankcomm.com:9443";//"https://117.184.192.242:9443"; internal static string basicUrlQrCode = "https://117.184.192.242:9443";//"https://open.test.bankcomm.com:9443";
//internal static string basicUrlQrCode = "https://open.test.bankcomm.com:9443";
/// <summary> /// <summary>
/// 智慧记账正式环境 /// 智慧记账正式环境
......
...@@ -146,6 +146,10 @@ ...@@ -146,6 +146,10 @@
<Name>Kivii.Biz.Finances.V2.0</Name> <Name>Kivii.Biz.Finances.V2.0</Name>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Njzj.Biz.Finances.Bocoms\Njzj.Biz.Finances.Bocoms.V4.5.csproj">
<Project>{ff478a9b-20f1-471e-b163-7a70b1933c25}</Project>
<Name>Njzj.Biz.Finances.Bocoms.V4.5</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
...@@ -165,7 +165,7 @@ namespace Njzj.Bocoms.Openapis ...@@ -165,7 +165,7 @@ namespace Njzj.Bocoms.Openapis
var writeOff = matchWriteOffs.FirstOrDefault(o => o.BizKvid == settlement.Kvid); var writeOff = matchWriteOffs.FirstOrDefault(o => o.BizKvid == settlement.Kvid);
if (writeOff == null) if (writeOff == null)
{ {
TaskContext.Message = $"Error:10004,[{settlement.Kvid}]未找到此账单通知信息!"; TaskContext.Message = $"Error:10004,[{settlement.Kvid}]未找到此账单通知信息,WO:{matchWriteOffs.Count},ST:{preSettlements.Count},CST:{preSettlements.FindIndex(o => o.Kvid == settlement.Kvid)}!";
continue; continue;
} }
var currentPayments = new List<Payment>(); var currentPayments = new List<Payment>();
...@@ -175,7 +175,7 @@ namespace Njzj.Bocoms.Openapis ...@@ -175,7 +175,7 @@ namespace Njzj.Bocoms.Openapis
var splitSerial = pay.vch_no.Split('-'); var splitSerial = pay.vch_no.Split('-');
if (splitSerial.Length != 3) if (splitSerial.Length != 3)
{ {
TaskContext.Message = $"Error:10005,[{writeOff.BillId}]vch_no号格式不符合Split规则!"; TaskContext.Message = $"Error:10005,[{writeOff.BillId}]vch_no号格式不符合Split规则,WO:{matchWriteOffs.Count},ST:{preSettlements.Count},CST:{preSettlements.FindIndex(o => o.Kvid == settlement.Kvid)}!";
continue; continue;
} }
//var serialNumber = splitSerial[1]; //var serialNumber = splitSerial[1];
...@@ -184,26 +184,26 @@ namespace Njzj.Bocoms.Openapis ...@@ -184,26 +184,26 @@ namespace Njzj.Bocoms.Openapis
serialNumber = $"{serialNumber}{number}"; serialNumber = $"{serialNumber}{number}";
if (serialNumber.IsNullOrEmpty()) if (serialNumber.IsNullOrEmpty())
{ {
TaskContext.Message = $"Error:10006,[{writeOff.BillId}]vch_no截取的流水号是空!"; TaskContext.Message = $"Error:10006,[{writeOff.BillId}]vch_no截取的流水号是空,WO:{matchWriteOffs.Count},ST:{preSettlements.Count},CST:{preSettlements.FindIndex(o => o.Kvid == settlement.Kvid)}";
continue; continue;
} }
var payment = payments.FirstOrDefault(o => o.SerialNumber == serialNumber); var payment = payments.FirstOrDefault(o => o.SerialNumber == serialNumber);
if (payment == null) if (payment == null)
{ {
TaskContext.Message = $"Error:20002,[{writeOff.BillId}]未找到此流水号[{serialNumber}]的到账信息!"; TaskContext.Message = $"Error:20002,[{writeOff.BillId}]未找到此流水号[{serialNumber}]的到账信息,WO:{matchWriteOffs.Count},ST:{preSettlements.Count},CST:{preSettlements.FindIndex(o => o.Kvid == settlement.Kvid)}";
continue; continue;
} }
var amountTotal = pay.jnl_write_off_amt.ToDecimal(); var amountTotal = pay.jnl_write_off_amt.ToDecimal();
if (payment.Amount - payment.AmountUsed < amountTotal) if (payment.Amount - payment.AmountUsed < amountTotal)
{ {
TaskContext.Message = $"Error:20003,流水[{payment.SerialNumber}]可用金额不足!"; TaskContext.Message = $"Error:20003,流水[{payment.SerialNumber}]可用金额不足,WO:{matchWriteOffs.Count},ST:{preSettlements.Count},CST:{preSettlements.FindIndex(o => o.Kvid == settlement.Kvid)}";
continue; continue;
} }
//var splits = connF.Select<Payment>(o => o.RootKvid==payment.Kvid && o.OwnerKvid == settlement.OwnerKvid && o.OffsetKvid == Guid.Empty && o.Type == PaymentType.Split && o.Currency == settlement.Currency); //var splits = connF.Select<Payment>(o => o.RootKvid==payment.Kvid && o.OwnerKvid == settlement.OwnerKvid && o.OffsetKvid == Guid.Empty && o.Type == PaymentType.Split && o.Currency == settlement.Currency);
var splits = connF.Select<Payment>(o => o.RootKvid== payment.Kvid && o.OffsetKvid == Guid.Empty && o.Type == PaymentType.Split && o.Currency == settlement.Currency); var splits = connF.Select<Payment>(o => o.RootKvid== payment.Kvid && o.OffsetKvid == Guid.Empty && o.Type == PaymentType.Split && o.Currency == settlement.Currency);
if (splits.IsNullOrEmpty()) if (splits.IsNullOrEmpty())
{ {
TaskContext.Message = $"Error:20004,流水[{payment.SerialNumber}]暂未认领!"; TaskContext.Message = $"Error:20004,流水[{payment.SerialNumber}]暂未认领,WO:{matchWriteOffs.Count},ST:{preSettlements.Count},CST:{preSettlements.FindIndex(o => o.Kvid == settlement.Kvid)}";
continue; continue;
} }
foreach (var split in splits) foreach (var split in splits)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment