返现逻辑调整

Controllers/HomeController.cs

@@ -71,8 +71,11 @@ namespace MySystem.Controllers
             //     }
             // }
 
-            // List<int> orders = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrdersHd:Divi:2:1272").Select(m => m.Id).ToList();
-            // DataTable dt = CustomerSqlConn.dtable("select OrderId,sum(GetMoney) money from ConsumerProfit where MerchantId=1272 group by OrderId order by OrderId", AppConfig.Base.SqlConnStr);
+            string str = "";
+            // str += "<table>";
+            // str += "<tr><td>订单号</td><td>下单时间</td><td>商家分红天数</td><td>当前分红金额</td><td>最大分红</td></tr>";
+            // List<int> orders = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrdersHd:Divi:2:1940", 1, 10000).Select(m => m.Id).ToList();
+            // DataTable dt = CustomerSqlConn.dtable("select OrderId,sum(GetMoney) money from ConsumerProfit where MerchantId=1940 and CreateDate>='2023-12-01 00:00:00' group by OrderId order by OrderId", AppConfig.Base.SqlConnStr);
             // foreach(DataRow dr in dt.Rows)
             // {
             //     decimal cur = decimal.Parse(dr["money"].ToString());
@@ -84,41 +87,46 @@ namespace MySystem.Controllers
             //         if(order.MaxDivi - cur >= 1)
             //         {
             //             order.CurDivi = cur;
+            //             MerchantParamSet set = Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantParamSet>(order.SeoDescription);
             //             order.SeoDescription = Regex.Replace(function.CheckNull(order.SeoDescription), "\"UpdateDate\":\".*?\"", "\"UpdateDate\":\"" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + "\"");
-            //             order.SeoDescription = Regex.Replace(function.CheckNull(order.SeoDescription), "\"ProfitDays\":.*?,", "\"ProfitDays\":365,");
-            //             RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + order.PayMode + ":" + order.MerchantId, order);
-            //             var list = db.ConsumerProfit.Where(m => m.OrderId == order.Id).OrderBy(m => m.Id).ToList();
-            //             foreach(var sub in list)
-            //             {
-            //                 if(cur >= sub.GetMoney)
-            //                 {
-            //                     cur -= sub.GetMoney;
-            //                 }
-            //                 else
-            //                 {
-            //                     if(cur > 0)
-            //                     {
-            //                         var edit = db.ConsumerProfit.FirstOrDefault(m => m.OrderId == order.Id);
-            //                         if(edit != null)
-            //                         {
-            //                             edit.GetMoney = cur;
-            //                             db.SaveChanges();
-            //                         }
-            //                     }
-            //                     else
-            //                     {
-            //                         var edit = db.ConsumerProfit.FirstOrDefault(m => m.OrderId == order.Id);
-            //                         if(edit != null)
-            //                         {
-            //                             db.ConsumerProfit.Remove(edit);
-            //                             db.SaveChanges();
-            //                         }
-            //                     }
-            //                 }
-            //             }
+            //             // order.SeoDescription = Regex.Replace(function.CheckNull(order.SeoDescription), "\"ProfitDays\":.*?,", "\"ProfitDays\":365,");
+            //             str += "<tr><td>" + order.OrderNo + "</td><td>" + order.UpdateDate.Value.ToString() + "</td><td>" + set.ProfitDays + "</td><td>" + cur + "</td><td>" + order.MaxDivi + "</td></tr>";
+            //             // RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + order.PayMode + ":" + order.MerchantId, order);
+            //             // var list = db.ConsumerProfit.Where(m => m.OrderId == order.Id).OrderBy(m => m.Id).ToList();
+            //             // foreach(var sub in list)
+            //             // {
+            //             //     if(cur >= sub.GetMoney)
+            //             //     {
+            //             //         cur -= sub.GetMoney;
+            //             //     }
+            //             //     else
+            //             //     {
+            //             //         if(cur > 0)
+            //             //         {
+            //             //             var edit = db.ConsumerProfit.FirstOrDefault(m => m.OrderId == order.Id);
+            //             //             if(edit != null)
+            //             //             {
+            //             //                 edit.GetMoney = cur;
+            //             //                 db.SaveChanges();
+            //             //             }
+            //             //         }
+            //             //         else
+            //             //         {
+            //             //             var edit = db.ConsumerProfit.FirstOrDefault(m => m.OrderId == order.Id);
+            //             //             if(edit != null)
+            //             //             {
+            //             //                 db.ConsumerProfit.Remove(edit);
+            //             //                 db.SaveChanges();
+            //             //             }
+            //             //         }
+            //             //     }
+            //             // }
             //         }
             //     }
             // }
+            // str += "</table>";
+
+
 
             // List<int> ids = new List<int>();
             // ids.Add(4058);
@@ -159,6 +167,18 @@ namespace MySystem.Controllers
 
             // db.Dispose();
 
+            // RedisDbconn.Instance.AddRightList("testlist", "1");
+            // RedisDbconn.Instance.AddRightList("testlist", "2");
+            // RedisDbconn.Instance.AddRightList("testlist", "3");
+            // RedisDbconn.Instance.AddRightList("testlist", "4");
+            // RedisDbconn.Instance.AddRightList("testlist", "5");
+            // RedisDbconn.Instance.AddRightList("testlist", "6");
+            // RedisDbconn.Instance.AddRightList("testlist", "7");
+            // RedisDbconn.Instance.AddRightList("testlist", "8");
+            // RedisDbconn.Instance.AddRightList("testlist", "9");
+
+            // str = RedisDbconn.Instance.RPopLPush<string>("testlist", "testlist"); 
+
             // decimal settleAmount = b / 100M;
             // decimal divideAmt = (1 - 0.0038M) * a;
             // divideAmt = decimal.Parse(divideAmt.ToString("f2"));
