合并刘洋的分支

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -166,17 +166,17 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ExpressInfo"] = dic["ExpressName"].ToString() + "<br />" + dic["ExpressNo"].ToString();
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string ApplyCount = "0.00";//申请机具数
-            string SendCount = "0.00";//发货机具数
+            int ApplyCount = 0;//申请机具数
+            int SendCount = 0;//发货机具数
             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");
+                ApplyCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
             }
             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");
+                SendCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
             }
             other.Add("ApplyCount", ApplyCount);
             other.Add("SendCount", SendCount);

Areas/Admin/Controllers/MainServer/OpenRewardDetailController.cs

@@ -89,7 +89,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = TradeDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
                 string end = datelist[1];
-                condition += " and TradeDate>='" + start + " 00:00:00' and TradeDate>='" + end + " 23:59:59'";
+                condition += " and TradeDate>='" + start + " 00:00:00' and TradeDate<='" + end + " 23:59:59'";
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("OpenRewardDetail", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -55,7 +55,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客订单列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Orders data, 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)
+        public JsonResult IndexData(Orders data, string OrderNo, string TradeNo, string RealName, string Mobile, string StoreContact, string ErpCode, string SnNos, string CreateDateData, string SendDateData, 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)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -73,7 +73,28 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //平台订单号
+            if (!string.IsNullOrEmpty(OrderNo))
+            {
+                condition += " and OrderNo=" + OrderNo;
+            }
+            //渠道订单号
+            if (!string.IsNullOrEmpty(TradeNo))
+            {
+                condition += " and TradeNo=" + TradeNo;
+            }
+            //收件人姓名
+            if (!string.IsNullOrEmpty(RealName))
+            {
+                condition += " and RealName=" + RealName;
+            }
+            //收件人电话
+            if (!string.IsNullOrEmpty(Mobile))
+            {
+                condition += " and Mobile=" + Mobile;
+            }
+
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -88,16 +109,53 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 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(OrderNo))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+
+            //仓库归属创客创客编号
+            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(ErpCode))
+            {
+                condition += " and ErpCode=" + ErpCode;
+            }
+            //SN
+            if (!string.IsNullOrEmpty(SnNos))
+            {
+                condition += " and SnNos=" + SnNos;
+            }
+            //下单时间
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                condition += " and CreateDateData=" + CreateDateData;
+            }
+            //发货时间
+            if (!string.IsNullOrEmpty(SendDateData))
+            {
+                condition += " and SendDateData=" + SendDateData;
+            }
+
             //退款状态
             if (!string.IsNullOrEmpty(RefundStatusSelect))
             {
@@ -113,7 +171,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SendStatus=" + SendStatusSelect;
             }
-            //商品名称
+            //商品类型名称
             if (!string.IsNullOrEmpty(ProductIdSelect))
             {
                 condition += " and Id in (select OrderId from OrderProduct where ProductId="+ProductIdSelect+")";//表数据量过大时不适用
@@ -123,16 +181,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 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))
             {
@@ -195,7 +243,7 @@ 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();
@@ -223,12 +271,12 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> other = new Dictionary<string, object>();
             string SuccessAmount = "0.00";//支付成功总金额
             string FailAmount = "0.00";//支付失败总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=0" + condition);
+            DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + 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);
+            dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=2" + condition);
             if (dt.Rows.Count > 0)
             {
                 FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");

Areas/Admin/Controllers/MainServer/PosCouponOrdersController.cs

@@ -64,22 +64,22 @@ namespace MySystem.Areas.Admin.Controllers
             //来源创客创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
-                condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
+                condition += " and FromUserId in (select UserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
             }
             //来源创客真实姓名
             if (!string.IsNullOrEmpty(FromUserIdRealName))
             {
-                condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
+                condition += " and FromUserId in (select UserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
             //目标创客创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
-                condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
+                condition += " and ToUserId in (select UserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
             }
             //目标创客真实姓名
             if (!string.IsNullOrEmpty(ToUserIdRealName))
             {
-                condition += " and ToUserId in (select ToUserId from UserForRealName where RealName='" + ToUserIdRealName + "')";
+                condition += " and ToUserId in (select UserId from UserForRealName where RealName='" + ToUserIdRealName + "')";
             }
             //变更类型
             if (!string.IsNullOrEmpty(ChangeKindSelect))

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string BrandId, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -71,7 +71,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and BuyUserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -91,7 +91,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdName + "')";
             }
