Merge branch 'main' of http://47.109.31.237:13000/lichunlei/mp-main into DuGuYang

分账添加分账标记

AppStart/Helper/AlipayPayBackService.cs

@@ -46,7 +46,7 @@ namespace MySystem
         }
 
         private void dosomething(string content)
-        { 
+        {
             //{"out_trade_no":"2023061514385419860385846","transaction_id":"2023061522001451251430691917","total_fee":"0.01","pay_mode":"1","openid":"","attach":""}
             JsonData orderObj = JsonMapper.ToObject(content);
             string OrderNo = orderObj["out_trade_no"].ToString();
@@ -66,7 +66,7 @@ namespace MySystem
                     MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantInfo();
                     order.UserId = merchant.UserId;
                     ConsumerOrders check = db.ConsumerOrders.FirstOrDefault(m => m.Id < order.Id && m.Status > 0 && m.PayMode == order.PayMode && m.MerchantId == order.MerchantId);
-                    if(check != null)
+                    if (check != null)
                     {
                         order.QueryCount = check.QueryCount + 1;
                     }
@@ -78,13 +78,13 @@ namespace MySystem
 
                     //语音播报
                     var machines = db.PosMachines.Select(m => new { m.DeviceKind, m.BrandId, m.Detail, m.BindMerchantId }).Where(m => m.DeviceKind == "1" && m.BindMerchantId == order.MerchantId);
-                    foreach(var machine in machines)
+                    foreach (var machine in machines)
                     {
-                        if(machine.BrandId == 2)
+                        if (machine.BrandId == 2)
                         {
                             TianYuVoiceHelper.Instance.doSomething(DateTime.Now.ToString("yyyyMMddHHmmssfff"), machine.Detail, order.PayMoney.ToString("f2"));
                         }
-                        else if(machine.BrandId == 3)
+                        else if (machine.BrandId == 3)
                         {
                             MqLinksHelper.Instance.doSomething(machine.Detail, order.PayMoney.ToString("f2"));
                         }
@@ -117,19 +117,19 @@ namespace MySystem
                     WebCMSEntities db = new WebCMSEntities();
                     DateTime checkDate = DateTime.Now.AddMinutes(-1);
                     var list = db.ConsumerOrders.Select(m => new { m.Id, m.CreateDate, m.Status, m.IsAct, m.PayMode }).Where(m => m.Status == 1 && m.PayMode == 1 && m.IsAct == 1 && m.CreateDate < checkDate).OrderBy(m => m.Id).Take(10).ToList();
-                    foreach(var sub in list)
+                    foreach (var sub in list)
                     {
                         ConsumerOrders order = db.ConsumerOrders.FirstOrDefault(m => m.Id == sub.Id);
-                        if(order != null)
+                        if (order != null)
                         {
                             order.Status = 2;
                             MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantInfo();
                             MerchantParamSet set = db.MerchantParamSet.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantParamSet();
-                            if(order.IsAct == 1 && order.PayMoney >= set.MinPayMoney)
+                            if (order.IsAct == 1 && order.PayMoney >= set.MinPayMoney)
                             {
                                 MerchantAddInfo merchantAdd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantAddInfo();
                                 //添加分账接收方
-                                if(merchantAdd.Sort == 0)
+                                if (merchantAdd.Sort == 0)
                                 {
                                     string content = AlipayFunction.Instance.BindSettleRelation(DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), AlipayFunction.Instance.Pid, merchantAdd.AlipayAuthToken);
                                     LogHelper.Instance.WriteLog(DateTime.Now.ToString() + "\n" + content, "支付宝添加分账方");
@@ -138,7 +138,7 @@ namespace MySystem
                                 }
                                 //发起分账
                                 decimal fee = order.PayMoney * 0.01M;
-                                if(fee >= 0.01M)
+                                if (fee >= 0.01M)
                                 {
                                     string TradeNo = order.SeoTitle;
                                     string OrderNo = order.OrderNo;
@@ -154,6 +154,7 @@ namespace MySystem
                                     });
                                     string ProfitShareResult = AlipayFunction.Instance.Settle(OrderNo, TradeNo, Parameters, merchantAdd.AlipayAuthToken);
                                     order.DivideLog = "请求分账日志：" + ProfitShareResult;
+                                    order.DivideFlag = 1;
                                     db.SaveChanges();
 
                                     //开始监听分账状态
@@ -213,7 +214,7 @@ namespace MySystem
                             {
                                 //发起分账
                                 decimal fee = order.PayMoney * 0.01M;
-                                if(fee >= 0.01M)
+                                if (fee >= 0.01M)
                                 {
                                     string TradeNo = order.SeoTitle;
                                     string OrderNo = order.OrderNo;
@@ -225,6 +226,7 @@ namespace MySystem
                                     });
                                     string ProfitShareResult = AlipayFunction.Instance.Settle(OrderNo, TradeNo, Parameters, merchantAdd.AlipayAuthToken);
                                     order.DivideLog = "请求分账日志：" + ProfitShareResult;
+                                    order.DivideFlag = 1;
                                     db.SaveChanges();
 
                                     //开始监听分账状态

AppStart/Helper/AlipayShareService.cs

@@ -58,6 +58,7 @@ namespace MySystem
                         if (order != null)
                         {
                             order.DivideLog = "分账审核结果：" + result;
+                            order.DivideFlag = 2;
                             db.SaveChanges();
                             RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + order.PayMode + ":List", order.Id.ToString());
                             // RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.PayMode + ":" + order.MerchantId, order);

AppStart/Helper/Profit/ProfitHelper.cs

@@ -395,7 +395,15 @@ namespace MySystem
                     if (!string.IsNullOrEmpty(us.ParentNav))
                     {
                         uidstring = us.ParentNav.Trim(',').Replace(",,", ",") + "," + uidstring;
-                        TopUserId = int.Parse(function.CheckInt(us.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]));
+                        string[] parents = us.ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                        if(parents.Length > 1)
+                        {
+                            TopUserId = int.Parse(function.CheckInt(parents[1]));
+                        }
+                        else
+                        {
+                            TopUserId = int.Parse(function.CheckInt(parents[0]));
+                        }
                     }
                     string[] uidlist = uidstring.Split(',');
                     Array.Reverse(uidlist);
@@ -408,6 +416,8 @@ namespace MySystem
                             users.Add(new ProfitUsers()
                             {
                                 UserId = pus.Id,
+                                MakerCode = pus.MakerCode,
+                                RealName = pus.RealName,
                                 UserNav = pus.ParentNav,
                                 UserLevel = pus.UserLevel,
                                 CreateDate = pus.CreateDate.Value,
@@ -415,6 +425,7 @@ namespace MySystem
                         }
                     }
                 }
+                KxsMainModels.Users topUser = kxsdb.Users.FirstOrDefault(a => a.Id == TopUserId) ?? new KxsMainModels.Users();
                 List<ProfitResult> list = new List<ProfitResult>();
                 list = StartProft(TotalAmount, 1, users, IsActive);
                 try
@@ -433,6 +444,10 @@ namespace MySystem
                                 ProfitType = ProfitType, //创客分润类型
                                 TradeMonth = TradeMonth, //交易月
                                 TopUserId = TopUserId, //顶级创客
+                                CreateMan = sub.MakerCode, //创客编号
+                                UpdateMan = topUser.MakerCode, //顶级编号
+                                SeoTitle = sub.RealName, //创客姓名
+                                SeoKeyword = topUser.RealName, //创客姓名
                             }).Entity;
                             dbnew.SaveChanges();
                             string RecordNo = "KPM";
