添加推送返回报文字段

Models/Push/PushPosRecord.cs

@@ -10,5 +10,7 @@ namespace MySystem.Models.Push
         public string Content { get; set; }
         public string DataType { get; set; }
         public string EncryptContent { get; set; }
+        public int Status { get; set; }
+        public string BackContent { get; set; }
     }
 }

Models/Push/UMerchantDepositRecord.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class UMerchantDepositRecord
+    {
+        public int Id { get; set; }
+        public int Status { get; set; }
+        public int UserId { get; set; }
+        public string MerchNo { get; set; }
+        public string AgentId { get; set; }
+        public string PosSn { get; set; }
+        public string OrderId { get; set; }
+        public decimal Amount { get; set; }
+        public DateTime? TransTime { get; set; }
+    }
+}

Models/Push/UPosMerchantInfo.cs

@@ -5,9 +5,9 @@ namespace MySystem.Models.Push
 {
     public partial class UPosMerchantInfo
     {
-        public string Id { get; set; }
-        public string Status { get; set; }
-        public string UserId { get; set; }
+        public int Id { get; set; }
+        public int Status { get; set; }
+        public int UserId { get; set; }
         public string Phone { get; set; }
         public string Name { get; set; }
         public string SupplementInfo { get; set; }
@@ -16,6 +16,6 @@ namespace MySystem.Models.Push
         public string PosSn { get; set; }
         public string DeviceModel { get; set; }
         public string TermTo { get; set; }
-        public string BindTime { get; set; }
+        public DateTime? BindTime { get; set; }
     }
 }

Models/Push/UTradeRecord.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class UTradeRecord
+    {
+        public int Id { get; set; }
+        public int Status { get; set; }
+        public int UserId { get; set; }
+        public string AgentId { get; set; }
+        public string OrderId { get; set; }
+        public string TransId { get; set; }
+        public string MerchNo { get; set; }
+        public string TermNo { get; set; }
+        public string PosSn { get; set; }
+        public decimal Amount { get; set; }
+        public DateTime? TransTime { get; set; }
+        public string RetCode { get; set; }
+        public string RetMsg { get; set; }
+        public int FeeAmount { get; set; }
+        public string PayType { get; set; }
+        public string CardType { get; set; }
+        public string TransType { get; set; }
+    }
+}

Models/Push/WebCMSEntities.cs

@@ -24,6 +24,9 @@ namespace MySystem.Models.Push
         public virtual DbSet<SourceCondition> SourceCondition { get; set; }
         public virtual DbSet<SourceData> SourceData { get; set; }
         public virtual DbSet<SourceDataSubTable> SourceDataSubTable { get; set; }
+        public virtual DbSet<UMerchantDepositRecord> UMerchantDepositRecord { get; set; }
+        public virtual DbSet<UPosMerchantInfo> UPosMerchantInfo { get; set; }
+        public virtual DbSet<UTradeRecord> UTradeRecord { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -278,6 +281,13 @@ namespace MySystem.Models.Push
                     .HasColumnName("id")
                     .HasColumnType("int(11)");
 
+                entity.Property(e => e.BackContent)
+                    .HasColumnName("back_content")
+                    .HasColumnType("mediumtext")
+                    .HasComment("数据内容")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Content)
                     .HasColumnName("content")
                     .HasColumnType("mediumtext")
@@ -303,6 +313,11 @@ namespace MySystem.Models.Push
                     .HasComment("数据内容")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
             });
 
             modelBuilder.Entity<PushRecord>(entity =>
@@ -636,6 +651,265 @@ namespace MySystem.Models.Push
                     .HasComment("版本号");
             });
 
