好哒二维码单独推送接口

AppStart/PosPushDataNewHelper.cs

@@ -13,10 +13,12 @@ namespace MySystem
         { }
 
         //绑定数据
-        public static void Bind(SpModels.BindRecord mer)
+        public static void Bind(SpModels.BindRecord mer, string kind)
         {
             try
             {
+                string ProductType = mer.ProductType;
+                if(kind.Contains("好哒二维码")) ProductType = "20";
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", mer.MerSnNo); //机具sn
                 dataContent.Add("mer_no", mer.MerNo); //商户号
@@ -25,8 +27,15 @@ namespace MySystem
                 dataContent.Add("mer_mobile", ""); //商户手机号
                 dataContent.Add("request_id", getRequestId(mer.Id, "bind")); //流水号
                 dataContent.Add("bind_time", mer.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
-                dataContent.Add("brand", int.Parse(function.CheckInt(mer.ProductType))); //品牌
-                Push("bind", dataContent);
+                dataContent.Add("brand", int.Parse(function.CheckInt(ProductType))); //品牌
+                if(kind.Contains("好哒二维码"))
+                {
+                    Push("qr_bind", dataContent);
+                }
+                else
+                {
+                    Push("bind", dataContent);
+                }
             }
             catch (Exception ex)
             {

MpMainModels2/HdQrCodeTmp.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HdQrCodeTmp
+    {
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public int Status { get; set; }
+    }
+}

MpMainModels2/WebCMSEntities.cs

@@ -60,6 +60,7 @@ namespace MySystem.MpMainModels2
         public virtual DbSet<HaoDaAreaCode> HaoDaAreaCode { get; set; }
         public virtual DbSet<HdDepositTmp> HdDepositTmp { get; set; }
         public virtual DbSet<HdOrderTmp> HdOrderTmp { get; set; }
+        public virtual DbSet<HdQrCodeTmp> HdQrCodeTmp { get; set; }
         public virtual DbSet<HdRefundOrderNos> HdRefundOrderNos { get; set; }
         public virtual DbSet<HdRefundRecord> HdRefundRecord { get; set; }
         public virtual DbSet<HelpProfitAccountRecord> HelpProfitAccountRecord { get; set; }
@@ -3540,6 +3541,30 @@ namespace MySystem.MpMainModels2
                     .HasCollation("utf8_general_ci");
             });
 
+            modelBuilder.Entity<HdQrCodeTmp>(entity =>
+            {
+                entity.HasKey(e => new { e.SnNo, e.MerNo })
+                    .HasName("PRIMARY");
+
+                entity.HasComment("好哒订单临时表");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("设备号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+            });
+
             modelBuilder.Entity<HdRefundOrderNos>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -17247,6 +17272,9 @@ namespace MySystem.MpMainModels2
 
             modelBuilder.Entity<UserAmountSummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.IsAct, e.TradeMonth, e.TradeDate, e.PayMode, e.SeoTitle, e.Sort })
+                    .HasName("UserAmountSummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -17301,6 +17329,9 @@ namespace MySystem.MpMainModels2
 
             modelBuilder.Entity<UserAmountSummaryAfter>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.IsAct, e.TradeMonth, e.TradeDate, e.PayMode, e.SeoTitle, e.Sort })
+                    .HasName("UserAmountSummaryAfterIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -17355,6 +17386,9 @@ namespace MySystem.MpMainModels2
 
             modelBuilder.Entity<UserAmountSummaryBefore>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.IsAct, e.TradeMonth, e.TradeDate, e.PayMode, e.SeoTitle, e.Sort })
+                    .HasName("UserAmountSummaryBeforeIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");