@@ -770,7 +785,7 @@ namespace MySystem
                     {
                         break;
                     }
-                    if (UserLevel <= maxLevel && UserLevel > curLevel)
+                    if (UserLevel <= maxLevel && UserLevel >= curLevel)
                     {
                         ProfitObjectLevels objlevel = db.ProfitObjectLevels.FirstOrDefault(m => m.Id == UserLevel); //获取当前等级参数
                         if (objlevel != null)
@@ -796,6 +811,8 @@ namespace MySystem
                                 result.Add(new ProfitResult()
                                 {
                                     UserId = user.UserId,
+                                    MakerCode = user.MakerCode,
+                                    RealName = user.RealName,
                                     UserNav = user.UserNav,
                                     Money = PublicFunction.NumberFormat(getLevelProfit),
                                     ProfitRate = profitSet.ProfitRate,

AppStart/Helper/ProfitShareService.cs

@@ -58,6 +58,7 @@ namespace MySystem
                         if (order != null)
                         {
                             order.DivideLog = "分账审核结果：" + result;
+                            order.DivideFlag = 1;
                             db.SaveChanges();
                             RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + order.PayMode + ":List", order.Id.ToString());
                             // RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.PayMode + ":" + order.MerchantId, order);

AppStart/Helper/WeChatPayBackService.cs

@@ -78,7 +78,7 @@ namespace MySystem
                             MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantInfo();
                             order.UserId = merchant.UserId;
                             ConsumerOrders check = db.ConsumerOrders.FirstOrDefault(m => m.Id < order.Id && m.Status > 0 && m.PayMode == order.PayMode && m.MerchantId == order.MerchantId);
-                            if(check != null)
+                            if (check != null)
                             {
                                 order.QueryCount = check.QueryCount + 1;
                             }
@@ -90,13 +90,13 @@ namespace MySystem
 
                             //语音播报
                             var machines = db.PosMachines.Select(m => new { m.DeviceKind, m.BrandId, m.Detail, m.BindMerchantId }).Where(m => m.DeviceKind == "1" && m.BindMerchantId == order.MerchantId);
-                            foreach(var machine in machines)
+                            foreach (var machine in machines)
                             {
-                                if(machine.BrandId == 2)
+                                if (machine.BrandId == 2)
                                 {
                                     TianYuVoiceHelper.Instance.doSomething(DateTime.Now.ToString("yyyyMMddHHmmssfff"), machine.Detail, order.PayMoney.ToString("f2"));
                                 }
-                                else if(machine.BrandId == 3)
+                                else if (machine.BrandId == 3)
                                 {
                                     MqLinksHelper.Instance.doSomething(machine.Detail, order.PayMoney.ToString("f2"));
                                 }
@@ -150,12 +150,12 @@ namespace MySystem
                     WebCMSEntities db = new WebCMSEntities();
                     DateTime checkDate = DateTime.Now.AddMinutes(-1);
                     var list = db.ConsumerOrders.Select(m => new { m.Id, m.CreateDate, m.Status, m.IsAct, m.PayMode }).Where(m => m.Status == 1 && m.PayMode == 2 && m.IsAct == 1 && m.CreateDate < checkDate).OrderBy(m => m.Id).Take(10).ToList();
-                    foreach(var sub in list)
+                    foreach (var sub in list)
                     {
                         LogHelper.Instance.WriteLog(DateTime.Now.ToString(), "微信分账队列异常");
                         LogHelper.Instance.WriteLog("Id:" + sub.Id, "微信分账队列异常");
                         ConsumerOrders order = db.ConsumerOrders.FirstOrDefault(m => m.Id == sub.Id);
-                        if(order != null)
+                        if (order != null)
                         {
                             order.Status = 2;
                             MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantInfo();
@@ -163,11 +163,11 @@ namespace MySystem
                             LogHelper.Instance.WriteLog("IsAct:" + order.IsAct, "微信分账队列监听");
                             LogHelper.Instance.WriteLog("PayMoney:" + order.PayMoney, "微信分账队列监听");
                             LogHelper.Instance.WriteLog("MinPayMoney:" + set.MinPayMoney, "微信分账队列监听");
-                            if(order.IsAct == 1 && order.PayMoney >= set.MinPayMoney)
+                            if (order.IsAct == 1 && order.PayMoney >= set.MinPayMoney)
                             {
                                 MerchantAddInfo merchantAdd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantAddInfo();
                                 //添加分账接收方
-                                if(merchant.Version == 0)
+                                if (merchant.Version == 0)
                                 {
                                     WeChatFunction.Instance.AddReceive(merchantAdd.SubMchid, "MERCHANT_ID", WeChatFunction.Instance.MchId, WeChatFunction.Instance.MchName, "PARTNER");
                                     merchant.Version = 1;
@@ -176,7 +176,7 @@ namespace MySystem
                                 LogHelper.Instance.WriteLog("准备分账", "微信分账队列监听");
                                 //发起分账
                                 decimal fee = order.PayMoney; //单位：分
-                                if(fee >= 1)
+                                if (fee >= 1)
                                 {
                                     string TradeNo = order.SeoTitle;
                                     string OrderNo = order.OrderNo;
@@ -199,6 +199,7 @@ namespace MySystem
                                     string ProfitShareResult = WeChatFunction.Instance.ProfitShare(merchantAdd.SubMchid, TradeNo, OrderNo, Receivers);
                                     LogHelper.Instance.WriteLog("分账结果:" + ProfitShareResult, "微信分账队列监听");
                                     order.DivideLog = "请求分账日志：" + ProfitShareResult;
+                                    order.DivideFlag = 1;
                                     db.SaveChanges();
 
                                     //开始监听分账状态
@@ -258,7 +259,7 @@ namespace MySystem
                             {
                                 //发起分账
                                 decimal fee = order.PayMoney; //单位：分
-                                if(fee >= 1)
+                                if (fee >= 1)
                                 {
                                     string TradeNo = order.SeoTitle;
                                     string OrderNo = order.OrderNo;
@@ -276,6 +277,7 @@ namespace MySystem
                                     string ProfitShareResult = WeChatFunction.Instance.ProfitShare(merchantAdd.SubMchid, TradeNo, OrderNo, Receivers);
                                     LogHelper.Instance.WriteLog("分账结果:" + ProfitShareResult, "微信分账队列监听");
                                     order.DivideLog = "请求分账日志：" + ProfitShareResult;
+                                    order.DivideFlag = 1;
                                     db.SaveChanges();
 
                                     //开始监听分账状态

AppStart/Tables/ProfitResult.cs

@@ -4,6 +4,8 @@ namespace MySystem
     public class ProfitResult
     {
         public int UserId { get; set; }
+        public string MakerCode { get; set; }
+        public string RealName { get; set; }
         public decimal Money { get; set; }
         public int MachineCount { get; set; }
         public string UserNav { get; set; }