-
+            //品牌
+            if (!string.IsNullOrEmpty(BrandId))
+            {
+                condition += " and BrandId =" + BrandId;
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesTwo", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -139,22 +143,22 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string TotalCount = "0.00";//总机具数
+            int TotalCount = 0;//总机具数
             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);
+            DataTable dt = OtherMySqlConn.dtable("select count(0) from PosMachinesTwo where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
-                TotalCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+                TotalCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
             }
             // 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("TotalCount", TotalCount);
             other.Add("KysCount99", 0);
             other.Add("KssCount99", 0);
             other.Add("KssCoun198", 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);
         }
@@ -480,15 +507,10 @@ namespace MySystem.Areas.Admin.Controllers
         public string SycnData(int BrandId, int OpType = 0)
         {
             string date = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
-            string filename = date + ".txt";
-            if(OpType == 1)
-            {
-                filename = date + "do.txt";
-            }
-            string check = function.ReadInstance("/Balance/" + BrandId + "/" + filename);
+            string check = function.ReadInstance("/Balance/" + BrandId + "/" + date + ".txt");
             if (string.IsNullOrEmpty(check))
             {
-                function.WritePage("/Balance/" + BrandId + "/", filename, DateTime.Now.ToString());
+                function.WritePage("/Balance/" + BrandId + "/", date + ".txt", DateTime.Now.ToString());
                 // DoTradeProfit(BrandId, date, OpType);
                 // DoSubsidyProfit(BrandId, date, OpType);
                 RedisDbconn.Instance.AddList("SycnProfitQueue", BrandId + "#cut#" + date + "#cut#" + OpType + "#cut#" + SysUserName);
@@ -500,15 +522,10 @@ namespace MySystem.Areas.Admin.Controllers
         public string SycnDataByCondi(int BrandId, string MakerCode, int OpType = 0)
         {
             string date = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
-            string filename = date + ".txt";
-            if(OpType == 1)
-            {
-                filename = date + "do.txt";
-            }
-            string check = function.ReadInstance("/Balance/" + BrandId + "/" + MakerCode + "/" + filename);
+            string check = function.ReadInstance("/Balance/" + BrandId + "/" + MakerCode + "/" + date + ".txt");
             if (string.IsNullOrEmpty(check))
             {
-                function.WritePage("/Balance/" + BrandId + "/" + MakerCode + "/", filename, DateTime.Now.ToString());
+                function.WritePage("/Balance/" + BrandId + "/" + MakerCode + "/", date + ".txt", DateTime.Now.ToString());
                 UserForMakerCode forMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
                 DoTradeProfitByCondi(forMakerCode.UserId, BrandId, date, OpType);
                 DoSubsidyProfitByCondi(forMakerCode.UserId, BrandId, date, OpType);

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;
@@ -53,7 +54,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分润补贴明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ProfitSubsidyDetail data, string MerchantNo, string MerchantName, string MakerCode, string RealName, string TradeMonthSelect, string SubsidyTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ProfitSubsidyDetail data, string MerchantNo, string MerchantName, string MakerCode, string RealName, string TradeMonthSelect, string BrandIdSelect, string SubsidyTypeSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -93,6 +94,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }
+            //产品类型
+            if(!string.IsNullOrEmpty(BrandIdSelect))
+            {
+                condition += " and BrandId=" + BrandIdSelect;
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitSubsidyDetail", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -112,7 +118,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/SysRechargeRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(SysRechargeRecord data, string MakerCode, string RealName, string StatusSelect, string SyncStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(SysRechargeRecord data, string MakerCode, string RealName, string StatusSelect, string SyncStatusSelect, int BizType, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -71,6 +71,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
+            //业务类型
+            if (!string.IsNullOrEmpty(BizType.ToString()))
+            {
+                condition += " and BizType=" + BizType;
+            }
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {

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;
@@ -51,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 交易日汇总列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(TradeDaySummary data, string MakerCode, string RealName, string TradeMonthSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(TradeDaySummary data, string MakerCode, string RealName, string TradeMonthSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -71,6 +72,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
+            //交易时间
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0].Replace("-", "");
+                string end = datelist[1].Replace("-", "");
+                condition += " and TradeDate >= '" + start + "' and TradeDate <= '" + end + "' ";
+            }
             //交易月份
             if(!string.IsNullOrEmpty(TradeMonthSelect))
             {
@@ -93,10 +102,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  where 1=1" + 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  where 1=1" + 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  where 1=1" + 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  where 1=1" + 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;
@@ -51,10 +52,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 交易记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(TradeRecord data, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string BankCardTypeSelect, string MerBuddyTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(TradeRecord data, string right, string BrandId, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string MerNo, string SnNo, string BankCardTypeSelect, string MerBuddyTypeSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+            ViewBag.BrandId = BrandId;
 
             Fields.Add("BrandId", "1");
             Fields.Add("MerNo", "2"); //快钱商户编号
@@ -63,6 +67,11 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("TopUserId", "0"); //顶级创客
 
             string condition = " and Status>-1";
+
+            if(!string.IsNullOrEmpty(ViewBag.BrandId))
+            {
+                condition += " and BrandId=" + ViewBag.BrandId;
+            }
             //商户编号
             if (!string.IsNullOrEmpty(MerchantNo))
             {
@@ -82,6 +91,7 @@ namespace MySystem.Areas.Admin.Controllers
             if (!string.IsNullOrEmpty(RealName))
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
+                // condition += " and UserId in (select Id from Users where RealName='" + RealName + "')";
             }
             //商户创客编号
             if (!string.IsNullOrEmpty(MerMakerCode))
@@ -93,6 +103,16 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and MerUserId in (select UserId from UserForRealName where RealName='" + MerRealName + "')";
             }
+            //快钱商户编号
+            if (!string.IsNullOrEmpty(MerNo))
+            {
+                condition += " and MerNo='" + MerNo + "'";
+            }
+            //块钱SN号
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                condition += " and SnNo='" + SnNo + "'";
+            }
             //银行卡类型
             if(!string.IsNullOrEmpty(BankCardTypeSelect))
             {
@@ -103,6 +123,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and MerBuddyType=" + MerBuddyTypeSelect;
             }
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("TradeRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -138,12 +165,26 @@ namespace MySystem.Areas.Admin.Controllers
                 if(MerBuddyType == 1) dic["MerBuddyType"] = "商户型创客";
                 //银行卡类型
                 int BankCardType = int.Parse(dic["BankCardType"].ToString());
-                if(BankCardType == 0) dic["BankCardType"] = "贷记卡";
-                if(BankCardType == 1) dic["BankCardType"] = "借记卡";
+                if(BankCardType == 0) dic["BankCardType"] = "借记卡";
+                if(BankCardType == 1) dic["BankCardType"] = "贷记卡";
+                if(BankCardType == 2) 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=1" + 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=0" + 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/UserAccountController.cs

@@ -112,7 +112,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
                 string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate>='" + end + " 23:59:59'";
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
             if(sTotalAmount != null)
             {

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -86,6 +86,25 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId=" + UserId;
             }
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
+            if (data.ChangeType > 0)
+            { 
+                condition += " and ChangeType=" + data.ChangeType;
+            }
+            if (data.ProductType > 0)
+            { 
+                condition += " and ProductType=" + data.ProductType;
+            }
+            if (!string.IsNullOrEmpty(data.TransRecordNo))
+            { 
+                condition += " and TransRecordNo='" + data.TransRecordNo + "'";
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserAccountRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -108,25 +127,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ChangeTypeName"] = RelationClassForConst.GetChangeTypeInfo(ChangeType);
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            if(!string.IsNullOrEmpty(CreateDateData))
-            {
-                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate>='" + end + " 23:59:59'";
-            }
-            if (data.ChangeType > 0)
-            { 
-                condition += " and ChangeType=" + data.ChangeType;
-            }
-            if (data.ProductType > 0)
-            { 
-                condition += " and ProductType=" + data.ProductType;
-            }
-            if (!string.IsNullOrEmpty(data.TransRecordNo))
-            { 
-                condition += " and TransRecordNo='" + data.TransRecordNo + "'";
-            }
+            
             string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00";
             DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
             if(dt.Rows.Count > 0)

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -62,7 +62,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 提现记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string QueryCountSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -80,20 +80,36 @@ namespace MySystem.Areas.Admin.Controllers
             if (!string.IsNullOrEmpty(RealName))
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
+                // condition += " and UserId in (select Id from Users where RealName='" + RealName + "')";
             }
             //提现状态
-            if (!string.IsNullOrEmpty(StatusSelect))
+            if(!string.IsNullOrEmpty(StatusSelect))
             {
                 condition += " and Status=" + StatusSelect;
             }
-            if (data.QueryCount > 0)
+
+            if(!string.IsNullOrEmpty(data.CashOrderNo))
             {
-                int QueryCount = data.QueryCount;
-                if (QueryCount == 2)
-                {
-                    QueryCount = 0;
-                }
-                condition += " and QueryCount=" + QueryCount;
+                condition += " and CashOrderNo='" + data.CashOrderNo + "'";
+            }
+            if (data.TradeType > 0)
+            { 
+                condition += " and TradeType=" + data.TradeType;
+            }
+            if (!string.IsNullOrEmpty(QueryCountSelect))
+            { 
+                condition += " and QueryCount=" + QueryCountSelect;
+            }
+            if (data.Status > -1)
+            { 
+                condition += " and Status=" + data.Status;
+            }
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", page, limit, condition);
@@ -106,34 +122,25 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["RealName"] = user.RealName;
                 dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
                 int Status = int.Parse(dic["Status"].ToString());
-                if (Status == 0) dic["StatusName"] = "处理中";
-                if (Status == 1) dic["StatusName"] = "成功";
-                if (Status == 2) dic["StatusName"] = "失败";
+                if(Status == 0) dic["StatusName"] = "处理中";
+                if(Status == 1) dic["StatusName"] = "成功";
+                if(Status == 2) dic["StatusName"] = "失败";
 
                 int QueryCount = int.Parse(dic["QueryCount"].ToString());
-                if (QueryCount == 0) dic["LockName"] = "待提交";
-                if (QueryCount == 1) dic["LockName"] = "已提交";
+                if(QueryCount == 0) dic["LockName"] = "待提交";
+                if(QueryCount == 1) dic["LockName"] = "已提交";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            if (!string.IsNullOrEmpty(data.CashOrderNo))
-            {
-                condition += " and CashOrderNo='" + data.CashOrderNo + "'";
-            }
-            if (data.TradeType > 0)
-            {
-                condition += " and TradeType=" + data.TradeType;
-            }
-            if (!string.IsNullOrEmpty(CreateDateData))
+            
+            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)
             {
-                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate>='" + end + " 23:59:59'";
+                WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
             }
-            string SuccessAmount = "0.00";
-            string FailAmount = "0.00";
-            string WaitAmount = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
+            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");
@@ -143,14 +150,9 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
             }
-            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");
-            }
+            other.Add("WaitAmount", WaitAmount);
             other.Add("SuccessAmount", SuccessAmount);
             other.Add("FailAmount", FailAmount);
-            other.Add("WaitAmount", WaitAmount);
             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;
@@ -51,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客交易日汇总列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserTradeDaySummary data, string MakerCode, string RealName, string TradeMonthSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserTradeDaySummary data, string MakerCode, string RealName, string TradeMonthSelect, string TradeDateSelect,string BrandId, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -70,11 +71,21 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
+            // //产品类型
+            if (!string.IsNullOrEmpty(BrandId))
+            {
+                condition += " and BrandId ='" + BrandId +"'";
+            }
             //交易月份
-            if(!string.IsNullOrEmpty(TradeMonthSelect))
+            if (!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }
+            //交易日期
+            if (!string.IsNullOrEmpty(TradeDateSelect))
+            {
+                condition += " and TradeDate=" + TradeDateSelect.Replace("", "");
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserTradeDaySummary", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -87,9 +98,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 +334,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("-", "");
             }

Areas/Admin/Views/MainServer/OpenRewardDetail/Index.cshtml

@@ -124,7 +124,7 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    贷记卡交易总额(元)：<span style="color: #f00;" id="CreditTradeAmt">0.00</span>　|　借记卡交易总额(元)：<span style="color: #f00;" id="DebitTradeAmt">0.00</span>　|　贷记卡交易奖励金额(元)：<span style="color: #f00;" id="CreditPrizeAmt">0.00</span>　|　借记记卡交易奖励金额(元)：<span style="color: #f00;" id="DebitPrizeAmt">0.00</span>
+                    贷记卡交易总额(元)：<span style="color: #f00;" id="CreditTradeAmt">0.00</span>　|　借记卡交易总额(元)：<span style="color: #f00;" id="DebitTradeAmt">0.00</span>　|　贷记卡交易奖励金额(元)：<span style="color: #f00;" id="CreditRewardAmount">0.00</span>　|　借记记卡交易奖励金额(元)：<span style="color: #f00;" id="DebitRewardAmount">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="MerchantNoTpl">

Areas/Admin/Views/MainServer/ProfitSubsidyDetail/Index.cshtml

@@ -98,7 +98,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">产品类型</label>
                         <div class="layui-input-inline">
-                            <select id="ProductType" name="ProductType" lay-search="">
+                            <select id="BrandIdSelect" name="BrandIdSelect" lay-search="">
                                 <option value="">全部...</option>
                                 @foreach(KqProducts Brand in Brands)
                                 {

Areas/Admin/Views/MainServer/StoreHouse/Index.cshtml

@@ -89,7 +89,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">仓库状态</label>
                         <div class="layui-input-inline">
-                            <select id="StoreStatus" name="StoreStatus" lay-search="">
+                            <select id="StoreStatusSelect" name="StoreStatusSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="1">启用</option>
                                 <option value="0">禁用</option>

Areas/Admin/Views/MainServer/StoreMachineApply/Add.cshtml

@@ -0,0 +1,203 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+    
+}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>仓库机具申请记录(增加)</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        
+        <div class="layui-card">
+          <div class="layui-card-body">
+            <div class="layui-tab" lay-filter="mytabbar">
+                <ul class="layui-tab-title">
+                    <li class="layui-this" lay-id="1">基本信息</li>
+                </ul>
+                <div class="layui-tab-content mt20">
+                    <div class="layui-tab-item layui-show">
+
+</div>
+
+                </div>
+            </div>
+            <div class="layui-form-item layui-hide">
+                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
+            </div>
+          </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        
+                    
+        //编辑器
+        KindEditor.ready(function (K) {
+            
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+        
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+        
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+    
+            //日期
+            
+
+            //上传文件
+            
+
+            //穿梭框
+            
+
+            //TreeView，比如权限管理
+            
+
+            //省市区
+            
+        })
+
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/StoreMachineApply/AuditSend copy.cshtml

@@ -0,0 +1,207 @@
+@using MySystem.Models;
+@{
+    StoreMachineApply editData = ViewBag.data as StoreMachineApply;
+}
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+
+}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>审核发货</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        <input type="hidden" name="Id" value="@editData.Id" />
+        <input type="hidden" name="ExcelData" value="ExcelData" />
+
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">创客编号</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" readonly id="MakerCode" name="MakerCode"
+                                        value="@ViewBag.MakerCode" lay-verify="">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">创客名称</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" readonly id="RealName" name="RealName"
+                                        value="@ViewBag.RealName" lay-verify="">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">申请箱数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" readonly id="ApplyNum" name="ApplyNum"
+                                        value="@editData.ApplyNum" maxlength="32" lay-verify="" autocomplete="off"
+                                        placeholder="请输入申请箱数">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">*发货箱数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SendNum" name="SendNum"
+                                        value="@editData.SendNum" maxlength="32" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入发货箱数">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">*审核结果</label>
+                                <div class="layui-input-inline">
+                                    <select id="Status" name="Status" lay-verify="required|" lay-search="">
+                                        <option value="">请选择</option>
+                                        <option value="0">待审核</option>
+                                        <option value="1">审核通过</option>
+                                        <option value="2">审核不通过</option>
+                                    </select>
+                                    <script>
+                                        $("#Status").val("@editData.Status");
+                                    </script>
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">申请描述</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="SeoDescription" name="SeoDescription"
+                                        maxlength="128" lay-verify=""
+                                        placeholder="请输入申请描述">@editData.SeoDescription</textarea>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-form-item"">
+                            <div class=" layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">模板下载</label>
+                                <div class="layui-form-mid layui-word-aux">
+                                    <a href="/users/批量添加机具SN模版.xlsx">点击下载批量添加机具SN模版</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-form-item"">
+                        <label class=" layui-form-label">导入机具SN</label>
+                        <div class=" layui-input-block">
+                            <div class="layui-upload">
+                                <input type="file" id="ExcelFile" name="ExcelFile" value="">
+                                @* <button class="layui-btn" type="button" id="ExcelPathBtn">选择</button> *@
+                                <div class="layui-inline layui-word-aux"></div>
+                            </div>
+                            <div class="mt10" id="ExcelPathFile">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item layui-hide">
+            <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
+        </div>
+    </div>
+    </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+
+
+        //编辑器
+        KindEditor.ready(function (K) {
+
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        var tree;
+        var element;
+        var upload;
+        var excel;
+        var ExcelData;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'excel', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+
+            //excel导入
+            excel = layui.excel;
+            $('#ExcelFile').change(function (e) {
+                var files = e.target.files;
+                excel.importExcel(files, {}, function (data) {
+                    ExcelData = data[0].sheet1;
+                });
+            });
+
+
+            //日期
+
+
+            //上传文件
+            WebUploadJs('ExcelPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', { width: 0, height: 0, quality: 0 }, { max_file_size: 1048576 }, function (filename) {
+                $('#ExcelPathFile').html(filename);
+                $('#ExcelPath').val(filename);
+            });
+
+
+            //穿梭框
+
+
+            //TreeView，比如权限管理
+
+
+            //省市区
+
+        })
+
+    </script>
+</body>
+
+</html>

Areas/Admin/Views/MainServer/StoreMachineApply/Edit.cshtml

@@ -0,0 +1,275 @@
+@using MySystem.Models;
+@{
+    StoreMachineApply editData = ViewBag.data as StoreMachineApply;
+}
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+
+}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>机具申请记录(修改)</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        <input type="hidden" name="Id" value="@editData.Id" />
+
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">申请单号</label>
+                                <div class="layui-input-inline" style="width: 250px;">
+                                    <input class="layui-input" type="text" readonly id="ApplyNo" name="ApplyNo"
+                                        value="@editData.ApplyNo" maxlength="32" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入申请单号">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">产品名称</label>
+                                <div class="layui-input-inline" style="width: 250px;">
+                                    <input class="layui-input" type="text" readonly id="BrandName" name="BrandName"
+                                        value="@ViewBag.BrandName" maxlength="30" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入产品名称">
+                                </div>
+                            </div>
+                             <div class="layui-form-item">
+                                <label class="layui-form-label">申请箱数</label>
+                                <div class="layui-input-inline" style="width: 250px;">
+                                    <input class="layui-input" type="text" readonly id="ApplyNum" name="ApplyNum"
+                                        value="@editData.ApplyNum" maxlength="32" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入申请箱数">
+                                </div>
+                            </div>
+                             <div class="layui-form-item">
+                                <label class="layui-form-label">*发货箱数</label>
+                                <div class="layui-input-inline" style="width: 250px;">
+                                    <input class="layui-input" type="text" id="SendNum" name="SendNum"
+                                        value="@editData.SendNum" maxlength="32" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入发货箱数">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">创客名称</label>
+                                <div class="layui-input-inline" style="width: 250px;">
+                                    <input class="layui-input" type="text" readonly id="RealName"
+                                        name="RealName" value="@ViewBag.RealName" maxlength="20"
+                                        lay-verify="" autocomplete="off" placeholder="请输入创客名称">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">申请状态</label>
+                                <div class="layui-input-inline" style="width: 250px;">
+                                    <select id="Status" name="Status" lay-search="" lay-verify="required|">
+                                        <option value="">请选择</option>
+                                        <option value="0">待审核</option>
+                                        <option value="1">审核成功</option>
+                                        <option value="2">审核失败</option>
+                                    </select>
+                                    <script>
+                                        $("#Status").val("@editData.Status");
+                                    </script>
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">已发货机具SN</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="SwapSnExpand" name="SwapSnExpand"
+                                        lay-verify="" placeholder="请输入已发货机具SN">@editData.SwapSnExpand</textarea>
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">申请描述</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="SeoDescription" name="SeoDescription" maxlength="128"
+                                        lay-verify="" placeholder="请输入申请描述">@editData.SeoDescription</textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+
+
+        //编辑器
+        KindEditor.ready(function (K) {
+
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+
+            //日期
+
+
+            //上传文件
+
+
+            //穿梭框
+
+
+            //TreeView，比如权限管理
+
+
+            //省市区
+
+        })
+
+    </script>
+</body>
+
+</html>

Areas/Admin/Views/MainServer/StoreMachineApply/Import.cshtml

@@ -0,0 +1,141 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+    string ExcelKind = ViewBag.ExcelKind as string;
+    
+}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>导入数据</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+    <style>
+        .layui-form-label{
+            width: 135px !important;
+        }
+        .layui-form-item .layui-input-block{
+            margin-left: 165px !important;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        <input type="hidden" name="Kind" value="@ExcelKind" />
+        
+        <div class="layui-card">
+          <div class="layui-card-body">
+            <div class="layui-tab" lay-filter="mytabbar">
+                <div class="layui-tab-content mt20">
+                    <div class="layui-tab-item layui-show">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">模板下载</label>
+                            <div class="layui-form-mid layui-word-aux" id="excelTemp">
+                                @if(ExcelKind == "1")
+                                {
+                                <a href="/users/客小爽入库模版.xlsx">点击下载入库模版</a>
+                                }
+                                @if(ExcelKind == "2")
+                                {
+                                <a href="/users/客小爽仓库调拨模版.xlsx">点击下载仓库调拨模版</a>
+                                }
+                                @if(ExcelKind == "3")
+                                {
+                                <a href="/users/客小爽仓库发货至创客模版.xlsx">点击下载仓库发货至创客模版</a>
+                                }
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">excel文件</label>
+                            <div class="layui-input-block">
+                                <div class="layui-upload">
+                                    <input type="hidden" id="ExcelPath" name="ExcelPath" value="">
+                                    <button class="layui-btn" type="button" id="ExcelPathBtn">选择</button>
+                                    <div class="layui-inline layui-word-aux"></div>
+                                </div>
+                                <div class="mt10" id="ExcelPathFile">
+                                </div>
+                            </div>
+                        </div>
+                        
+
+                    </div>
+
+                </div>
+            </div>
+            <div class="layui-form-item layui-hide">
+                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
+            </div>
+          </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        
+                    
+        //编辑器
+        KindEditor.ready(function (K) {
+            
+        });
+
+        
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+        
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+    
+            //日期
+            
+
+            //上传文件
+            WebUploadJs('ExcelPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', {width:0,height:0,quality:0},{max_file_size:1048576},  function (filename) {
+                $('#ExcelPathFile').html(filename);
+                $('#ExcelPath').val(filename);
+            });
+
+            //穿梭框
+            
+            
+
+            //TreeView，比如权限管理
+            
+
+            //省市区
+
+        });
+
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/StoreMachineApply/Index.cshtml

