添加待结算金额、昨日收入、商户号

修改数据模型字段

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -612,6 +612,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("Name", query.Name); //名称
             Obj.Add("Mobile", query.Mobile); //手机号
             Obj.Add("IsAuth", query.IsAuth); //是否认证
+            Obj.Add("MchtNo", merchantAddInfo.MchtNo); //商户号
             Obj.Add("Logo", DefaultPic(query.Logo)); //Logo图片
             Obj.Add("Status", GetMainStatusName(merchantAddInfo.QueryCount, merchantAddInfo.Status));
             Obj.Add("AlipayStatus", merchantAddInfo.QueryCount);

Areas/Api/Controllers/MySelf/MySelfController.cs

@@ -124,28 +124,5 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
         #endregion
 
-
-        // #region 我的-商户统计数据（个人中心主界面）
-        // // [Authorize]
-        // [Route("Api/v1/MerchantInfo/StatData")]
-        // public JsonResult StatData(string value)
-        // {
-        //     value = DesDecrypt(value);
-        //     JsonData data = JsonMapper.ToObject(value);
-        //     Dictionary<string, object> Obj = StatDataDo(value);
-        //     return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
-        // }
-        // public Dictionary<string, object> StatDataDo(string value)
-        // {
-        //     JsonData data = JsonMapper.ToObject(value);
-        //     int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString()));
-        //     var Info = MySelfUtil.StatData(MerchantId);
-        //     return Info;
-        // }
-        // #endregion
-
-
-
-
     }
 }

Service/Main/MerchantTradeSummaryService.cs

@@ -41,7 +41,7 @@ namespace MySystem.Service.Main
             fields.Add("PayMode"); //支付方式
             fields.Add("TradeAmount"); //订单金额
             fields.Add("InFactAmount"); //实收金额
-            fields.Add("WeChatInFactAmount"); //微信实收金额
+            fields.Add("WeChatInfactAmount"); //微信实收金额
             fields.Add("AliPayInFactAmount"); //支付宝实收金额
             fields.Add("TradeDate"); //日期
             fields.Add("TradeMonth"); //月份
@@ -67,7 +67,7 @@ namespace MySystem.Service.Main
             fields.Add("PayMode"); //支付方式
             fields.Add("TradeAmount"); //订单金额
             fields.Add("InFactAmount"); //实收金额
-            fields.Add("WeChatInFactAmount"); //微信实收金额
+            fields.Add("WeChatInfactAmount"); //微信实收金额
             fields.Add("AliPayInFactAmount"); //支付宝实收金额
             fields.Add("TradeDate"); //日期
             fields.Add("TradeMonth"); //月份
@@ -93,7 +93,7 @@ namespace MySystem.Service.Main
             fields.Add("OderCount"); // 订单数
             fields.Add("TradeAmount"); //订单金额
             fields.Add("InFactAmount"); //实收金额
-            fields.Add("WeChatInFactAmount"); //微信实收金额
+            fields.Add("WeChatInfactAmount"); //微信实收金额
             fields.Add("AliPayInFactAmount"); //支付宝实收金额
             fields.Add("TradeDate"); //日期
             fields.Add("TradeMonth"); //月份

Util/Business/BusinessUtil.cs

@@ -35,7 +35,7 @@ namespace MySystem
                 curData.Add("InFactAmount", subdata["InFactAmount"].ToString()); //实收总金额
                 curData.Add("ActAmount", subdata["ActAmount"].ToString()); //活动总金额
                 curData.Add("NonActAmount", subdata["NonActAmount"].ToString()); //非活动总金额
-                curData.Add("WeChatInFactAmount", subdata["WeChatInFactAmount"].ToString()); //微信实收
+                curData.Add("WeChatInFactAmount", subdata["WeChatInfactAmount"].ToString()); //微信实收
                 curData.Add("AliPayInFactAmount", subdata["AliPayInFactAmount"].ToString()); //支付宝实收
                 curData.Add("OrderCount", subdata["OderCount"].ToString()); //订单数
                 dataList.Add(curData);
@@ -57,7 +57,7 @@ namespace MySystem
         public static List<Dictionary<string, object>> BussinessRecordForHalfYear(int MerchantId, int pageSize, int pageNum)
         {
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = UserTradeDbconn.Instance.GetMonthTradeList(MerchantId, "TradeAmount,InFactAmount,ActAmount,NonActAmount,WeChatInFactAmount,AliPayInFactAmount,OderCount");
+            List<Dictionary<string, object>> source = UserTradeDbconn.Instance.GetMonthTradeList(MerchantId, "TradeAmount,InFactAmount,ActAmount,NonActAmount,WeChatInfactAmount,AliPayInFactAmount,OderCount");
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
@@ -66,7 +66,7 @@ namespace MySystem
                 curData.Add("InFactAmount", subdata["InFactAmount"].ToString()); //实收总金额
                 curData.Add("ActAmount", subdata["ActAmount"].ToString()); //活动总金额
                 curData.Add("NonActAmount", subdata["NonActAmount"].ToString()); //非活动总金额
-                curData.Add("WeChatInFactAmount", subdata["WeChatInFactAmount"].ToString()); //微信实收
+                curData.Add("WeChatInFactAmount", subdata["WeChatInfactAmount"].ToString()); //微信实收
                 curData.Add("AliPayInFactAmount", subdata["AliPayInFactAmount"].ToString()); //支付宝实收
                 curData.Add("OrderCount", subdata["OderCount"].ToString()); //订单数
                 dataList.Add(curData);

Util/MySelf/MySelfUtil.cs

@@ -114,6 +114,9 @@ namespace MySystem
             Obj.Add("Name", query.Name); //名称
             Obj.Add("TotalAmount", query.TotalAmount.ToString("f2")); //营收总金额
             Obj.Add("TotalActual", query.TotalActual.ToString("f2")); //实收总金额
+            var yesterday = DateTime.Now.AddDays(-1).ToString("yyyyMMdd");
+            Obj.Add("YesterDayActual", decimal.Parse(MerchantAmountSummayService.Sum("TotalActual", " and MerchantId=" + MerchantId + " and TradeDate='" + yesterday + "'")["TotalActual"]).ToString("f2")); //昨日收入
+            Obj.Add("SettleAmount", ""); //待结算金额
             Obj.Add("TotalOrder", query.TotalConsumeCount); //累计订单
             Obj.Add("TotalCustomer", query.TotalCustomer); //累计客户
             Obj.Add("Logo", BaseController.DefaultPic(query.Logo)); //Logo图片