统计数据等

Areas/Admin/Controllers/MainServer/ActiveRewardController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -50,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 激活奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ActiveReward data, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string ParentMakerCode, string ParentRealName, string ParentParentMakerCode, string ParentParentRealName, string StoreNo, string StoreName, string SnTypeSelect, string ActTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ActiveReward data, string right, string BrandId, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string ParentMakerCode, string ParentRealName, string ParentParentMakerCode, string ParentParentRealName, string StoreNo, string StoreName, string SnTypeSelect, string ActTypeSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -61,6 +62,10 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ActDate", "3"); //激活时间
             Fields.Add("TopUserId", "0"); //顶级创客
 
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+            ViewBag.BrandId = BrandId;
+
             string condition = " and Status>-1";
             //商户编号
             if (!string.IsNullOrEmpty(MerchantNo))
@@ -189,7 +194,13 @@ namespace MySystem.Areas.Admin.Controllers
                 if(ActType == 3) dic["ActType"] = "循环机划拨激活";
             }            
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("RewardAmount", 0);
+            string RewardAmount = "0.00";//奖励金额
+            DataTable dt = OtherMySqlConn.dtable("select sum(RewardAmount) from ActiveReward where BrandId='" + ViewBag.BrandId + "'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                RewardAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("RewardAmount", RewardAmount);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/FluxProfitDetailController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -122,7 +123,13 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("ProfitAmt", 0);
+            string ProfitAmt = "0.00";//分佣总金额
+            DataTable dt = OtherMySqlConn.dtable("select sum(FluxProfitAmt) from FluxProfitDetail where 1=1" + condition);
+            if(dt.Rows.Count > 0)
+            {
+                ProfitAmt = dt.Rows[0][0].ToString();
+            }
+            other.Add("ProfitAmt", ProfitAmt);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/FluxProfitSummaryController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -110,8 +111,20 @@ namespace MySystem.Areas.Admin.Controllers
                 if (CheckStatus == 1) dic["CheckStatus"] = "已验证和同步";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("TradeCount", 0);
-            other.Add("FluxProfit", 0);
+            string TradeCount = "0.00";//流量费交易笔数
+            string FluxProfit = "0.00";//分佣总金额
+            DataTable dt = OtherMySqlConn.dtable("select count(0) from FluxProfitSummary where BrandId=3 or BrandId=5" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                TradeCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(FluxProfitAmt) from FluxProfitSummary where BrandId=3 or BrandId=5" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                FluxProfit = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("TradeCount", TradeCount);
+            other.Add("FluxProfit", FluxProfit);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -165,8 +166,20 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ExpressInfo"] = dic["ExpressName"].ToString() + "<br />" + dic["ExpressNo"].ToString();
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("ApplyCount", 0);
-            other.Add("SendCount", 0);
+            string ApplyCount = "0.00";//申请机具数
+            string SendCount = "0.00";//发货机具数
+            DataTable dt = OtherMySqlConn.dtable("select sum(ApplyDeviceNum) from MachineApply where SendStatus=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                ApplyCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(ApplyDeviceNum) from MachineApply where SendStatus=1" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                SendCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("ApplyCount", ApplyCount);
+            other.Add("SendCount", SendCount);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/MerchantRebateDetailController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -98,10 +99,19 @@ namespace MySystem.Areas.Admin.Controllers
                 // if (SyncStatus == 1) dic["SyncStatus"] = "已验证和同步";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("CreditTradeAmt", 0);
-            other.Add("DebitTradeAmt", 0);
-            other.Add("CreditPrizeAmt", 0);
-            other.Add("DebitPrizeAmt", 0);
+            string CreditTradeAmt = "0.00", DebitTradeAmt = "0.00", CreditPrizeAmt = "0.00", DebitPrizeAmt = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt),sum(DebitTradeAmt),sum(CreditPrizeAmt),sum(DebitPrizeAmt) from MerchantRebateDetail where 1=1" + condition);
+            if(dt.Rows.Count > 0)
+            {
+                CreditTradeAmt = dt.Rows[0][0].ToString();
+                DebitTradeAmt = dt.Rows[0][1].ToString();
+                CreditPrizeAmt = dt.Rows[0][2].ToString();
+                DebitPrizeAmt = dt.Rows[0][3].ToString();
+            }
+            other.Add("CreditTradeAmt", CreditTradeAmt);
+            other.Add("DebitTradeAmt", DebitTradeAmt);
+            other.Add("CreditPrizeAmt", CreditPrizeAmt);
+            other.Add("DebitPrizeAmt", DebitPrizeAmt);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/OpenRewardDetailController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -138,10 +139,20 @@ namespace MySystem.Areas.Admin.Controllers
                 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("CreditTradeAmt", 0);
-            other.Add("DebitTradeAmt", 0);
-            other.Add("CreditPrizeAmt", 0);
-            other.Add("DebitPrizeAmt", 0);
+            string CreditTradeAmt = "0.00", DebitTradeAmt = "0.00", CreditRewardAmount = "0.00", DebitRewardAmount = "0.00";//贷记卡交易总额 借记卡交易总额 贷记卡交易奖励金额 借记记卡交易奖励金额
+            DataTable dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt),sum(DebitTradeAmt),sum(CreditRewardAmount),sum(DebitRewardAmount) from OpenRewardDetail where 1=1" + condition);
+            if(dt.Rows.Count > 0)
+            {
+                CreditTradeAmt = dt.Rows[0][0].ToString();
+                DebitTradeAmt = dt.Rows[0][1].ToString();
+                CreditRewardAmount = dt.Rows[0][2].ToString();
+                DebitRewardAmount = dt.Rows[0][3].ToString();
+
+            }
+            other.Add("CreditTradeAmt", CreditTradeAmt);
+            other.Add("DebitTradeAmt", DebitTradeAmt);
+            other.Add("CreditRewardAmount", CreditRewardAmount);
+            other.Add("DebitRewardAmount", DebitRewardAmount);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/OpenSnSnapshotController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -121,6 +122,14 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 1) dic["Status"] = "成功";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
+            string PrizeAmt = "0.00", BuyPosCount = "0.00", StadardBuyPosCount = "0.00";//奖励金额 购买机数量 标准购买机数量
+            DataTable dt = OtherMySqlConn.dtable("select sum(PrizeAmt),sum(BuyPosCount),sum(StadardBuyPosCount) from OpenSnSnapshot where 1=1" + condition);
+            if(dt.Rows.Count > 0)
+            {
+                PrizeAmt = dt.Rows[0][0].ToString();
+                BuyPosCount = dt.Rows[0][1].ToString();
+                StadardBuyPosCount = dt.Rows[0][2].ToString();
+            }
             other.Add("PrizeAmt", 0);
             other.Add("BuyPosCount", 0);
             other.Add("StadardBuyPosCount", 0);

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -115,7 +116,7 @@ namespace MySystem.Areas.Admin.Controllers
             //商品名称
             if (!string.IsNullOrEmpty(ProductIdSelect))
             {
-                condition += " and ProductId=" + ProductIdSelect;
+                condition += " and Id in (select OrderId from OrderProduct where ProductId="+ProductIdSelect+")";//表数据量过大时不适用
             }
             //仓库类型
             if (!string.IsNullOrEmpty(StoreTypeSelect))
@@ -194,6 +195,12 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 //商品名称
                 dic["ProductId"] = RelationClass.GetProductsInfo(int.Parse(dic["ProductId"].ToString()));
+
+                //商品名称
+                int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
+                OrderProduct orderProducts = db.OrderProduct.FirstOrDefault(m => m.OrderId == Id) ?? new OrderProduct();
+                dic["ProductName"] = orderProducts.ProductName;
+
                 //仓库归属创客
                 int StoreUserId = int.Parse(function.CheckInt(dic["StoreUserId"].ToString()));
                 Users storeuserid_Users = db.Users.FirstOrDefault(m => m.Id == StoreUserId) ?? new Users();
@@ -214,12 +221,99 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("SuccessAmount", 0);
-            other.Add("FailAmount", 0);
+            string SuccessAmount = "0.00";//支付成功总金额
+            string FailAmount = "0.00";//支付失败总金额
+            DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("SuccessAmount", SuccessAmount);
+            other.Add("FailAmount", FailAmount);
             obj.Add("other", other);
             return Json(obj);
         }
 