@@ -181,13 +201,13 @@ namespace MySystem.Controllers
 
             // return amountAmount + ":" + seviceAmount;
 
-            List<int> ids = new List<int>();
-            ids.Add(191);
-            foreach(int id in ids)
-            {
-                RedisDbconn.Instance.AddList("MerchantConfirmHdQueue", "{\"MerchantId\":\"" + id.ToString() + "\"}");
-            }
-            return "ok";
+            // List<int> ids = new List<int>();
+            // ids.Add(191);
+            // foreach(int id in ids)
+            // {
+            //     RedisDbconn.Instance.AddList("MerchantConfirmHdQueue", "{\"MerchantId\":\"" + id.ToString() + "\"}");
+            // }
+            return str;
         }
 
         public string bindapp(int mid)

Util/HaoDa/ProfitHelper.cs

@@ -128,7 +128,7 @@ namespace MySystem
                                     function.WriteLog("人数:" + CurDiviPersons, "返现逻辑日志");
                                     while (CurDiviPersons > 0)
                                     {
-                                        ConsumerOrders suborder = RedisDbconn.Instance.RPop<ConsumerOrders>("ConsumerOrdersHd:Divi:" + PayMode + ":" + MerchantId);
+                                        ConsumerOrders suborder = RedisDbconn.Instance.RPopLPush<ConsumerOrders>("ConsumerOrdersHd:Divi:" + PayMode + ":" + MerchantId, "ConsumerOrdersHd:Divi:" + PayMode + ":" + MerchantId);
                                         if (suborder != null)
                                         {
                                             function.WriteLog("返现对象订单:" + suborder.Id, "返现逻辑日志");
@@ -156,7 +156,8 @@ namespace MySystem
                                                     if(!orderids.Contains(suborder.Id))
                                                     {
                                                         function.WriteLog("请求退款接口", "返现逻辑日志");
-                                                        var info = HaoDaHelper.Instance.AggregatedPayRefund(merchantAdd.OutMchtNo, merchantAdd.StoreNo, "HDTK" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), suborder.OrderNo, RefundAmount.ToString("f0"));
+                                                        string RefundNo = "HDTK" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+                                                        var info = HaoDaHelper.Instance.AggregatedPayRefund(merchantAdd.OutMchtNo, merchantAdd.StoreNo, RefundNo, suborder.OrderNo, RefundAmount.ToString("f0"));
                                                         if(info.Contains("\"resultCode\":\"1\""))
                                                         {
                                                             db.ConsumerProfit.Add(new ConsumerProfit()
@@ -170,6 +171,7 @@ namespace MySystem
                                                                 Sort = OrderId,
                                                                 SeoTitle = suborder.OrderNo,
                                                                 SeoKeyword = suborder.PayMoney.ToString(),
+                                                                SeoDescription = RefundNo,
                                                             });
                                                             db.SaveChanges();
                                                         }
@@ -183,11 +185,12 @@ namespace MySystem
                                                     if (suborder.CurDivi < suborder.MaxDivi)
                                                     {
                                                         function.WriteLog("返现未达最大值继续", "返现逻辑日志");
-                                                        RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + PayMode + ":" + MerchantId, suborder);
+                                                        // RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + PayMode + ":" + MerchantId, suborder);
                                                     }
                                                     else
                                                     {
                                                         function.WriteLog("返现达最大值，出局", "返现逻辑日志");
+                                                        RedisDbconn.Instance.DelFromList("ConsumerOrdersHd:Divi:" + PayMode + ":" + MerchantId, suborder);
                                                         OutCount += 1;
                                                     }
                                                     Thread.Sleep(1000);

Util/HaoDa/TestHaoDaService.cs

@@ -38,7 +38,7 @@ namespace MySystem
             // ConfiemMer(808);//新建商户
             // ChangeMerchantCard(1);//商户修改银行卡
             // AddOpenDivideAccounts(832); //添加分账方
-            QueryAuthStatus(1845);//查询实名认证状态
+            // QueryAuthStatus(1845);//查询实名认证状态
             // WeChatFunctionForHD.Instance.QueryAuthMerchant("600955391");
             // AlipayFunctionForHD.Instance.AuthOrderAuthQuery("2088820718243322");
             // StartProfitShareListen();

Util/RedisDbconn.cs

@@ -155,6 +155,13 @@ namespace MySystem
         }
         #endregion
 
+        #region 移动列表元素位置
+        public T RPopLPush<T>(string key, string tokey)
+        {
+            return RedisHelper.RPopLPush<T>(key, tokey);
+        }
+        #endregion
+
         #region 添加排序列表对象
         public long AddSort(string key, object value, decimal score)
         {

appsettings.Development.json

@@ -9,6 +9,7 @@
   "AllowedHosts": "*",
   "Setting": {
     "Host": "http://localhost:6003/",
+    "OssHost": "http://oss.kxssaas.com",
     "Database": "TpAdminServer",
     "SqlConnStr1": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.103"
+    "version": "3.0.100"
   }
 }