Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Module.Miai/MiaiModule.cs

@@ -94,14 +94,14 @@ namespace Mall.Module.Miai
         public object GetMiaiMessageCenter(int userId, int tenantId, int mallBaseId)
         {
             //获取四种分类数量
-            int Num1 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 1 });
-            var message1 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 1 });
-            int Num2 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 2 });
-            var message2 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 2 });
-            int Num3 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 3 });
-            var message3 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 3 });
-            int Num4 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 4 });
-            var message4 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 4 });
+            int Num1 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserId = userId, SelectType = 1 });
+            var message1 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserId = userId, SelectType = 1 });
+            int Num2 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserId = userId, SelectType = 2 });
+            var message2 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserId = userId, SelectType = 2 });
+            int Num3 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserId = userId, SelectType = 3 });
+            var message3 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserId = userId, SelectType = 3 });
+            int Num4 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserId = userId, SelectType = 4 });
+            var message4 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserId = userId, SelectType = 4 });
 
             return new
             {
@@ -112,24 +112,24 @@ namespace Mall.Module.Miai
                     Description = GetMiaiMessageDescription(message1),
                     Time = message1 != null ? message1.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
                 },
-                SystemModel = new
+                PPPlusModel = new
                 {
                     Num = Num2,
-                    Title = "系统消息",
+                    Title = "拼拼Plus",
                     Description = GetMiaiMessageDescription(message2),
                     Time = message2 != null ? message2.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
                 },
-                PPPlusModel = new
+                VisitorModel = new
                 {
                     Num = Num3,
-                    Title = "拼拼Plus",
+                    Title = "访客",
                     Description = GetMiaiMessageDescription(message3),
                     Time = message3 != null ? message3.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
                 },
-                VisitorModel = new
+                SystemModel = new
                 {
                     Num = Num4,
-                    Title = "访客",
+                    Title = "系统消息",
                     Description = GetMiaiMessageDescription(message4),
                     Time = message4 != null ? message4.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
                 }