+            modelBuilder.Entity<UMerchantDepositRecord>(entity =>
+            {
+                entity.ToTable("u_MerchantDepositRecord");
+
+                entity.HasComment("商户服务费信息");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)")
+                    .HasComment("ID");
+
+                entity.Property(e => e.AgentId)
+                    .HasColumnName("agent_id")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("代理商编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Amount)
+                    .HasColumnName("amount")
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("金额");
+
+                entity.Property(e => e.MerchNo)
+                    .HasColumnName("merch_no")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OrderId)
+                    .HasColumnName("order_id")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("订单流水")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PosSn)
+                    .HasColumnName("pos_sn")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("机具号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TransTime)
+                    .HasColumnName("trans_time")
+                    .HasColumnType("datetime")
+                    .HasComment("时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnName("user_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("创客所属人");
+            });
+
+            modelBuilder.Entity<UPosMerchantInfo>(entity =>
+            {
+                entity.ToTable("u_PosMerchantInfo");
+
+                entity.HasComment("商户绑定信息");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)")
+                    .HasComment("ID");
+
+                entity.Property(e => e.AgentId)
+                    .HasColumnName("agent_id")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("代理商编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BindTime)
+                    .HasColumnName("bind_time")
+                    .HasColumnType("datetime")
+                    .HasComment("绑定时间");
+
+                entity.Property(e => e.DeviceModel)
+                    .HasColumnName("device_model")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("设备类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchNo)
+                    .HasColumnName("merch_no")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Name)
+                    .HasColumnName("name")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户名称")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Phone)
+                    .HasColumnName("phone")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("手机号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PosSn)
+                    .HasColumnName("pos_sn")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("机具号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.SupplementInfo)
+                    .HasColumnName("supplement_info")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("身份证号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TermTo)
+                    .HasColumnName("term_to")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("终端号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnName("user_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("创客所属人");
+            });
+
+            modelBuilder.Entity<UTradeRecord>(entity =>
+            {
+                entity.ToTable("u_TradeRecord");
+
+                entity.HasComment("商户交易信息");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)")
+                    .HasComment("ID");
+
+                entity.Property(e => e.AgentId)
+                    .IsRequired()
+                    .HasColumnName("agent_id")
+                    .HasColumnType("varchar(30)")
+                    .HasDefaultValueSql("'0'")
+                    .HasComment("代理商编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Amount)
+                    .HasColumnName("amount")
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("交易金额");
+
+                entity.Property(e => e.CardType)
+                    .HasColumnName("card_type")
+                    .HasColumnType("varchar(10)")
+                    .HasComment("卡类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.FeeAmount)
+                    .HasColumnName("fee_amount")
+                    .HasColumnType("int(11)")
+                    .HasComment("手续费");
+
+                entity.Property(e => e.MerchNo)
+                    .HasColumnName("merch_no")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OrderId)
+                    .HasColumnName("order_id")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("订单流水")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PayType)
+                    .HasColumnName("pay_type")
+                    .HasColumnType("varchar(10)")
+                    .HasComment("支付方式")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PosSn)
+                    .HasColumnName("pos_sn")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("机具号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RetCode)
+                    .HasColumnName("ret_code")
+                    .HasColumnType("varchar(10)")
+                    .HasComment("交易状态")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RetMsg)
+                    .HasColumnName("ret_msg")
+                    .HasColumnType("varchar(10)")
+                    .HasComment("交易描述")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TermNo)
+                    .HasColumnName("term_no")
+                    .HasColumnType("varchar(30)")
+                    .HasComment("终端号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TransId)
+                    .HasColumnName("trans_id")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("交易流水")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TransTime)
+                    .HasColumnName("trans_time")
+                    .HasColumnType("datetime")
+                    .HasComment("交易时间");
+
+                entity.Property(e => e.TransType)
+                    .HasColumnName("trans_type")
+                    .HasColumnType("varchar(10)")
+                    .HasComment("交易类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnName("user_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("创客所属人");
+            });
+
             OnModelCreatingPartial(modelBuilder);
         }
 

Startup.cs

@@ -102,7 +102,7 @@ namespace MySystem
                     pattern: "{controller=Home}/{action=Index}/{Id?}");
             });
 
-            // StartHelper.Instance.Start(); //开启线程
+            StartHelper.Instance.Start(); //开启线程
         }
         
     }

Util/Queue/PosPushHelper.cs

@@ -101,18 +101,18 @@ namespace MySystem
             function.WriteLog("res:" + res + "\n\n\n", "统一推送日志");
             if(!res.Contains("\"status\""))
             {
-                SaveToDb(dataContent, encryptContent, dataType);
+                SaveToDb(dataContent, encryptContent, dataType, res);
                 return;
             }
             JsonData backObj = JsonMapper.ToObject(res);
             if(backObj["status"].ToString() != "1")
             {
-                SaveToDb(dataContent, encryptContent, dataType);
+                SaveToDb(dataContent, encryptContent, dataType, res);
                 return;
             }
         }
 
-        public void SaveToDb(string content, string encryptContent, string dataType)
+        public void SaveToDb(string content, string encryptContent, string dataType, string backContent)
         {
             WebCMSEntities db = new WebCMSEntities();
             db.PushPosRecord.Add(new PushPosRecord()
@@ -121,6 +121,7 @@ namespace MySystem
                 Content = content,
                 DataType = dataType,
                 EncryptContent = encryptContent,
+                BackContent = backContent,
             });
             db.SaveChanges();
             db.Dispose();