Merge branch 'feature-dgy-指定订单添加或退出返现' into feature-dgy-功能测试

Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

@@ -135,7 +135,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
 
-        
+
 
 
 
@@ -404,17 +404,18 @@ namespace MySystem.Areas.Api.Controllers.v1
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             int Id = int.Parse(function.CheckInt(data["id"].ToString()));
             ConsumerOrders order = maindb.ConsumerOrders.FirstOrDefault(m => m.Id == Id);
-            if(order != null)
+            if (order != null)
             {
                 List<ConsumerOrders> suborders = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrders:Divi:" + order.PayMode + ":" + order.MerchantId);
-                if(suborders.Count > 0)
+                if (suborders.Count > 0)
                 {
                     ConsumerOrders suborder = suborders.FirstOrDefault(m => m.Id == Id);
-                    if(suborder != null)
+                    if (suborder != null)
                     {
                         order.CurDivi = suborder.CurDivi;
                         maindb.SaveChanges();
                         RedisDbconn.Instance.RemoveFromList("ConsumerOrders:Divi:" + order.PayMode + ":" + order.MerchantId, suborder);
+                        function.WriteLog(DateTime.Now.ToString() + "\r\n" + "订单Id：" + Id + "\r\n\r\n", "直连订单取消返现");
                         return new AppResultJson() { Status = "1", Info = "", Data = Obj };
                     }
                 }
@@ -438,15 +439,16 @@ namespace MySystem.Areas.Api.Controllers.v1
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             int Id = int.Parse(function.CheckInt(data["id"].ToString()));
             ConsumerOrders order = maindb.ConsumerOrders.FirstOrDefault(m => m.Id == Id);
-            if(order != null)
+            if (order != null)
             {
                 List<ConsumerOrders> suborders = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrders:Divi:" + order.PayMode + ":" + order.MerchantId);
-                if(suborders.Count > 0)
+                if (suborders.Count > 0)
                 {
                     ConsumerOrders suborder = suborders.FirstOrDefault(m => m.Id == Id);
-                    if(suborder == null)
+                    if (suborder == null)
                     {
                         RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.PayMode + ":" + order.MerchantId, order);
+                        function.WriteLog(DateTime.Now.ToString() + "\r\n" + "订单Id：" + Id + "\r\n\r\n", "直连订单恢复返现");
                     }
                     return new AppResultJson() { Status = "1", Info = "", Data = Obj };
                 }

Util/BusinessUtil.cs

@@ -118,12 +118,14 @@ namespace MySystem
             List<Dictionary<string, object>> source = new ConsumerOrdersService().List(new List<FieldItem>(), condition, 1, 999);
             foreach (Dictionary<string, object> subdata in source)
             {
+                var leaveAmount = decimal.Parse(subdata["MaxDivi"].ToString()) - decimal.Parse(subdata["CurDivi"].ToString());
                 obj.Add("TradeDate", DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //日期
                 obj.Add("PayMode", subdata["PayMode"].ToString()); //支付方式(1 微信 2 支付宝)
                 obj.Add("PayMoney", subdata["PayMoney"].ToString()); //是否活动(1 是 0 否)
                 obj.Add("IsAct", subdata["IsAct"].ToString()); //是否活动(1 是 0 否)
                 obj.Add("OrderNo", subdata["OrderNo"].ToString()); //订单号
                 obj.Add("Kind", 1); //通道(1 直连 2 银联)
+                obj.Add("LeaveAmount", leaveAmount); //剩余返现金额
                 List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
                 List<Dictionary<string, object>> dics = new ConsumerProfitService().List(new List<FieldItem>(), " and OrderId=" + int.Parse(subdata["Id"].ToString()) + "", 1, 999);