Commit cdcfd0c9 by Neo Turing

增加日志输出,修改关联报告规则,没回传,但已受理的也会重新关联确保数据准确性

parent df5f0f49
......@@ -273,24 +273,38 @@ namespace Kivii.Third.Chinaerdos.Entities
var respResult = client.UploadOrderResult(Configs._token, Configs._secret, orderResult);
var log = new EntityLog<ThirdReportOrder>();
log.OwnerKvid = third.Kvid;
log.BizId = third.SerialNumber;
log.BizKvid = third.Kvid;
log.BizType = third.ThirdType;
log.Title = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
log.Type = "报告数据回传";
log.Summary = $"Code:{respResult.code} Message:{respResult.message}";
log.Remark = $"{respResult.data.resp_code}||{respResult.data.message}||{respResult.data.errors}";
conn.Insert(log);
if (respResult.code == 200)
{
var respPdf = client.UploadOrderPdf(Configs._token, Configs._secret, orderResult.ORDER_NO, orderPdfs);
var logPdf = new EntityLog<ThirdReportOrder>();
logPdf.OwnerKvid = third.Kvid;
logPdf.BizId = third.SerialNumber;
logPdf.BizKvid = third.Kvid;
logPdf.BizType = third.ThirdType;
logPdf.Title = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
logPdf.Type = "报告PDF回传";
logPdf.Summary = $"Code:{respPdf.code} Message:{respPdf.message}";
logPdf.Remark = $"{respPdf.data.resp_code}||{respPdf.data.message}||{respPdf.data.errors}";
conn.Insert(logPdf);
if (respPdf.code == 200)
{
var complete = client.UploadOrderComplete(Configs._token, Configs._secret, orderResult);
third.IsUploaded = true;
third.AddOnlyProperties(o => o.IsUploaded);
conn.UpdateOnly(third);
var log = new EntityLog<ThirdReportOrder>();
log.OwnerKvid = third.Kvid;
log.BizId = third.SerialNumber;
log.BizKvid = third.Kvid;
log.BizType = third.ThirdType;
log.Title = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
log.Remark = $"Code:{complete.code} Message:{complete.message}";
conn.Insert(log);
return true;
}
else return false;
......
......@@ -285,7 +285,7 @@ namespace Kivii.Third.Chinaerdos.Extensions
var conn = KiviiContext.GetOpenedDbConnection<Report>();
if (thirds.IsNullOrEmpty())
{
thirds = conn.Select<ThirdReportOrder>(o => o.IsAccepted == false & o.IsOffseted == false & o.IsUploaded == false & o.ThirdType == typeof(ErdosOrder).FullName);
thirds = conn.Select<ThirdReportOrder>(o => /*o.IsAccepted == false &*/ o.IsOffseted == false & o.IsUploaded == false & o.ThirdType == typeof(ErdosOrder).FullName);
}
if (thirds.IsNullOrEmpty()) return;
var queryReports = conn.From<Report>();
......
......@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2025.2270")]
[assembly: AssemblyFileVersion("5.4.2025.2270")]
[assembly: AssemblyVersion("5.4.2025.4030")]
[assembly: AssemblyFileVersion("5.4.2025.4030")]
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