+
+        public JsonResult IndexDatas(string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, int page = 1, int limit = 30)
+        {
+            string condition = " and Status>-1";
+            //创客创客编号
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //创客真实姓名
+            if (!string.IsNullOrEmpty(UserIdRealName))
+            {
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
+            }
+            //支付方式
+            if (!string.IsNullOrEmpty(PayModeSelect))
+            {
+                condition += " and PayMode=" + PayModeSelect;
+            }
+            //仓库仓库编号
+            if (!string.IsNullOrEmpty(StoreIdStoreNo))
+            {
+                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
+            }
+            //仓库仓库名称
+            if (!string.IsNullOrEmpty(StoreIdStoreName))
+            {
+                condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
+            }
+            //退款状态
+            if (!string.IsNullOrEmpty(RefundStatusSelect))
+            {
+                condition += " and RefundStatus=" + RefundStatusSelect;
+            }
+            //提货类型
+            if (!string.IsNullOrEmpty(DeliveryTypeSelect))
+            {
+                condition += " and DeliveryType=" + DeliveryTypeSelect;
+            }
+            //发货状态
+            if (!string.IsNullOrEmpty(SendStatusSelect))
+            {
+                condition += " and SendStatus=" + SendStatusSelect;
+            }
+            //商品名称
+            if (!string.IsNullOrEmpty(ProductIdSelect))
+            {
+                condition += " and ProductId=" + ProductIdSelect;
+            }
+            //仓库类型
+            if (!string.IsNullOrEmpty(StoreTypeSelect))
+            {
+                condition += " and StoreType=" + StoreTypeSelect;
+            }
+            //仓库归属创客创客编号
+            if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
+            {
+                condition += " and StoreUserId in (select StoreUserId from UserForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
+            }
+            //仓库归属创客真实姓名
+            if (!string.IsNullOrEmpty(StoreUserIdRealName))
+            {
+                condition += " and StoreUserId in (select StoreUserId from UserForRealName where RealName='" + StoreUserIdRealName + "')";
+            }
+            //支付状态
+            if (!string.IsNullOrEmpty(PayStatusSelect))
+            {
+                condition += " and PayStatus=" + PayStatusSelect;
+            }
+            List<Dictionary<string, object>> other = new List<Dictionary<string, object>>();
+            Dictionary<string, object> obj = new Dictionary<string, object>();
+            DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=0" + condition);
+            return null;
+        }
+
         #endregion
 
         #region 增加创客订单

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -138,6 +139,21 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
+            string TotalCount = "0.00";//总机具数
+            string KysCount99 = "0.00";
+            string KssCount99 = "0.00";
+            string KssCoun198 = "0.00";
+            string KssCount298 = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select count(0) from PosMachinesTwo" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                TotalCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
             other.Add("TotalCount", 0);
             other.Add("KysCount99", 0);
             other.Add("KssCount99", 0);

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -64,7 +64,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分润奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ProfitRewardRecord data, string MakerCode, string RealName, string ProfitTypeSelect, string CheckStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ProfitRewardRecord data, string right, string BrandId, string MakerCode, string RealName, string ProfitTypeSelect, string CheckStatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -72,6 +72,9 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("BrandId", "1");
             Fields.Add("CreateDate", "3"); //交易时间
             Fields.Add("TopUserId", "0"); //顶级创客
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+            ViewBag.BrandId = BrandId;
 
             string condition = " and Status>-1";
             //创客编号
