合并代码

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具申请订单列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MachineApply data, string MakerCode, string RealName, string StoreNo, string StoreName, string StoreMakerCode, string StatusSelect, string SendStatusSelect, string StoreTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(MachineApply data,string ApplyNo, string MakerCode, string RealName, string StoreNo, string StoreName, string StoreMakerCode, string StatusSelect, string ApplyTimeData, string SendStatusSelect, string StoreTypeSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -68,6 +68,11 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SendSn", "1"); //发货SN
 
             string condition = " and Status>-1";
+            //申请单号
+            if (!string.IsNullOrEmpty(ApplyNo))
+            {
+                condition += " and ApplyNo like'" + ApplyNo + "' " ;
+            }
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
             {
@@ -108,6 +113,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreType=" + StoreTypeSelect;
             }
+            //申请时间
+            if(!string.IsNullOrEmpty(ApplyTimeData))
+            {
+                string[] datelist = ApplyTimeData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and ApplyTime>='" + start + " 00:00:00' and ApplyTime<='" + end + " 23:59:59'";
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MachineApply", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -76,7 +76,7 @@ namespace MySystem.Areas.Admin.Controllers
             //平台订单号
             if (!string.IsNullOrEmpty(OrderNo))
             {
-                condition += " and OrderNo=" + OrderNo;
+                condition += " and OrderNo like '" + OrderNo + "'";
             }
             //渠道订单号
             if (!string.IsNullOrEmpty(TradeNo))
@@ -120,7 +120,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
             }
             //仓库联系人
-            if (!string.IsNullOrEmpty(OrderNo))
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }

Areas/Admin/Controllers/MainServer/UserAccountController.cs

@@ -270,6 +270,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> Fields = new Dictionary<string, object>();
 
             Fields.Add("UserId", data.UserId); //创客
+            Fields.Add("UpdateDate", DateTime.Now); //冻结/解冻时间
             Fields.Add("AccountStatus", 1); //账户状态
             Fields.Add("SeoDescription", data.SeoDescription); //冻结备注
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccount", Fields, data.Id);
@@ -320,6 +321,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("AccountStatus", 0);
+                Fields.Add("UpdateDate", DateTime.Now); //冻结/解冻时间
                 Fields.Add("SeoDescription", "");
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccount", Fields, id);
             }
@@ -344,6 +346,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("AccountStatus", 1);
+                Fields.Add("UpdateDate", DateTime.Now); //冻结/解冻时间
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccount", Fields, id);
             }
             db.SaveChanges();

appsettings.json

@@ -9,15 +9,15 @@
   "AllowedHosts": "*",
   "Setting": {
     "ConnectionStrings": "",
-    "Host": "http://localhost:5044/",
+    "Host": "http://test.bs.kexiaoshuang.com/",
     "Database": "KxsMainServer",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=Rw2imhXQQt5ODWIF;database=KxsMainServer;charset=utf8;",
     "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=Rw2imhXQQt5ODWIF;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
     "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
     "CashSqlConnStr": "server=47.109.31.237;port=3306;user=KxsCashServer;password=LNGvM18W6SaIGKBC;database=KxsCashServer;charset=utf8;",
-    "RedisConnStr": "localhost:6379,password=,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
-    "TendisConnStr": "localhost:6379,password=,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
+    "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
+    "TendisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "",

wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -109,6 +109,7 @@ layui.config({
                 { field: 'AccountStatusName', width: 200, title: '账户状态' ,sort: true},
                 { field: 'SeoDescription', width: 200, title: '备注' ,sort: true},
                 { field: 'CreateDate', width: 200, title: '创建时间' ,sort: true},
+                { field: 'UpdateDate', width: 200, title: '冻结/解冻时间' ,sort: true},
                 {
                     title: '操作',
                     width: 400,