发送订单到客小爽MQ

AppStart/Helper/AlipayPayBackService.cs

@@ -89,6 +89,9 @@ namespace MySystem
                             MqLinksHelper.Instance.doSomething(machine.Detail, order.PayMoney.ToString("f2"));
                         }
                     }
+
+                    //发送订单到客小爽MQ
+                    OrderMessageHelper.SendOrderMsg(order);
                 }
             }
             db.Dispose();

AppStart/Helper/WeChatPayBackService.cs

@@ -101,6 +101,9 @@ namespace MySystem
                                     MqLinksHelper.Instance.doSomething(machine.Detail, order.PayMoney.ToString("f2"));
                                 }
                             }
+
+                            //发送订单到客小爽MQ
+                            OrderMessageHelper.SendOrderMsg(order);
                         }
                     }
                     db.Dispose();

AppStart/OrderMessageHelper.cs

@@ -0,0 +1,33 @@
+using System;
+using MySystem.Models;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MySystem
+{
+    public class OrderMessageHelper
+    {
+        public static void SendOrderMsg(ConsumerOrders order)
+        {
+            OrderMessage msg = new OrderMessage()
+            {
+                BrandId = 0, //品牌/通道（0直联，1银联，2好哒）
+                Status = order.Status, //订单状态（0待支付，1已支付）
+                CreateDate = order.CreateDate.Value, //创建时间
+                PayDate = order.UpdateDate.Value, //支付时间
+                HdOrderNo = order.SeoTitle, //好哒订单号
+                TradeNo = order.SeoKeyword, //支付宝微信平台交易号
+                SnNo = order.SnNo, //码牌SN
+                PayMoney = order.PayMoney, //支付金额
+                PayMode = order.PayMode, //支付方式（1支付宝，2微信）
+                OrderNo = order.OrderNo, //订单号
+                ConsumerId = order.ConsumerId, //消费者Id
+                MerchantId = order.MerchantId, //商户Id
+                IsAct = (int)order.IsAct, //活动标识（1活动，0非活动）
+                UserId = order.UserId, //创客Id
+                MerchantActualAmount = order.MerchantActualAmount, //商家实收金额
+            };
+            RedisDbconn.Instance.AddList("MpOrderQueue", Newtonsoft.Json.JsonConvert.SerializeObject(msg));
+        }
+    }
+}

AppStart/Tables/OrderMessage.cs

@@ -0,0 +1,22 @@
+using System;
+namespace MySystem
+{
+    public class OrderMessage
+    {
+        public int BrandId { get; set; } //品牌/通道（0直联，1银联，2好哒）
+        public int Status { get; set; } //订单状态（0待支付，1已支付）
+        public DateTime CreateDate { get; set; } //创建时间
+        public DateTime PayDate { get; set; } //支付时间
+        public string HdOrderNo { get; set; } //好哒订单号
+        public string TradeNo { get; set; } //支付宝微信平台交易号
+        public string SnNo { get; set; } //码牌SN
+        public decimal PayMoney { get; set; } //支付金额
+        public int PayMode { get; set; } //支付方式（1支付宝，2微信）
+        public string OrderNo { get; set; } //订单号
+        public int ConsumerId { get; set; } //消费者Id
+        public int MerchantId { get; set; } //商户Id
+        public int IsAct { get; set; } //活动标识（1活动，0非活动）
+        public int UserId { get; set; } //创客Id
+        public decimal MerchantActualAmount { get; set; } //商家实收金额
+    }
+}

Models/AgentLevels.cs

@@ -13,5 +13,7 @@ namespace MySystem.Models
         public DateTime? UpdateDate { get; set; }
         public string Name { get; set; }
         public decimal Percent { get; set; }
+        public decimal UnActPercent { get; set; }
+        public string Operator { get; set; }
     }
 }

Models/AgentProfitRecord.cs

@@ -18,5 +18,8 @@ namespace MySystem.Models
         public decimal CreditTradeAmt { get; set; }
         public int ProfitType { get; set; }
         public int UserId { get; set; }
+        public int ActFlag { get; set; }
+        public string Operator { get; set; }
+        public string OrderNo { get; set; }
     }
 }

Models/ProfitRecordForAgent.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ProfitRecordForAgent
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string TradeMonth { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string Remark { get; set; }
+        public int BrandId { get; set; }
+        public decimal ProfitAmount { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/UserAgent.cs

@@ -14,5 +14,6 @@ namespace MySystem.Models
         public int AgentLevel { get; set; }
         public string ManageAreas { get; set; }
         public int UserId { get; set; }
+        public string Operator { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -175,6 +175,7 @@ namespace MySystem.Models
         public virtual DbSet<ProfitReceiveRecord> ProfitReceiveRecord { get; set; }
         public virtual DbSet<ProfitReceives> ProfitReceives { get; set; }
         public virtual DbSet<ProfitRecord> ProfitRecord { get; set; }
+        public virtual DbSet<ProfitRecordForAgent> ProfitRecordForAgent { get; set; }
         public virtual DbSet<ProfitRewardExport> ProfitRewardExport { get; set; }
         public virtual DbSet<ProfitRewardRecord> ProfitRewardRecord { get; set; }
         public virtual DbSet<ProfitSubsidyDetail> ProfitSubsidyDetail { get; set; }
@@ -948,8 +949,14 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.Operator)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("操作人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Percent)
-                    .HasColumnType("decimal(18,2)")
+                    .HasColumnType("decimal(18,5)")
                     .HasComment("分润比例");
 
                 entity.Property(e => e.Sort)
@@ -960,6 +967,10 @@ namespace MySystem.Models
                     .HasColumnType("int(11)")
                     .HasComment("状态");
 
+                entity.Property(e => e.UnActPercent)
+                    .HasColumnType("decimal(18,5)")
+                    .HasComment("非活动分润比例");
+
                 entity.Property(e => e.UpdateDate)
                     .HasColumnType("datetime")
                     .HasComment("修改时间");
@@ -975,6 +986,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("交易类型");
+
                 entity.Property(e => e.CheckStatus)
                     .HasColumnType("int(11)")
                     .HasComment("验证和同步账户状态");
@@ -987,6 +1002,18 @@ namespace MySystem.Models
                     .HasColumnType("decimal(18,2)")
                     .HasComment("贷记卡交易总金额");
 
+                entity.Property(e => e.Operator)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("操作人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("订单号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.ProfitType)
                     .HasColumnType("int(11)")
                     .HasComment("创客分润类型");
@@ -12257,6 +12284,61 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ProfitRecordForAgent>(entity =>
+            {
+                entity.HasComment("区域代理分润记录");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("int(11)")
+                    .HasComment("品牌");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.ProfitAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("分润金额");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasComment("备注")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("交易额");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasComment("月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<ProfitRewardExport>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -16796,6 +16878,12 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.Operator)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("操作人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Sort)
                     .HasColumnType("int(11)")
                     .HasComment("排序序号");