@@ -162,10 +165,34 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["DebitProfitAmt"] = DebitProfitAmt;
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("MerchantTradeAmount", 0);
-            other.Add("CreditTradeAmount", 0);
-            other.Add("MerchantProfitAmount", 0);
-            other.Add("CreditProfitAmount", 0);
+            string MerchantTradeAmount = "0.00";//商户交易总额
+            string CreditTradeAmount = "0.00";//贷记卡交易总金额
+            string MerchantProfitAmount = "0.00";//商户交易分润总金额
+            string CreditProfitAmount = "0.00";//贷记卡分润总金额
+            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                MerchantTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+            }
+            dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                CreditTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+            }
+            dt = OtherMySqlConn.dtable("select sum(TradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                MerchantProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+            }
+            dt = OtherMySqlConn.dtable("select sum(CreditTradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                CreditProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+            }
+            other.Add("MerchantTradeAmount", MerchantTradeAmount);
+            other.Add("CreditTradeAmount", CreditTradeAmount);
+            other.Add("MerchantProfitAmount", MerchantProfitAmount);
+            other.Add("CreditProfitAmount", CreditProfitAmount);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/ProfitSubsidyDetailController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -112,7 +113,13 @@ namespace MySystem.Areas.Admin.Controllers
                 if (SubsidyType == 1) dic["SubsidyType"] = "下级商户交易分润补贴";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("SubsidyProfit", 0);
+            string SubsidyProfit = "0.00";//分润补贴金额
+            DataTable dt = OtherMySqlConn.dtable("select sum(SubsidyProfit) from ProfitSubsidyDetail where 1=1" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                SubsidyProfit = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("SubsidyProfit", SubsidyProfit);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/StoreBalanceController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -107,10 +108,34 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("InCount", 0);
-            other.Add("MoveInCount", 0);
-            other.Add("MoveOutCount", 0);
-            other.Add("OutCount", 0);
+            string InCount = "0.00";//入库
+            string MoveInCount = "0.00";//调拨入库
+            string MoveOutCount = "0.00";//调拨出库
+            string OutCount = "0.00";//出库
+            DataTable dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                InCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=1 and OpSymbol='+'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                MoveInCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=1 and OpSymbol='-'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                MoveInCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=2" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                MoveInCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("InCount", InCount);
+            other.Add("MoveInCount", MoveInCount);
+            other.Add("MoveOutCount", MoveOutCount);
+            other.Add("OutCount", OutCount);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -0,0 +1,669 @@
+using System;
+using System.Web;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using MySystem.Models;
+using Library;
+using LitJson;
+using MySystemLib;
+
+/// <summary>
+/// 机具申请记录
+/// </summary>
+namespace MySystem.Areas.Admin.Controllers
+{
+    [Area("Admin")]
+    [Route("Admin/[controller]/[action]")]
+    public class StoreMachineApplyController : BaseController
+    {
+        public StoreMachineApplyController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        }
+
+        #region 机具申请记录列表
+
+        /// <summary>
+        /// 机具申请记录列表
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Index(StoreMachineApply data, string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        #endregion
+
+        #region 根据条件查询机具申请记录列表
+
+        /// <summary>
+        /// 机具申请记录列表
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult IndexData(StoreMachineApply data, string MakerCode, string RealName, string StoreNo, string StoreName, string StoreMakerCode, string StatusSelect, string SendStatusSelect, string StoreTypeSelect, int page = 1, int limit = 30)
+        {
+
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+
+            Fields.Add("ApplyNo", "1"); //申请单号
+            Fields.Add("BrandId", "1"); //品牌
+            Fields.Add("ApplyTime", "3"); //申请时间
+            Fields.Add("ExpressNo", "1"); //快递单号
+
+            string condition = " and Status>-1";
+            //创客编号
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
+            }
+            //创客名称
+            if (!string.IsNullOrEmpty(RealName))
+            {
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
+            }
+            //仓库编号
+            if (!string.IsNullOrEmpty(StoreNo))
+            {
+                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreNo + "')";
+            }
+            //仓库名称
+            if (!string.IsNullOrEmpty(StoreName))
+            {
+                condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreName + "')";
+            }
+            //仓库归属创客编号
+            if (!string.IsNullOrEmpty(StoreMakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + StoreMakerCode + "')";
+            }
+            //订单状态
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                condition += " and Status=" + StatusSelect;
+            }
+            //发货状态
+            if (!string.IsNullOrEmpty(SendStatusSelect))
+            {
+                condition += " and SendStatus=" + SendStatusSelect;
+            }
+            //仓库类型
+            if (!string.IsNullOrEmpty(StoreTypeSelect))
+            {
+                condition += " and StoreType=" + StoreTypeSelect;
+            }
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("StoreMachineApply", Fields, "Id desc", "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
+
+                //申请仓库信息
+                int StoreId = int.Parse(dic["StoreId"].ToString());
+                StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
+                dic["StoreInfo"] = store.StoreNo + "<br />" + store.StoreName;
+
+                //仓库收货地址
+                dic["StoreAddressInfo"] = store.Areas + "<br />" + store.Address;
+
+                //仓库联系人信息
+                //dic["StoreContact"] = dic["StoreManagerMobile"].ToString() + "<br />" + dic["StoreManager"].ToString();
+
+                //仓库归属信息
+                // int StoreUserId = int.Parse(dic["StoreUserId"].ToString());
+                // Users storeUser = db.Users.FirstOrDefault(m => m.Id == StoreUserId) ?? new Users();
+                // int StoreType = int.Parse(dic["StoreType"].ToString());
+                // string StoreTypeName = "";
+                // if(StoreType == 0) StoreTypeName = "总仓";
+                // if(StoreType == 1) StoreTypeName = "分仓";
+                // dic["StoreUser"] = storeUser.MakerCode + "<br />" + StoreTypeName;
+
+                //创客信息
+                int UserId = int.Parse(dic["UserId"].ToString());
+                Users puser = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserInfo"] = puser.MakerCode + "<br />" + puser.RealName;
+
+                //顶级创客
+                // int TopUserId = int.Parse(dic["TopUserId"].ToString());
+                // Users tuser = db.Users.FirstOrDefault(m => m.Id == TopUserId) ?? new Users();
+                // dic["TopUserInfo"] = tuser.MakerCode + "<br />" + tuser.RealName;
+
+                //申请状态
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["Status"] = "待审核";
+                if (Status == 1) dic["Status"] = "申请成功";
+                if (Status == 2) dic["Status"] = "申请失败";
+            }
+            Dictionary<string, object> other = new Dictionary<string, object>();
+            other.Add("ApplyNum", 0);
+            other.Add("SendNum", 0);
+            obj.Add("other", other);
+            return Json(obj);
+        }
+
+        #endregion
+
+        #region 增加机具申请记录
+
+        /// <summary>
+        /// 增加或修改机具申请记录信息
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Add(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            return View();
+        }
+
+        #endregion
+
+        #region 增加机具申请记录
+
+        /// <summary>
+        /// 增加或修改机具申请记录信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public string Add(StoreMachineApply data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+
+
+            Fields.Add("SeoTitle", data.SeoTitle);
+            Fields.Add("SeoKeyword", data.SeoKeyword);
+            Fields.Add("SeoDescription", data.SeoDescription);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreMachineApply", Fields, 0);
+            AddSysLog(data.Id.ToString(), "StoreMachineApply", "add");
+            db.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 修改机具申请记录信息
+
+        /// <summary>
+        /// 增加或修改机具申请记录信息
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Edit(string right, int Id = 0)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            StoreMachineApply editData = db.StoreMachineApply.FirstOrDefault(m => m.Id == Id) ?? new StoreMachineApply();
+            ViewBag.data = editData;
+
+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == editData.BrandId);
+            ViewBag.BrandName = kqProducts.Name;
+
+            Users user = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
+            ViewBag.MakerCode = user.MakerCode;
+            ViewBag.RealName = user.RealName;
+
+            int Status = editData.Status;
+            if (Status == 0) ViewBag.Status = "待审核";
+            if (Status == 1) ViewBag.Status = "申请成功";
+            if (Status == 2) ViewBag.Status = "申请失败";
+            return View();
+        }
+
+        #endregion
+
+        #region 修改机具申请记录
+
+        /// <summary>
+        /// 增加或修改机具申请记录信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public string Edit(StoreMachineApply data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+
+            Fields.Add("ApplyNo", data.ApplyNo); //申请单号
+            // Fields.Add("BrandId", data.BrandId); //产品Id
+            Fields.Add("ApplyNum", data.ApplyNum); //申请箱数
+            Fields.Add("SendNum", data.SendNum); //发货箱数
+            // Fields.Add("UserId", data.UserId); //创客ID
+            Fields.Add("Status", data.Status); //申请状态
+            Fields.Add("SwapSnExpand", data.SwapSnExpand);//已发货机具SN
+            Fields.Add("SeoDescription", data.SeoDescription); //申请描述
+
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "StoreMachineApply", "update");
+            db.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 删除机具申请记录信息
+
+        /// <summary>
+        /// 删除机具申请记录信息
+        /// </summary>
+        /// <returns></returns>
+        public string Delete(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "StoreMachineApply", "del");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", -1);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, id);
+            }
+            db.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 取消机具申请记录信息
+
+        /// <summary>
+        /// 取消机具申请记录信息
+        /// </summary>
+        /// <returns></returns>
+        public string Cancel(int Id)
+        {
+            AddSysLog(Id, "StoreMachineApply", "cancel");
+            AddSysLog(Id, "Orders", "cancel");
+            StoreMachineApply storeMachineApply = db.StoreMachineApply.FirstOrDefault(m => m.Id == Id);
+            Orders order = db.Orders.FirstOrDefault(m => m.Id == storeMachineApply.OrderId);
+            if (storeMachineApply != null && order != null)
+            {
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(storeMachineApply) + "#cut#" + Newtonsoft.Json.JsonConvert.SerializeObject(order) + "#cut#" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), "机具申请订单取消日志");
+                db.StoreMachineApply.Remove(storeMachineApply);
+                db.Orders.Remove(order);
+                db.SaveChanges();
+            }
+            return "success";
+            // if (storeMachineApply != null)
+            // {
+            //     Orders order = db.Orders.FirstOrDefault(m => m.Id == storeMachineApply.OrderId);
+            //     if (order != null)
+            //     {
+            //         string SwapSnExpand = storeMachineApply.SwapSnExpand;
+            //         if (!string.IsNullOrEmpty(SwapSnExpand))
+            //         {
+            //             string[] list = SwapSnExpand.TrimEnd('\n').Split('\n');
+            //             if (storeMachineApply.Sort > 0)
+            //             {
+            //                 int Kind = storeMachineApply.Sort - 1;
+            //                 string ChangeRecordNo = "SC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+            //                 int CouponCount = 0;
+            //                 foreach (string sub in list)
+            //                 {
+            //                     PosCoupons coupon = db.PosCoupons.FirstOrDefault(m => m.ExchangeCode == sub && m.UserId == order.UserId && m.IsUse == 1);
+            //                     if (coupon != null)
+            //                     {
+            //                         coupon.IsUse = 0;
+            //                         coupon.IsLock = 0;
+            //                         coupon.UseDate = DateTime.Parse("1900-01-01");
+            //                         PosCouponRecord query = db.PosCouponRecord.Add(new PosCouponRecord()
+            //                         {
+            //                             QueryCount = Kind,
+            //                             CreateDate = DateTime.Now,
+            //                             ChangeKind = 1,
+            //                             OrderNo = ChangeRecordNo,
+            //                             ToUserId = order.UserId,
+            //                             FromUserId = order.UserId,
+            //                             PosCouponId = coupon.Id,
+            //                         }).Entity;
+            //                         CouponCount += 1;
+            //                     }
+            //                 }
+            //                 if (CouponCount > 0)
+            //                 {
+            //                     PosCouponForUser forUser = db.PosCouponForUser.FirstOrDefault(m => m.Id == order.UserId);
+            //                     if (forUser == null)
+            //                     {
+            //                         forUser = db.PosCouponForUser.Add(new PosCouponForUser()
+            //                         {
+            //                             Id = order.UserId,
+            //                         }).Entity;
+            //                         db.SaveChanges();
+            //                     }
+            //                     int BeforeOut = forUser.OutNum;
+            //                     int BeforeTotal = forUser.TotalNum;
+            //                     int BeforeStock = forUser.StockNum;
+            //                     forUser.StockNum += CouponCount;
+            //                     int AfterOut = forUser.OutNum;
+            //                     int AfterTotal = forUser.TotalNum;
+            //                     int AfterStock = forUser.StockNum;
+            //                     PosCouponOrders stat = db.PosCouponOrders.Add(new PosCouponOrders()
+            //                     {
+            //                         QueryCount = Kind,
+            //                         CreateDate = DateTime.Now,
+            //                         ChangeKind = 1,
+            //                         ChangeCount = CouponCount,
+            //                         AfterOut = AfterOut,
+            //                         AfterTotal = AfterTotal,
+            //                         AfterStock = AfterStock,
+            //                         BeforeOut = BeforeOut,
+            //                         BeforeTotal = BeforeTotal,
+            //                         BeforeStock = BeforeStock,
+            //                         OrderNo = ChangeRecordNo,
+            //                         ToUserId = order.UserId,
+            //                         FromUserId = order.UserId,
+            //                     }).Entity;
+            //                 }
+            //                 function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(storeMachineApply) + "#cut#" + Newtonsoft.Json.JsonConvert.SerializeObject(order) + "#cut#" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), "机具申请订单取消日志");
+            //                 db.StoreMachineApply.Remove(storeMachineApply);
+            //                 db.Orders.Remove(order);
+            //                 db.SaveChanges();
+            //             }
+            //             else
+            //             {
+            //                 foreach (string sub in list)
+            //                 {
+            //                     string SourcePosSn = sub.Split(':')[0];
+            //                     MachineForSnNo forSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SourcePosSn) ?? new MachineForSnNo();
+            //                     PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId);
+            //                     if (pos != null)
+            //                     {
+            //                         function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(storeMachineApply) + "#cut#" + Newtonsoft.Json.JsonConvert.SerializeObject(order) + "#cut#" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), "机具申请订单取消日志");
+            //                         pos.IsPurchase = 0;
+            //                         RedisDbconn.Instance.Clear("PosMachinesTwo:" + pos.Id);
+            //                     }
+            //                 }
+            //                 db.StoreMachineApply.Remove(storeMachineApply);
+            //                 db.Orders.Remove(order);
+            //                 db.SaveChanges();
+            //             }
+            //         }
+            //     }
+            // }
+            // return "success";
+        }
+
+        #endregion
+
+        #region 开启
+
+        /// <summary>
+        /// 开启
+        /// </summary>
+        /// <returns></returns>
+        public string Open(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "StoreMachineApply", "open");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", 1);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, id);
+            }
+            db.SaveChanges();
+            return "success";
+        }
+
+        #endregion
+
+        #region 关闭
+
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <returns></returns>
+        public string Close(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "StoreMachineApply", "close");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", 0);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, id);
+            }
+            db.SaveChanges();
+            return "success";
+        }
+
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id"></param>
+        public string Sort(int Id, int Sort)
+        {
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("StoreMachineApply", Sort, Id);
+
+            AddSysLog(Id.ToString(), "StoreMachineApply", "sort");
+            return "success";
+        }
+        #endregion
+
+         #region 导入数据
+
+        public IActionResult Import(string right, string ExcelKind)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+            ViewBag.ExcelKind = ExcelKind;
+            return View();
+        }
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData"></param>
+        [HttpPost]
+        public string ImportPost(string ExcelPath, int Kind = 0)
+        {
+            // RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#" + Kind);
+            string key = function.MD5_16(Guid.NewGuid().ToString());
+            RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#" + Kind + "#cut#" + key);
+            return "success|" + key;
+        }
+        #endregion
+
+        #region 导出Excel
+
+        /// <summary>
+        /// 导出Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportExcel(StoreMachineApply data, string MakerCode, string RealName, string StoreNo, string StoreName, string StoreMakerCode, string StatusSelect, string SendStatusSelect, string StoreTypeSelect)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+
+            Fields.Add("ApplyNo", "1"); //申请单号
+            Fields.Add("BrandId", "1"); //品牌
+            Fields.Add("ApplyTime", "3"); //申请时间
+            Fields.Add("ExpressNo", "1"); //快递单号
+
+            string condition = " and Status>-1";
+            //创客编号
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
+            }
+            //创客名称
+            if (!string.IsNullOrEmpty(RealName))
+            {
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
+            }
+            //仓库编号
+            if (!string.IsNullOrEmpty(StoreNo))
+            {
+                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreNo + "')";
+            }
+            //仓库名称
+            if (!string.IsNullOrEmpty(RealName))
+            {
+                condition += " and StoreId in (select StoreId from StoreForName where Name='" + RealName + "')";
+            }
+            //仓库归属创客编号
+            if (!string.IsNullOrEmpty(StoreMakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + StoreMakerCode + "')";
+            }
+            //订单状态
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                condition += " and Status=" + StatusSelect;
+            }
+            //发货状态
+            if (!string.IsNullOrEmpty(SendStatusSelect))
+            {
+                condition += " and SendStatus=" + SendStatusSelect;
+            }
+            //仓库类型
+            if (!string.IsNullOrEmpty(StoreTypeSelect))
+            {
+                condition += " and StoreType=" + StoreTypeSelect;
+            }
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MachineApply", Fields, "Id desc", "0", 1, 20000, condition, "ApplyNo,UserId,TopUserId,BrandId,Areas,Address,RealName,Mobile,ApplyDeviceName,ApplyDeviceNum,ApplyTime,SendStatus,ExpressNo,ExpressName,DeliveryType,StoreId,StoreName,StoreManager,StoreManagerMobile,Remark,StoreUserId,SendDate,StoreType,Status", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
+
+                //申请仓库信息
+                int StoreId = int.Parse(dic["StoreId"].ToString());
+                StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
+                dic["StoreInfo"] = store.StoreNo + "<br />" + store.StoreName;
+
+                //仓库联系人信息
+                //dic["StoreContact"] = dic["StoreManagerMobile"].ToString() + "<br />" + dic["StoreManager"].ToString();
+
+                //仓库归属信息
+                // int StoreUserId = int.Parse(dic["StoreUserId"].ToString());
+                // Users storeUser = db.Users.FirstOrDefault(m => m.Id == StoreUserId) ?? new Users();
+                // int StoreType = int.Parse(dic["StoreType"].ToString());
+                // string StoreTypeName = "";
+                // if(StoreType == 0) StoreTypeName = "总仓";
+                // if(StoreType == 1) StoreTypeName = "分仓";
+                // dic["StoreUser"] = storeUser.MakerCode + "<br />" + StoreTypeName;
+
+                //创客信息
+                int UserId = int.Parse(dic["UserId"].ToString());
+                Users puser = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserInfo"] = puser.MakerCode + "<br />" + puser.RealName;
+
+                //顶级创客
+                // int TopUserId = int.Parse(dic["TopUserId"].ToString());
+                // Users tuser = db.Users.FirstOrDefault(m => m.Id == TopUserId) ?? new Users();
+                // dic["TopUserInfo"] = tuser.MakerCode + "<br />" + tuser.RealName;
+
+                //申请状态
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["Status"] = "待审核";
+                if (Status == 1) dic["Status"] = "申请成功";
+                if (Status == 2) dic["Status"] = "申请失败";
+
+                dic.Remove("BrandId");
+                dic.Remove("StoreInfo");
+                dic.Remove("UserInfo");
+                dic.Remove("Status");
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+            ReturnFields.Add("ApplyNo", "申请单号");
+            ReturnFields.Add("BrandId", "产品类型");
+            ReturnFields.Add("StoreId", "申请仓库");
+            ReturnFields.Add("StoreMakerCode", "仓库归属创客编号");
+            ReturnFields.Add("StoreRealName", "仓库归属创客名称");
+            ReturnFields.Add("MakerCode", "创客编号");
+            ReturnFields.Add("MakerName", "创客名称");
+            ReturnFields.Add("Status", "申请状态");
+            ReturnFields.Add("ApplyTime", "申请时间");
+            ReturnFields.Add("ApplyNum", "申请箱数");
+            ReturnFields.Add("SendNum", "发货箱数");
+            ReturnFields.Add("SwapSnExpand", "已发货SN号");
+            ReturnFields.Add("SeoDescription", "申请描述");
+
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "StoreMachineApply", "ExportExcel");
+            return Json(result);
+        }
+
+        #endregion
+
+
+
+
+
+        #region 审核发货
+
+        public IActionResult AuditSend(string right, int Id = 0)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            StoreMachineApply editData = db.StoreMachineApply.FirstOrDefault(m => m.Id == Id) ?? new StoreMachineApply();
+            ViewBag.data = editData;
+
+            Users users = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
+            StoreHouse storeHouse = db.StoreHouse.FirstOrDefault(m => m.Id == editData.StoreId) ?? new StoreHouse();
+            ViewBag.MakerCode=users.MakerCode;
+            ViewBag.RealName=users.RealName;
+
+            return View();
+        }
+
+        #endregion
+
+        #region 审核发货
+
+        [HttpPost]
+        public string AuditSend(StoreMachineApply data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+            // Fields.Add("ApplyNo", data.ApplyNo); //申请单号
+            // Fields.Add("BrandId", data.BrandId); //产品Id
+            Fields.Add("ApplyNum", data.ApplyNum); //申请箱数
+            Fields.Add("SendNum", data.SendNum); //发货箱数
+            // Fields.Add("UserId", data.UserId); //创客ID
+            // Fields.Add("Status", data.Status); //申请状态
+            Fields.Add("SwapSnExpand", data.SwapSnExpand);//已发货机具SN
+            Fields.Add("SeoDescription", data.SeoDescription); //申请描述
+            Fields.Add("Status", data.Status);
+
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "StoreMachineApply", "AuditSend");
+            db.SaveChanges();
+            if (data.Status == 1)
+            {
+                return "success";
+            }
+            else
+            {
+                return "false";
+            }
+
+        }
+
+        #endregion
+
+    }
+}

