Merge branch 'develop' of http://47.109.31.237:13000/kxs-end/admin-server into DuGuYang

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1879,6 +1879,9 @@ namespace MySystem.Areas.Admin.Controllers
                 ChangeDeviceName = oldpos.DeviceName;
                 ChangeSnExpand += oldpos.PosSn + "\n";
                 PublicFunction.SycnMachineCount(oldpos.BuyUserId, oldpos.BrandId);
+
+                //同步商户交易额
+                RedisDbconn.Instance.AddList("SycnMerchantTradeQueue", "{\"OldPosId\":\"" + oldpos.LastMerchantId + "\",\"NewPosId\":\"" + newpos.LastMerchantId + "\"}");
             }
             add.BackProductType = BackProductType; //退回产品类型
             add.BackProductName = BackProductName; //退回产品名称
@@ -2163,6 +2166,9 @@ namespace MySystem.Areas.Admin.Controllers
 
                         }));
                     }
+
+                    //同步商户交易额
+                    RedisDbconn.Instance.AddList("SycnMerchantTradeQueue", "{\"OldPosId\":\"" + oldpos.LastMerchantId + "\",\"NewPosId\":\"" + newpos.LastMerchantId + "\"}");
                 }
             }
             //仓库坏机换新
@@ -2378,6 +2384,9 @@ namespace MySystem.Areas.Admin.Controllers
 
                         }));
                     }
+
+                    //同步商户交易额
+                    RedisDbconn.Instance.AddList("SycnMerchantTradeQueue", "{\"OldPosId\":\"" + oldpos.LastMerchantId + "\",\"NewPosId\":\"" + newpos.LastMerchantId + "\"}");
                 }
             }
             foreach (string sub in opData)
@@ -2668,6 +2677,9 @@ namespace MySystem.Areas.Admin.Controllers
 
                     }));
                 }
+
+                //同步商户交易额
+                RedisDbconn.Instance.AddList("SycnMerchantTradeQueue", "{\"OldPosId\":\"" + oldpos.LastMerchantId + "\",\"NewPosId\":\"" + newpos.LastMerchantId + "\"}");
             }
             foreach (string sub in opData)
             {

Models/PosMachinesTwo.cs

@@ -61,5 +61,6 @@ namespace MySystem.Models
         public int RecycStatus { get; set; }
         public string OutBatchNo { get; set; }
         public int WithholdFlag { get; set; }
+        public int LastMerchantId { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -8939,11 +8939,8 @@ namespace MySystem.Models
 
             modelBuilder.Entity<Orders>(entity =>
             {
-                entity.HasIndex(e => e.StoreId)
-                    .HasName("OrdersStoreIdIndex");
-
-                entity.HasIndex(e => new { e.UserId, e.ParentOrderId })
-                    .HasName("OrdersListIndex");
+                entity.HasIndex(e => new { e.StoreId, e.UserId, e.ParentOrderId, e.CreateDate })
+                    .HasName("OrdersIndex");
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
@@ -9793,6 +9790,10 @@ namespace MySystem.Models
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LastMerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("最后一次绑定商户号");
+
                 entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
 
                 entity.Property(e => e.OpId).HasColumnType("int(11)");