@@ -0,0 +1,147 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+    
+}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>仓库机具申请记录</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <style>
+        .layui-input-inline{
+            width: 175px !important;
+        }
+        .layui-form-label{
+            width: 115px !important;
+        }
+        .layui-inline{
+            margin-right: 0px !important;
+        }        
+        .w100{
+            width: 100px !important;
+        }
+        .ml50{
+            margin-left: 50px !important;
+        }
+        tbody .layui-table-cell{
+            height: 60px !important;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">申请订单号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ApplyNo" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> KqProductBrandDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="BrandId" name="BrandId" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in KqProductBrandDic.Keys)
+                                {
+                                <option value="@key">@KqProductBrandDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MakerCode" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创客姓名</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="RealName" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">仓库编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="StoreNo" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">仓库名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="StoreName" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">申请时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="ApplyTimeData" id="ApplyTime"
+                            placeholder="申请时间" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">申请状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">待审核</option>
+                                <option value="1">申请成功</option>
+                                <option value="2">申请失败</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline ml50">
+                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
+                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
+                        </button>
+                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
+                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
+                        </button>
+                        @if (RightInfo.Contains("," + right + "_export,"))
+                        {
+                            <button class="layui-btn" data-type="ExportExcel">
+                                <i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出
+                            </button>
+                        }
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-card-body">     
+                <blockquote class="layui-elem-quote layui-text">
+                    申请机具数：<span style="color: #f00;" id="ApplyCount">0</span>　|　发货机具数：<span style="color: #f00;" id="SendCount">0</span>
+                </blockquote>
+                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
+                <script type="text/html" id="table-list-tools">
+                    <a class="layui-btn layui-btn-warm layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-form"></i>编辑</a>
+                    @if (RightInfo.Contains("," + right + "_audit,"))
+                    {
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="send"><i class="layui-icon layui-icon-edit"></i>审核发货</a>
+                    }
+                    @if (RightInfo.Contains("," + right + "_cancel,"))
+                    {
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancel"><i class="layui-icon layui-icon-edit"></i>取消订单</a>
+                    }
+                </script>
+            </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/layuiadmin/modules_main/StoreMachineApply_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script>
+        
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/TradeRecord/Index.cshtml

@@ -95,8 +95,8 @@
                         <div class="layui-input-inline">
                             <select id="BankCardTypeSelect" name="BankCardTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">贷记卡</option>
-                                <option value="1">借记卡</option>
+                                <option value="1">贷记卡</option>
+                                <option value="0">借记卡</option>
                             </select>
                         </div>
                     </div>
@@ -126,7 +126,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">交易日期</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="TradeDateData" id="TradeDate"
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
                             autocomplete="off">
                         </div>
                     </div>

Areas/Admin/Views/MainServer/UserCashRecord/Index.cshtml

@@ -73,6 +73,7 @@
                             </select>
                         </div>
                     </div>
+                
                     <div class="layui-inline">
                         <label class="layui-form-label">交易类型</label>
                         <div class="layui-input-inline">
@@ -86,9 +87,9 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">提交代付状态</label>
                         <div class="layui-input-inline">
-                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                            <select id="QueryCountSelect" name="QueryCountSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="2">待提交</option>
+                                <option value="0">待提交</option>
                                 <option value="1">已提交</option>
                             </select>
                         </div>

Areas/Admin/Views/MainServer/UserTradeDaySummary/Index.cshtml

@@ -73,8 +73,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">交易日期</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
-                            placeholder="交易日期" autocomplete="off">
+                            <input class="layui-input" type="text" readonly name="TradeDateSelect" id="CreateDate" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline ml50">

Areas/Api/Controllers/PublicMethodController.cs

@@ -30,7 +30,7 @@ namespace MySystem.Areas.Api.Controllers
         public FileContentResult CheckCode()
         {
             string code = function.get_Random(4);
-            var bitmap = VerifyCodeHelper.GetSingleObj().CreateBitmapByImgVerifyCode(code, 100, 40);
+            var bitmap = VerifyCodeHelper.GetSingleObj().CreateBitmapByImgVerifyCode(code, 120, 40);
             MemoryStream stream = new MemoryStream();
             bitmap.Save(stream, ImageFormat.Gif);
             function.WriteCookie(_accessor.HttpContext, "checkcode", code);
@@ -42,7 +42,7 @@ namespace MySystem.Areas.Api.Controllers
         public FileContentResult PictureCode(string Tag = "")
         {
             string code = function.get_Random(4);
-            var bitmap = VerifyCodeHelper.GetSingleObj().CreateBitmapByImgVerifyCode(code, 100, 40);
+            var bitmap = VerifyCodeHelper.GetSingleObj().CreateBitmapByImgVerifyCode(code, 120, 40);
             MemoryStream stream = new MemoryStream();
             bitmap.Save(stream, ImageFormat.Gif);
             RedisDbconn.Instance.Set(Tag, code);

MySystem.csproj

@@ -34,19 +34,19 @@
       <HintPath>BLL\aliyun-net-sdk-core.dll</HintPath>
     </Reference>
     <Reference Include="LitJSON">
-      <HintPath>..\..\MySystemLib\MySystemLib\bin\Release\netcoreapp3.0\LitJSON.dll</HintPath>
+      <HintPath>BLL\LitJSON.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\MySystemLib\MySystemLib\bin\Release\netcoreapp3.0\Newtonsoft.Json.dll</HintPath>
+      <HintPath>BLL\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="ThoughtWorks.QRCode">
-      <HintPath>..\..\MySystemLib\MySystemLib\bin\Release\netcoreapp3.0\ThoughtWorks.QRCode.dll</HintPath>
+      <HintPath>BLL\ThoughtWorks.QRCode.dll</HintPath>
     </Reference>
     <Reference Include="Aliyun.OSS">
       <HintPath>BLL\Aliyun.OSS.dll</HintPath>
     </Reference>
     <Reference Include="MySystemLib">
-      <HintPath>..\..\MySystemLib\MySystemLib\bin\Release\netcoreapp3.0\MySystemLib.dll</HintPath>
+      <HintPath>BLL\MySystemLib.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

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/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/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/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/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

@@ -118,6 +118,8 @@ layui.config({
         , url: '/Admin/TradeRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
+
+
             , { field: 'MakerCode', width: 200, title: '创客编码', sort: true }
             , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
             , { field: 'TopMakerCode', width: 200, title: '顶级创客编码', sort: true }
@@ -148,8 +150,8 @@ layui.config({
         , 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

@@ -126,9 +126,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/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("无数据");
         }