Areas/Admin/Controllers/MainServer/StoreMallOrderSummaryController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -112,10 +113,19 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["CreateDate"] = string.IsNullOrEmpty(dic["CreateDate"].ToString()) ? "" : DateTime.Parse(dic["CreateDate"].ToString()).ToString("yyyy-MM-dd");
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("OrderCount", 0);
-            other.Add("OrderAmt", 0);
-            other.Add("ReturnOrderCount", 0);
-            other.Add("ReturnAmt", 0);
+            string OrderCount = "0.00", OrderAmt = "0.00", ReturnOrderCount = "0.00", ReturnAmt = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select sum(OrderNum),sum(OrderAmt),sum(RefundOrderNum),sum(RefundAmt) from StoreMallOrderSummary where 1=1" + condition);
+            if(dt.Rows.Count > 0)
+            {
+                OrderCount = dt.Rows[0][0].ToString();
+                OrderAmt = dt.Rows[0][1].ToString();
+                ReturnOrderCount = dt.Rows[0][2].ToString();
+                ReturnAmt = dt.Rows[0][3].ToString();
+            }
+            other.Add("OrderCount", OrderCount);
+            other.Add("OrderAmt", OrderAmt);
+            other.Add("ReturnOrderCount", ReturnOrderCount);
+            other.Add("ReturnAmt", ReturnAmt);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/StoreSnActivateSummaryController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -107,11 +108,41 @@ namespace MySystem.Areas.Admin.Controllers
 
             }            
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("ActCount", 0);
-            other.Add("RejectActCount", 0);
-            other.Add("PutActCount", 0);
-            other.Add("EffectActCount", 0);
-            other.Add("ApplyCount", 0);
+            string ActCount = "0.00";//激活数量
+            string RejectActCount = "0.00";//划拨激活数量
+            string PutActCount = "0.00";//互斥激活数量
+            string EffectActCount = "0.00";//有效激活数量
+            string ApplyCount = "0.00";//创客申请数量
+            DataTable dt = OtherMySqlConn.dtable("select sum(ActivateNum) from StoreSnActivateSummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                ActCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(RejectActNum) from StoreSnActivateSummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                RejectActCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(TransferActNum) from StoreSnActivateSummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                PutActCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(EffectActNum) from StoreSnActivateSummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                EffectActCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(UserApplyNum) from StoreSnActivateSummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                ApplyCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("ActCount", ActCount);
+            other.Add("RejectActCount", RejectActCount);
+            other.Add("PutActCount", PutActCount);
+            other.Add("EffectActCount", EffectActCount);
+            other.Add("ApplyCount", ApplyCount);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/SysRechargeRecordController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -101,8 +102,20 @@ namespace MySystem.Areas.Admin.Controllers
                 if(SyncStatus == 2) dic["SyncStatus"] = "同步中";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("BizAmount30", 0);
-            other.Add("BizAmount31", 0);
+            string BizAmount30 = "0.00";//红包奖励
+            string BizAmount31 = "0.00";//活动奖励
+            DataTable dt = OtherMySqlConn.dtable("select sum(Amount) from SysRechargeRecord where BizType=30" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                BizAmount30 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(Amount) from SysRechargeRecord where BizType=31" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                BizAmount31 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("BizAmount30", BizAmount30);
+            other.Add("BizAmount31", BizAmount31);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/TradeDaySummaryController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -93,10 +94,34 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopRealName"] = tuser.RealName;
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("HelpDirectTradeAmt", 0);
-            other.Add("HelpNonDirectTradeAmt", 0);
-            other.Add("NotHelpDirectTradeAmt", 0);
-            other.Add("NotHelpNonDirectTradeAmt", 0);
+            string HelpDirectTradeAmt = "0.00";//扶持期直营商户交易总额
+            string HelpNonDirectTradeAmt = "0.00";//扶持期非直营商户交易总额
+            string NotHelpDirectTradeAmt = "0.00";//非扶持期直营商户交易总额
+            string NotHelpNonDirectTradeAmt = "0.00";//非扶持期非直营商户交易总额
+            DataTable dt = OtherMySqlConn.dtable("select sum(HelpDirectTradeAmt) from TradeDaySummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                HelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(HelpNonDirectTradeAmt) from TradeDaySummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                HelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(NotHelpDirectTradeAmt) from TradeDaySummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                NotHelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(NotHelpNonDirectTradeAmt) from TradeDaySummary" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                NotHelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("HelpDirectTradeAmt", HelpDirectTradeAmt);
+            other.Add("HelpNonDirectTradeAmt", HelpNonDirectTradeAmt);
+            other.Add("NotHelpDirectTradeAmt", NotHelpDirectTradeAmt);
+            other.Add("NotHelpNonDirectTradeAmt", NotHelpNonDirectTradeAmt);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -142,8 +143,20 @@ namespace MySystem.Areas.Admin.Controllers
                 if(BankCardType == 1) dic["BankCardType"] = "借记卡";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("TotalTrade0", 0);
-            other.Add("TotalTrade1", 0);
+            string TotalTrade0 = "0.00";//贷记卡交易总额
+            string TotalTrade1 = "0.00";//借记卡交易总额
+            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                TotalTrade0 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=1" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                TotalTrade1 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("TotalTrade0", TotalTrade0);
+            other.Add("TotalTrade1", TotalTrade1);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -121,9 +121,15 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate>='" + end + " 23:59:59'";
             }
-            string SuccessAmount = "0.00";
-            string FailAmount = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
+            string WaitAmount = "0.00";//待处理总金额
+            string SuccessAmount = "0.00";//提现成功总金额
+            string FailAmount = "0.00";//提现失败总金额
+            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
@@ -133,6 +139,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
             }
+            other.Add("WaitAmount", WaitAmount);
             other.Add("SuccessAmount", SuccessAmount);
             other.Add("FailAmount", FailAmount);
             obj.Add("other", other);

Areas/Admin/Controllers/MainServer/UserProfitSubsidySummaryController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -92,7 +93,13 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["CheckStatus"] = dic["CheckStatus"].ToString() == "1" ? "已验证和同步" : "初始";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("SubsidyTotalProfit", 0);
+            string SubsidyTotalProfit = "0.00";//分润补贴总金额
+            DataTable dt = OtherMySqlConn.dtable("select sum(SubsidyDirectProfit+SubsidyJuniorProfit+SubsidyTotalProfit) from ProfitSubsidyDetail where 1=1" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                SubsidyTotalProfit = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
+            other.Add("SubsidyTotalProfit", SubsidyTotalProfit);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/UserStoreChangeController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -194,25 +195,121 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("NotPutNotBindCount", 0);
-            other.Add("NotPutBindCount", 0);
-            other.Add("PutNotBindCount", 0);
-            other.Add("PutBindCount", 0);
+            string NotPutNotBindCount = "0.00";//支付成功总金额
+            string NotPutBindCount = "0.00";//支付失败总金额
+            string PutNotBindCount = "0.00";//支付成功总金额
+            string PutBindCount = "0.00";//支付失败总金额
+            string NotPutNotBindCount2 = "0.00";//支付成功总金额
+            string NotPutBindCount2 = "0.00";//支付失败总金额
+            string PutNotBindCount2 = "0.00";//支付成功总金额
+            string PutBindCount2 = "0.00";//支付失败总金额
+            string NotPutNotBindCount3 = "0.00";//支付成功总金额
+            string NotPutBindCount3 = "0.00";//支付失败总金额
+            string PutNotBindCount3 = "0.00";//支付成功总金额
+            string PutBindCount3 = "0.00";//支付失败总金额
+            string NotPutNotBindCount4 = "0.00";//支付成功总金额
+            string NotPutBindCount4 = "0.00";//支付失败总金额
+            string PutNotBindCount4 = "0.00";//支付成功总金额
+            string PutBindCount4 = "0.00";//支付失败总金额
+            // DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=0" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     NotPutNotBindCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     NotPutBindCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PutNotBindCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PutBindCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     NotPutNotBindCount2 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     NotPutBindCount2 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PutNotBindCount2 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PutBindCount2 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     NotPutNotBindCount3 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     NotPutBindCount3 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PutNotBindCount3 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PutBindCount3 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     NotPutNotBindCount4 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     NotPutBindCount4 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PutNotBindCount4 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PutBindCount4 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            other.Add("NotPutNotBindCount", NotPutNotBindCount);
+            other.Add("NotPutBindCount", NotPutBindCount);
+            other.Add("PutNotBindCount", PutNotBindCount);
+            other.Add("PutBindCount",PutBindCount);
             
-            other.Add("NotPutNotBindCount2", 0);
-            other.Add("NotPutBindCount2", 0);
-            other.Add("PutNotBindCount2", 0);
-            other.Add("PutBindCount2", 0);
+            other.Add("NotPutNotBindCount2", NotPutNotBindCount2);
+            other.Add("NotPutBindCount2", NotPutBindCount2);
+            other.Add("PutNotBindCount2", PutNotBindCount2);
+            other.Add("PutBindCount2", PutBindCount2);
             
-            other.Add("NotPutNotBindCount3", 0);
-            other.Add("NotPutBindCount3", 0);
-            other.Add("PutNotBindCount3", 0);
-            other.Add("PutBindCount3", 0);
+            other.Add("NotPutNotBindCount3", NotPutNotBindCount3);
+            other.Add("NotPutBindCount3", NotPutBindCount3);
+            other.Add("PutNotBindCount3", PutNotBindCount3);
+            other.Add("PutBindCount3", PutBindCount3);
             
-            other.Add("NotPutNotBindCount4", 0);
-            other.Add("NotPutBindCount4", 0);
-            other.Add("PutNotBindCount4", 0);
-            other.Add("PutBindCount4", 0);
+            other.Add("NotPutNotBindCount4", NotPutNotBindCount4);
+            other.Add("NotPutBindCount4", NotPutBindCount4);
+            other.Add("PutNotBindCount4", PutNotBindCount4);
+            other.Add("PutBindCount4", PutBindCount4);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/UserTradeDaySummaryController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -71,7 +72,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //交易月份
-            if(!string.IsNullOrEmpty(TradeMonthSelect))
+            if (!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }
@@ -87,9 +88,17 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("DirectTradeAmt", 0);
-            other.Add("DirectDebitTradeAmt", 0);
-            other.Add("DirectDebitCapNum", 0);
+            string DirectTradeAmt = "0.00", DirectDebitTradeAmt = "0.00", DirectDebitCapNum = "0.00";//直营商户交易总额 直营商户借记卡交易总额 直营激活商户数
+            DataTable dt = OtherMySqlConn.dtable("select sum(DirectTradeAmt),sum(DirectDebitTradeAmt),sum(DirectDebitCapNum) from UserTradeDaySummary where 1=1" + condition);
+            if(dt.Rows.Count > 0)
+            {
+                DirectTradeAmt = dt.Rows[0][0].ToString();
+                DirectDebitTradeAmt = dt.Rows[0][1].ToString();
+                DirectDebitCapNum = dt.Rows[0][2].ToString();
+            }
+            other.Add("DirectTradeAmt", DirectTradeAmt);
+            other.Add("DirectDebitTradeAmt", DirectDebitTradeAmt);
+            other.Add("DirectDebitCapNum", DirectDebitCapNum);
             obj.Add("other", other);
             return Json(obj);
         }
@@ -315,7 +324,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //交易月份
-            if(!string.IsNullOrEmpty(TradeMonthSelect))
+            if (!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }

wwwroot/layuiadmin/modules_main/ActiveReward_Admin.js

@@ -150,7 +150,7 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#RewardAmount").text(res.other.RewardAmount.toFixed(2));
+            $("#RewardAmount").text(res.other.RewardAmount);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/FluxProfitDetail_Admin.js

@@ -117,7 +117,7 @@ $('#CreateDate').val(value);
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#ProfitAmt").text(res.other.ProfitAmt.toFixed(2));            
+            $("#ProfitAmt").text(res.other.ProfitAmt);            
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/FluxProfitSummary_Admin.js

@@ -113,8 +113,8 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#TradeCount").text(res.other.TradeCount.toFixed(2));
-            $("#FluxProfit").text(res.other.FluxProfit.toFixed(2));
+            $("#TradeCount").text(res.other.TradeCount);
+            $("#FluxProfit").text(res.other.FluxProfit);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/MerchantRebateDetail_Admin.js

@@ -123,10 +123,10 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#CreditTradeAmt").text(res.other.CreditTradeAmt.toFixed(2));
-            $("#DebitTradeAmt").text(res.other.DebitTradeAmt.toFixed(2));
-            $("#CreditPrizeAmt").text(res.other.CreditPrizeAmt.toFixed(2));
-            $("#DebitPrizeAmt").text(res.other.DebitPrizeAmt.toFixed(2));
+            $("#CreditTradeAmt").text(res.other.CreditTradeAmt);
+            $("#DebitTradeAmt").text(res.other.DebitTradeAmt);
+            $("#CreditPrizeAmt").text(res.other.CreditPrizeAmt);
+            $("#DebitPrizeAmt").text(res.other.DebitPrizeAmt);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/OpenRewardDetail_Admin.js

@@ -155,10 +155,10 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#CreditTradeAmt").text(res.other.CreditTradeAmt.toFixed(2));
-            $("#DebitTradeAmt").text(res.other.DebitTradeAmt.toFixed(2));
-            $("#CreditPrizeAmt").text(res.other.CreditPrizeAmt.toFixed(2));
-            $("#DebitPrizeAmt").text(res.other.DebitPrizeAmt.toFixed(2));
+            $("#CreditTradeAmt").text(res.other.CreditTradeAmt);
+            $("#DebitTradeAmt").text(res.other.DebitTradeAmt);
+            $("#CreditRewardAmount").text(res.other.CreditRewardAmount);
+            $("#DebitRewardAmount").text(res.other.DebitRewardAmount);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/OpenSnSnapshot_Admin.js

@@ -149,9 +149,9 @@ $('#TradeDate').val(value);
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#PrizeAmt").text(res.other.PrizeAmt.toFixed(2));
-            $("#BuyPosCount").text(res.other.BuyPosCount.toFixed(2));
-            $("#StadardBuyPosCount").text(res.other.StadardBuyPosCount.toFixed(2));
+            $("#PrizeAmt").text(res.other.PrizeAmt);
+            $("#BuyPosCount").text(res.other.BuyPosCount);
+            $("#StadardBuyPosCount").text(res.other.StadardBuyPosCount);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -120,6 +120,7 @@ layui.config({
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             ,{field:'OrderNo', width: 200, title:'平台订单号-渠道订单号', sort: true}
+            ,{field:'ProductName', width: 200, title:'商品名称', sort: true}
             ,{field:'Store', width: 200, title:'发货仓库信息', sort: true}
             ,{field:'StoreContact', width: 200, title:'仓库联系人信息', sort: true}
             ,{field:'StoreFrom', width: 200, title:'仓库归属信息', sort: true}
@@ -147,8 +148,8 @@ layui.config({
         , height: 'full-220'
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#SuccessAmount").text(res.other.SuccessAmount.toFixed(2));
-            $("#FailAmount").text(res.other.FailAmount.toFixed(2));
+            $("#SuccessAmount").text(res.other.SuccessAmount);
+            $("#FailAmount").text(res.other.FailAmount);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/ProfitReceiveRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'datetime',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'datetime',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/ProfitReceiveRecord/Sort?r=" + Math.random(1),
@@ -84,39 +84,43 @@ $('#CreateDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/ProfitReceiveRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'SubMchid', width: 200, title:'子商户号', sort: true}
-,{field:'AppId', width: 200, title:'应用ID', sort: true}
-,{field:'SubAppId', width: 200, title:'子商户应用ID', sort: true}
-,{field:'Type', width: 200, title:'分账接收方类型', sort: true}
-,{field:'Account', width: 200, title:'分账接收方账号', sort: true}
-,{field:'RelationType', width: 200, title:'与分账方的关系类型', sort: true}
-,{field:'TransactionId', width: 200, title:'微信订单号', sort: true}
-,{field:'OutOrderNo', width: 200, title:'商户分账单号', sort: true}
-,{field:'Amount', width: 200, title:'分账金额', sort: true}
-,{field:'UnfreezeUnsplitName', width: 200, title:'是否解冻剩余未分资金', sort: true}
-,{field:'OrderId', width: 200, title:'微信分账单号', sort: true}
-,{field:'State', width: 200, title:'分账单状态', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'SubMchid', width: 200, title: '子商户号', sort: true }
+            , { field: 'AppId', width: 200, title: '应用ID', sort: true }
+            , { field: 'SubAppId', width: 200, title: '子商户应用ID', sort: true }
+            , { field: 'Type', width: 200, title: '分账接收方类型', sort: true }
+            , { field: 'Account', width: 200, title: '分账接收方账号', sort: true }
+            , { field: 'RelationType', width: 200, title: '与分账方的关系类型', sort: true }
+            , { field: 'TransactionId', width: 200, title: '微信订单号', sort: true }
+            , { field: 'OutOrderNo', width: 200, title: '商户分账单号', sort: true }
+            , { field: 'Amount', width: 200, title: '分账金额', sort: true }
+            , { field: 'UnfreezeUnsplitName', width: 200, title: '是否解冻剩余未分资金', sort: true }
+            , { field: 'OrderId', width: 200, title: '微信分账单号', sort: true }
+            , { field: 'State', width: 200, title: '分账单状态', sort: true }
+
+            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
         , height: 'full-220'
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
+            $("#MerchantTradeAmount").text(res.other.MerchantTradeAmount);
+            $("#CreditTradeAmount").text(res.other.CreditTradeAmount);
+            $("#MerchantProfitAmount").text(res.other.MerchantProfitAmount);
+            $("#CreditProfitAmount").text(res.other.CreditProfitAmount);
             $(".layui-none").text("无数据");
         }
     });
@@ -132,7 +136,7 @@ $('#CreateDate').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -155,20 +159,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -179,7 +183,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ProfitReceiveRecord/Edit?r=" + Math.random(1),
@@ -266,20 +270,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -290,7 +294,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ProfitReceiveRecord/Add?r=" + Math.random(1),
@@ -347,9 +351,9 @@ $('#CreateDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -376,9 +380,9 @@ $('#CreateDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_main/ProfitRewardRecord_Admin.js

@@ -183,10 +183,10 @@ layui.config({
         height: 'full-' + String($('.layui-card-header').height() + 130),
         text: '对不起，加载出现异常！',
         done: function (res, curr, count) {
-            $("#MerchantTradeAmount").text(res.other.MerchantTradeAmount.toFixed(2));
-            $("#CreditTradeAmount").text(res.other.CreditTradeAmount.toFixed(2));
-            $("#MerchantProfitAmount").text(res.other.MerchantProfitAmount.toFixed(2));
-            $("#CreditProfitAmount").text(res.other.CreditProfitAmount.toFixed(2));
+            $("#MerchantTradeAmount").text(res.other.MerchantTradeAmount);
+            $("#CreditTradeAmount").text(res.other.CreditTradeAmount);
+            $("#MerchantProfitAmount").text(res.other.MerchantProfitAmount);
+            $("#CreditProfitAmount").text(res.other.CreditProfitAmount);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/ProfitSubsidyDetail_Admin.js

@@ -95,8 +95,8 @@ layui.config({
         , url: '/Admin/ProfitSubsidyDetail/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            ,{field:'MakerCode', width: 200, title:'补贴创客姓名', sort: true}
-            ,{field:'RealName', width: 200, title:'补贴创客编码', sort: true}
+            ,{field:'RealName', width: 200, title:'补贴创客姓名', sort: true}
+            ,{field:'MakerCode', width: 200, title:'补贴创客编码', sort: true}
             ,{field:'TradeMonth', width: 200, title:'交易月份', sort: true}
             ,{field:'BrandId', width: 200, title:'产品类型', sort: true}
             ,{field:'MerchantNo', width: 200, title:'商户编号', sort: true}
@@ -121,7 +121,7 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {            
-            $("#SubsidyProfit").text(res.other.SubsidyProfit.toFixed(2));
+            $("#SubsidyProfit").text(res.other.SubsidyProfit);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -0,0 +1,599 @@
+var ExcelData;
+
+function ConfirmImport() {
+    $.ajax({
+        type: "POST",
+        url: "/Admin/StoreMachineApply/Import?r=" + Math.random(1),
+        data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
+        dataType: "text",
+        success: function (data) {
+            if (data == "success") {
+                layer.msg("导入成功", {
+                    time: 2000
+                }, function () {
+                    window.location.reload();
+                });
+            } else {
+                layer.msg(data);
+            }
+        }
+    });
+}
+
+var excel;
+layui.config({
+    base: '/layuiadmin/' //静态资源所在路径
+}).extend({
+    myexcel: 'layui/lay/modules/excel',
+    index: 'lib/index' //主入口模块
+}).use(['index', 'table', 'excel', 'laydate'], function () {
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+
+    //- 筛选条件-日期
+    var laydate = layui.laydate;
+    var layCreateDate = laydate.render({
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
+    var layApplyTime = laydate.render({
+        elem: '#ApplyTime',
+        trigger: 'click',
+        type: 'date',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layApplyTime.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layApplyTime.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#ApplyTime').val(value);
+            }
+        }
+    });
+    var laySendDate = laydate.render({
+        elem: '#SendDate',
+        trigger: 'click',
+        type: 'date',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    laySendDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                laySendDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#SendDate').val(value);
+            }
+        }
+    });
+
+
+    //excel导入
+    excel = layui.excel;
+    $('#ExcelFile').change(function (e) {
+        var files = e.target.files;
+        excel.importExcel(files, {}, function (data) {
+            ExcelData = data[0].sheet1;
+        });
+    });
+
+    //监听单元格编辑
+    table.on('edit(LAY-list-manage)', function (obj) {
+        var value = obj.value //得到修改后的值
+            ,
+            data = obj.data //得到所在行所有键值
+            ,
+            field = obj.field; //得到字段
+        if (field == "Sort") {
+            $.ajax({
+                type: "POST",
+                url: "/Admin/StoreMachineApply/Sort?r=" + Math.random(1),
+                data: "Id=" + data.Id + "&Sort=" + value,
+                dataType: "text",
+                success: function (data) {}
+            });
+        }
+    });
+
+    //列表数据
+    table.render({
+        elem: '#LAY-list-manage',
+        url: '/Admin/StoreMachineApply/IndexData' //模拟接口
+            ,
+        cols: [[
+            {type: 'checkbox',fixed: 'left'}, 
+            {field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true },
+            {field: 'ApplyNo',width: 200,title: '申请单号',sort: true}, 
+            {field: 'BrandId', width: 200,title: '产品名称',sort: true}, 
+            {field: 'UserInfo',width: 200,title: '创客信息',sort: true},
+            {field: 'StoreInfo',width: 200,title: '申请仓库信息',sort: true},
+            {field: 'StoreAddressInfo',width: 300,title: '仓库收货地址',sort: true}, 
+            // {field: 'StoreContact',width: 200,title: '仓库联系人信息',sort: true}, 
+            // {field: 'StoreUser',width: 200,title: '仓库归属信息',sort: true}, 
+            {field: 'Status',width: 200,title: '申请状态',sort: true}, 
+            {field: 'ApplyTime',width: 200,title: '申请时间',sort: true}, 
+            {title: '操作', width: 260,align: 'center',fixed: 'right',toolbar: '#table-list-tools'}
+        ]],
+        where: {
+
+        },
+        page: true,
+        limit: 30,
+        height: 'full-' + String($('.layui-card-header').height() + 130),
+        text: '对不起，加载出现异常！',
+        done: function (res, curr, count) {
+            $("#ApplyCount").text(res.other.ApplyCount);
+            $("#SendCount").text(res.other.SendCount);
+            $(".layui-none").text("无数据");
+        }
+    });
+
+    //监听工具条
+    table.on('tool(LAY-list-manage)', function (obj) {
+        var data = obj.data;
+        if (obj.event === 'del') {
+            var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreMachineApply/Delete?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        if (data == "success") {
+                            obj.del();
+                            layer.close(index);
+                        } else {
+                            parent.layer.msg(data);
+                        }
+                    }
+                });
+            });
+        } else if (obj.event === 'cancel') {
+            var index = layer.confirm('确定要取消订单吗？取消后不能恢复！', function (index) {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreMachineApply/Cancel?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        if (data == "success") {
+                            obj.del();
+                            layer.close(index);
+                            parent.layer.msg('已取消');
+                        } else {
+                            parent.layer.msg(data);
+                        }
+                    }
+                });
+            });
+        } else if (obj.event === 'detail') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2,
+                title: '订单详情',
+                content: 'Edit?Id=' + data.Id + '',
+                maxmin: true,
+                area: ['500px', '450px'],
+                btn: ['返回'],
+                yes: function (index, layero) {
+                    layer.close(perContent);
+                },
+                success: function (layero, index) {
+
+                }
+            });
+            layer.full(perContent);
+        } else if (obj.event === 'send') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2,
+                title: '审核发货',
+                content: 'AuditSend?Id=' + data.Id + '',
+                maxmin: true,
+                area: ['450px', '680px'],
+                btn: ['确定发货', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreMachineApply/AuditSend?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "success") {
+                                    layer.close(index); //关闭弹层
+                                    layer.msg('发货成功', {
+                                        time: 1500
+                                    }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
+                                } else {
+                                    layer.close(index); //关闭弹层
+                                    layer.msg('审核完成', {
+                                        time: 1500
+                                    }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                },
+                success: function (layero, index) {
+
+                }
+            });
+        }else if (obj.event === 'edit') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2,
+                title: '机具申请记录-编辑',
+                content: 'Edit?Id=' + data.Id + '',
+                maxmin: true,
+                area: ['800px', '650px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreMachineApply/Edit?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "success") {
+                                    layer.close(index); //关闭弹层
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                },
+                success: function (layero, index) {
+
+                }
+            });
+        }
+    });
+
+
+    //监听搜索
+    form.on('submit(LAY-list-front-search)', function (data) {
+        var field = data.field;
+
+        //执行重载
+        table.reload('LAY-list-manage', {
+            where: field
+        });
+    });
+    form.on('submit(LAY-list-front-searchall)', function (data) {
+        table.reload('LAY-list-manage', {
+            where: null
+        });
+    });
+
+    //事件
+    var active = {
+        batchdel: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage'),
+                data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要删除的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreMachineApply/Delete?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        },
+        add: function () {
+            var perContent = layer.open({
+                type: 2,
+                title: '仓库机具申请记录-添加',
+                content: 'Add',
+                maxmin: true,
+                area: ['500px', '450px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreMachineApply/Add?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+            layer.full(perContent);
+        },
+        ImportChange: function () {
+            var perContent = layer.open({
+                type: 2,
+                title: '添加机具SN',
+                content: 'Import?ExcelKind=2',
+                maxmin: true,
+                area: ['650px', '350px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.SwapSnExpand; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+                        var loadindex = layer.load(1, {
+                            shade: [0.5, '#000']
+                        });
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreMachineApply/ImportPost?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data.indexOf("success") == 0) {
+                                    var datalist = data.split('|');
+                                    var key = datalist[1];
+                                    CheckImport(table, key, loadindex, index);
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+        },
+        ImportData: function () {
+            layer.open({
+                type: 1,
+                title: '导入',
+                maxmin: false,
+                area: ['460px', '180px'],
+                content: $('#excelForm'),
+                cancel: function () {}
+            });
+        },
+        ExportExcel: function () {
+            var userdata = '';
+            $(".layuiadmin-card-header-auto input").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $(".layuiadmin-card-header-auto select").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $.ajax({
+                type: "GET",
+                url: "/Admin/StoreMachineApply/ExportExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        },
+        Open: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage'),
+                data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要开启的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要开启吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreMachineApply/Open?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        },
+        Close: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage'),
+                data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要关闭的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要关闭吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreMachineApply/Close?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+    };
+
+    $('.layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+});

wwwroot/layuiadmin/modules_main/StoreMallOrderSummary_Admin.js

@@ -117,9 +117,9 @@ $('#CreateDate').val(value);
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
             $("#OrderCount").text(res.other.OrderCount);
-            $("#OrderAmt").text(res.other.OrderAmt.toFixed(2));
+            $("#OrderAmt").text(res.other.OrderAmt);
             $("#ReturnOrderCount").text(res.other.ReturnOrderCount);
-            $("#ReturnAmt").text(res.other.ReturnAmt.toFixed(2));
+            $("#ReturnAmt").text(res.other.ReturnAmt);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/SysRechargeRecord_Admin.js

@@ -139,8 +139,8 @@ $('#BizTime').val(value);
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#BizAmount30").text(res.other.BizAmount30.toFixed(2));
-            $("#BizAmount31").text(res.other.BizAmount31.toFixed(2));
+            $("#BizAmount30").text(res.other.BizAmount30);
+            $("#BizAmount31").text(res.other.BizAmount31);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/TradeDaySummary_Admin.js

@@ -146,10 +146,10 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#HelpDirectTradeAmt").text(res.other.HelpDirectTradeAmt.toFixed(2));
-            $("#HelpNonDirectTradeAmt").text(res.other.HelpNonDirectTradeAmt.toFixed(2));
-            $("#NotHelpDirectTradeAmt").text(res.other.NotHelpDirectTradeAmt.toFixed(2));
-            $("#NotHelpNonDirectTradeAmt").text(res.other.NotHelpNonDirectTradeAmt.toFixed(2));
+            $("#HelpDirectTradeAmt").text(res.other.HelpDirectTradeAmt);
+            $("#HelpNonDirectTradeAmt").text(res.other.HelpNonDirectTradeAmt);
+            $("#NotHelpDirectTradeAmt").text(res.other.NotHelpDirectTradeAmt);
+            $("#NotHelpNonDirectTradeAmt").text(res.other.NotHelpNonDirectTradeAmt);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/TradeRecord_Admin.js

@@ -149,8 +149,8 @@ $('#TradeDate').val(value);
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#TotalTrade0").text(res.other.TotalTrade0.toFixed(2));
-            $("#TotalTrade1").text(res.other.TotalTrade1.toFixed(2));
+            $("#TotalTrade0").text(res.other.TotalTrade0);
+            $("#TotalTrade1").text(res.other.TotalTrade1);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UserAccountRecord_Admin.js

@@ -116,17 +116,17 @@ $('#CreateDate').val(value);
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#ChangeTypeAmount0").text(res.other.ChangeTypeAmount0.toFixed(2));
-            $("#ChangeTypeAmount1").text(res.other.ChangeTypeAmount1.toFixed(2));
-            $("#ChangeTypeAmount2").text(res.other.ChangeTypeAmount2.toFixed(2));
-            $("#ChangeTypeAmount6").text(res.other.ChangeTypeAmount6.toFixed(2));
-            $("#ChangeTypeAmount61").text(res.other.ChangeTypeAmount61.toFixed(2));
-            $("#ChangeTypeAmount62").text(res.other.ChangeTypeAmount62.toFixed(2));
-            $("#ChangeTypeAmount63").text(res.other.ChangeTypeAmount63.toFixed(2));
-            $("#ChangeTypeAmount64").text(res.other.ChangeTypeAmount64.toFixed(2));
-            $("#ChangeTypeAmount50").text(res.other.ChangeTypeAmount50.toFixed(2));
-            $("#ChangeTypeAmount111").text(res.other.ChangeTypeAmount111.toFixed(2));
-            $("#ChangeTypeAmount112").text(res.other.ChangeTypeAmount112.toFixed(2));
+            $("#ChangeTypeAmount0").text(res.other.ChangeTypeAmount0);
+            $("#ChangeTypeAmount1").text(res.other.ChangeTypeAmount1);
+            $("#ChangeTypeAmount2").text(res.other.ChangeTypeAmount2);
+            $("#ChangeTypeAmount6").text(res.other.ChangeTypeAmount6);
+            $("#ChangeTypeAmount61").text(res.other.ChangeTypeAmount61);
+            $("#ChangeTypeAmount62").text(res.other.ChangeTypeAmount62);
+            $("#ChangeTypeAmount63").text(res.other.ChangeTypeAmount63);
+            $("#ChangeTypeAmount64").text(res.other.ChangeTypeAmount64);
+            $("#ChangeTypeAmount50").text(res.other.ChangeTypeAmount50);
+            $("#ChangeTypeAmount111").text(res.other.ChangeTypeAmount111);
+            $("#ChangeTypeAmount112").text(res.other.ChangeTypeAmount112);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -125,9 +125,9 @@ layui.config({
         height: 'full-' + String($('.layui-card-header').height() + 130),
         text: '对不起，加载出现异常！',
         done: function (res, curr, count) {
-            $("#TotalAmount").text(res.other.TotalAmount.toFixed(2));
-            $("#FreezeAmount").text(res.other.FreezeAmount.toFixed(2));
-            $("#BalanceAmount").text(res.other.BalanceAmount.toFixed(2));
+            $("#TotalAmount").text(res.other.TotalAmount);
+            $("#FreezeAmount").text(res.other.FreezeAmount);
+            $("#BalanceAmount").text(res.other.BalanceAmount);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UserCashRecord_Admin.js

@@ -202,6 +202,7 @@ layui.config({
         height: 'full-' + String($('.layui-card-header').height() + 130),
         text: '对不起，加载出现异常！',
         done: function (res, curr, count) {
+            $("#WaitAmount").text(res.other.WaitAmount);
             $("#SuccessAmount").text(res.other.SuccessAmount);
             $("#FailAmount").text(res.other.FailAmount);
             $(".layui-none").text("无数据");

wwwroot/layuiadmin/modules_main/UserProfitSubsidySummary_Admin.js

@@ -113,7 +113,7 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#SubsidyTotalProfit").text(res.other.SubsidyTotalProfit.toFixed(2));
+            $("#SubsidyTotalProfit").text(res.other.SubsidyTotalProfit);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UserTradeDaySummary_Admin.js

@@ -116,8 +116,8 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#DirectTradeAmt").text(res.other.DirectTradeAmt.toFixed(2));
-            $("#DirectDebitTradeAmt").text(res.other.DirectDebitTradeAmt.toFixed(2));
+            $("#DirectTradeAmt").text(res.other.DirectTradeAmt);
+            $("#DirectDebitTradeAmt").text(res.other.DirectDebitTradeAmt);
             $("#DirectDebitCapNum").text(res.other.DirectDebitCapNum);
             $(".layui-none").text("无数据");
         }