添加操作日志和剩余返现金额

Areas/Api/Controllers/Main/ConsumerOrdersController.cs

@@ -215,6 +215,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                         order.CurDivi = suborder.CurDivi;
                         maindb.SaveChanges();
                         RedisDbconn.Instance.RemoveFromList("ConsumerOrdersHd:Divi:" + order.PayMode + ":" + order.MerchantId, suborder);
+                        function.WriteLog(DateTime.Now.ToString() + "\r\n" + "订单Id：" + suborder.Id + "\r\n\r\n", "银联订单取消返现");
                         return new AppResultJson() { Status = "1", Info = "", Data = Obj };
                     }
                 }
@@ -247,6 +248,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     if(suborder == null)
                     {
                         RedisDbconn.Instance.AddRightList("ConsumerOrdersHd:Divi:" + order.PayMode + ":" + order.MerchantId, order);
+                        function.WriteLog(DateTime.Now.ToString() + "\r\n" + "订单Id：" + suborder.Id + "\r\n\r\n", "银联订单恢复返现");
                     }
                     return new AppResultJson() { Status = "1", Info = "", Data = Obj };
                 }

Util/Business/BusinessUtil.cs

@@ -122,12 +122,14 @@ namespace MySystem
             List<Dictionary<string, object>> source = ConsumerOrdersService.List(relationData, 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", decimal.Parse(subdata["PayMoney"].ToString()).ToString("f2")); //支付金额
                 obj.Add("IsAct", subdata["IsAct"].ToString()); //是否活动(1 是 0 否)
                 obj.Add("OrderNo", subdata["OrderNo"].ToString()); //订单号
                 obj.Add("Kind", 2); //通道(1 直连 2 银联)
+                obj.Add("LeaveAmount", leaveAmount); //剩余返现金额
                 obj.Add("MerchantName", MerchantInfoService.Query(int.Parse(subdata["MerchantId"].ToString())).Name); //交易门店
                 List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
                 List<Dictionary<string, object>> dics = ConsumerProfitService.List(relationData, " and OrderId=" + int.Parse(subdata["Id"].ToString()) + "", 1, 999);