lichunlei 2 жил өмнө
parent
commit
e816e7c71a

+ 79 - 23
AppStart/Helper/OperateService.cs

@@ -57,39 +57,70 @@ namespace MySystem
                             ids += idsDr["Id"].ToString() + ",";
                             startId = idsDr["Id"].ToString();
                         }
-                        DataTable selfDt = OtherMySqlConn.dtable("select OpId,DATE_FORMAT(CreateDate,'%Y%m%d'),count(Id) from StoreStockChange where Id in (" + ids.TrimEnd(',') + ") group by OpId,DATE_FORMAT(CreateDate,'%Y%m%d')");
+                        DataTable selfDt = OtherMySqlConn.dtable("select OpId,StoreId,TransType,DATE_FORMAT(CreateDate,'%Y%m%d'),count(Id) from StoreStockChange where Id in (" + ids.TrimEnd(',') + ") group by OpId,StoreId,TransType,DATE_FORMAT(CreateDate,'%Y%m%d')");
                         if (selfDt.Rows.Count > 0)
                         {
                             function.WriteLog("统计数:" + selfDt.Rows.Count + "\n\n", "运营中心发货统计日志");
                             foreach (DataRow selfDr in selfDt.Rows)
                             {
                                 int OpId = int.Parse(selfDr["OpId"].ToString());
-                                string TradeDate = selfDr[1].ToString();
+                                int StoreId = int.Parse(selfDr["StoreId"].ToString());
+                                int TransType = int.Parse(selfDr["TransType"].ToString());
+                                string TradeDate = selfDr[3].ToString();
                                 string TradeMonth = TradeDate.Substring(0, 6);
-                                int SendCount = int.Parse(selfDr[2].ToString());
-                                SendDaySummary selfStat = db.SendDaySummary.FirstOrDefault(m => m.OpId == OpId && m.TradeDate == TradeDate);
-                                if (selfStat == null)
+                                int SendCount = int.Parse(selfDr[4].ToString());
+                                if(TransType == 1)
                                 {
-                                    selfStat = db.SendDaySummary.Add(new SendDaySummary()
+                                    SendDaySummary selfStat = db.SendDaySummary.FirstOrDefault(m => m.OpId == OpId && m.TradeDate == TradeDate);
+                                    if (selfStat == null)
                                     {
-                                        TradeDate = TradeDate,
-                                        OpId = OpId,
-                                    }).Entity;
-                                    db.SaveChanges();
-                                }
-                                selfStat.SendCount += SendCount;
+                                        selfStat = db.SendDaySummary.Add(new SendDaySummary()
+                                        {
+                                            TradeDate = TradeDate,
+                                            OpId = OpId,
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                    selfStat.SendCount += SendCount;
 
-                                SendMonthSummary monthStat = db.SendMonthSummary.FirstOrDefault(m => m.OpId == OpId && m.TradeMonth == TradeMonth);
-                                if (monthStat == null)
+                                    SendMonthSummary monthStat = db.SendMonthSummary.FirstOrDefault(m => m.OpId == OpId && m.TradeMonth == TradeMonth);
+                                    if (monthStat == null)
+                                    {
+                                        monthStat = db.SendMonthSummary.Add(new SendMonthSummary()
+                                        {
+                                            TradeMonth = TradeMonth,
+                                            OpId = OpId,
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                    monthStat.SendCount += SendCount;
+                                }
+                                else if(TransType == 2 || TransType == 10 || TransType == 11)
                                 {
-                                    monthStat = db.SendMonthSummary.Add(new SendMonthSummary()
+                                    StoreSendDaySummary selfStat = db.StoreSendDaySummary.FirstOrDefault(m => m.OpId == StoreId && m.TradeDate == TradeDate);
+                                    if (selfStat == null)
+                                    {
+                                        selfStat = db.StoreSendDaySummary.Add(new StoreSendDaySummary()
+                                        {
+                                            TradeDate = TradeDate,
+                                            OpId = StoreId,
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                    selfStat.SendCount += SendCount;
+
+                                    StoreSendMonthSummary monthStat = db.StoreSendMonthSummary.FirstOrDefault(m => m.OpId == StoreId && m.TradeMonth == TradeMonth);
+                                    if (monthStat == null)
                                     {
-                                        TradeMonth = TradeMonth,
-                                        OpId = OpId,
-                                    }).Entity;
-                                    db.SaveChanges();
+                                        monthStat = db.StoreSendMonthSummary.Add(new StoreSendMonthSummary()
+                                        {
+                                            TradeMonth = TradeMonth,
+                                            OpId = StoreId,
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                    monthStat.SendCount += SendCount;
                                 }
-                                monthStat.SendCount += SendCount;
                             }
                             OtherMySqlConn.op("update StoreStockChange set Status=1 where Id in (" + ids.TrimEnd(',') + ")");
                             function.WritePage("/SendStat/", "Id.txt", startId);
@@ -143,15 +174,16 @@ namespace MySystem
                     {
                         ids += idsDr["Id"].ToString() + ",";
                     }
-                    DataTable userDt = OtherMySqlConn.dtable("select OpId,DATE_FORMAT(ActivationTime, '%Y%m%d'),count(Id) from PosMachinesTwo where Id in (" + ids.TrimEnd(',') + ") group by OpId,DATE_FORMAT(ActivationTime, '%Y%m%d')");
+                    DataTable userDt = OtherMySqlConn.dtable("select OpId,StoreId,DATE_FORMAT(ActivationTime, '%Y%m%d'),count(Id) from PosMachinesTwo where Id in (" + ids.TrimEnd(',') + ") group by OpId,StoreId,DATE_FORMAT(ActivationTime, '%Y%m%d')");
                     if (userDt.Rows.Count > 0)
                     {
                         function.WriteLog("人数:" + userDt.Rows.Count + "\n\n", "运营中心激活数日志");
                         foreach (DataRow userDr in userDt.Rows)
                         {
                             int OpId = int.Parse(userDr["OpId"].ToString());
-                            string TradeDate = userDr[1].ToString();
-                            int ActCount = int.Parse(function.CheckInt(userDr[2].ToString()));
+                            int StoreId = int.Parse(userDr["StoreId"].ToString());
+                            string TradeDate = userDr[2].ToString();
+                            int ActCount = int.Parse(function.CheckInt(userDr[3].ToString()));
                             string TradeMonth = TradeDate.Substring(0, 6);
                             ActMerDaySummary selfStat = db.ActMerDaySummary.FirstOrDefault(m => m.OpId == OpId && m.TradeDate == TradeDate);
                             if (selfStat == null)
@@ -176,6 +208,30 @@ namespace MySystem
                                 db.SaveChanges();
                             }
                             monthStat.ActCount += ActCount;
+
+                            StoreActMerDaySummary selfStat2 = db.StoreActMerDaySummary.FirstOrDefault(m => m.OpId == StoreId && m.TradeDate == TradeDate);
+                            if (selfStat2 == null)
+                            {
+                                selfStat2 = db.StoreActMerDaySummary.Add(new StoreActMerDaySummary()
+                                {
+                                    OpId = StoreId,
+                                    TradeDate = TradeDate,
+                                }).Entity;
+                                db.SaveChanges();
+                            }
+                            selfStat2.ActCount += ActCount;
+
+                            StoreActMerMonthSummary monthStat2 = db.StoreActMerMonthSummary.FirstOrDefault(m => m.OpId == StoreId && m.TradeMonth == TradeMonth);
+                            if (monthStat2 == null)
+                            {
+                                monthStat2 = db.StoreActMerMonthSummary.Add(new StoreActMerMonthSummary()
+                                {
+                                    OpId = StoreId,
+                                    TradeMonth = TradeMonth,
+                                }).Entity;
+                                db.SaveChanges();
+                            }
+                            monthStat2.ActCount += ActCount;
                         }
                         db.SaveChanges();
                         OtherMySqlConn.op("update PosMachinesTwo set QueryCount=2 where Id in (" + ids.TrimEnd(',') + ")");

+ 22 - 0
OpModels/StoreActMerDaySummary.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.OpModels
+{
+    public partial class StoreActMerDaySummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int ActCount { get; set; }
+        public int BrandId { get; set; }
+        public string TradeDate { get; set; }
+        public int OpId { get; set; }
+    }
+}

+ 22 - 0
OpModels/StoreActMerMonthSummary.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.OpModels
+{
+    public partial class StoreActMerMonthSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int ActCount { get; set; }
+        public int BrandId { get; set; }
+        public string TradeMonth { get; set; }
+        public int OpId { get; set; }
+    }
+}

+ 22 - 0
OpModels/StoreSendDaySummary.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.OpModels
+{
+    public partial class StoreSendDaySummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int SendCount { get; set; }
+        public int BrandId { get; set; }
+        public string TradeDate { get; set; }
+        public int OpId { get; set; }
+    }
+}

+ 22 - 0
OpModels/StoreSendMonthSummary.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.OpModels
+{
+    public partial class StoreSendMonthSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int SendCount { get; set; }
+        public int BrandId { get; set; }
+        public string TradeMonth { get; set; }
+        public int OpId { get; set; }
+    }
+}

+ 168 - 0
OpModels/WebCMSEntities.cs

@@ -45,8 +45,12 @@ namespace MySystem.OpModels
         public virtual DbSet<RightDic> RightDic { get; set; }
         public virtual DbSet<SendDaySummary> SendDaySummary { get; set; }
         public virtual DbSet<SendMonthSummary> SendMonthSummary { get; set; }
+        public virtual DbSet<StoreActMerDaySummary> StoreActMerDaySummary { get; set; }
+        public virtual DbSet<StoreActMerMonthSummary> StoreActMerMonthSummary { get; set; }
         public virtual DbSet<StoreForOperate> StoreForOperate { get; set; }
         public virtual DbSet<StoreMachineApply> StoreMachineApply { get; set; }
+        public virtual DbSet<StoreSendDaySummary> StoreSendDaySummary { get; set; }
+        public virtual DbSet<StoreSendMonthSummary> StoreSendMonthSummary { get; set; }
         public virtual DbSet<SysAdmin> SysAdmin { get; set; }
         public virtual DbSet<SysAdminRole> SysAdminRole { get; set; }
         public virtual DbSet<SysLog> SysLog { get; set; }
@@ -1973,6 +1977,88 @@ namespace MySystem.OpModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<StoreActMerDaySummary>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
+            modelBuilder.Entity<StoreActMerMonthSummary>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<StoreForOperate>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -2079,6 +2165,88 @@ namespace MySystem.OpModels
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<StoreSendDaySummary>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SendCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
+            modelBuilder.Entity<StoreSendMonthSummary>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SendCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<SysAdmin>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");