合并

Areas/Admin/Controllers/BsServer/MsgPersonalController.cs

@@ -50,12 +50,11 @@ namespace MySystem.Areas.Admin.Controllers
         /// 个人消息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MsgPersonal data, string MakerCode, string StatusSelect, string ReadFlagSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(MsgPersonal data, string MakerCode, string StatusSelect, string ReadFlagSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("Title", "1"); //标题
             Fields.Add("Summary", "1"); //内容
 
@@ -75,6 +74,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ReadFlag=" + ReadFlagSelect;
             }
+            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.BsTables).IndexData("MsgPersonal", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Controllers/BsServer/MsgPlacardController.cs

@@ -50,12 +50,11 @@ namespace MySystem.Areas.Admin.Controllers
         /// 公告消息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MsgPlacard data, string MsgTypeSelect, string StatusSelect, string PushTypeSelect, string PushFlagSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(MsgPlacard data, string MsgTypeSelect, string StatusSelect, string PushTypeSelect, string PushFlagSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("Title", "2"); //标题
             
             string condition = " and Status>-1";
@@ -79,6 +78,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PushFlag=" + PushFlagSelect;
             }
+            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.BsTables).IndexData("MsgPlacard", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Controllers/CashServer/UserIdentityController.cs

@@ -51,13 +51,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客信息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserIdentity data, string CheckStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserIdentity data, string CheckStatusSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("BuddyNo", "1"); //创客编号
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("BuddyName", "1"); //创客名称
             Fields.Add("IdCardNo", "1"); //身份证号
             Fields.Add("UserMobile", "1"); //手机号
@@ -70,6 +69,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and CheckStatus=" + CheckStatusSelect;
             }
+            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.CashTables).IndexData("UserIdentity", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Controllers/MainServer/ActiveRewardController.cs

@@ -59,7 +59,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("BrandId", "1");
             Fields.Add("KqMerNo", "1"); //快钱商户编号
             Fields.Add("KqSnNo", "1"); //快钱SN号
-            Fields.Add("ActDate", "3"); //激活时间
             Fields.Add("TopUserId", "0"); //顶级创客
 
             ViewBag.RightInfo = RightInfo;

Areas/Admin/Controllers/MainServer/FluxProfitDetailController.cs

@@ -56,7 +56,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("MerNo", "1"); //渠道商户编号
             Fields.Add("SnNo", "1"); //渠道SN号
             Fields.Add("FluxOrderNo", "1"); //流量扣费单号
@@ -99,7 +98,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = CreateDateData.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 + " and TradeDate>=" + end + "";
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("FluxProfitDetail", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -51,18 +51,16 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具申请订单列表
         /// </summary>
         /// <returns></returns>
-        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)
+        public JsonResult IndexData(MachineApply data,string ApplyNo, string MakerCode, string RealName, string StoreNo, string StoreName, string StoreMakerCode, string StatusSelect, string ApplyTimeData, string SendDateData, string SendStatusSelect, string StoreTypeSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("ApplyNo", "1"); //申请单号
             Fields.Add("BrandId", "1"); //品牌
-            Fields.Add("ApplyTime", "3"); //申请时间
             Fields.Add("ExpressNo", "1"); //快递单号
             Fields.Add("DeliveryType", "0"); //提货类型
             Fields.Add("StoreManager", "1"); //仓库联系人
-            Fields.Add("SendDate", "3"); //发货时间
             Fields.Add("TopUserId", "0"); //顶级创客
             Fields.Add("SwapSnExpand", "1"); //兑换SN
             Fields.Add("SendSn", "1"); //发货SN
@@ -122,6 +120,14 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and ApplyTime>='" + start + " 00:00:00' and ApplyTime<='" + end + " 23:59:59'";
             }
 
+            if(!string.IsNullOrEmpty(SendDateData))
+            {
+                string[] datelist = SendDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and SendDate>='" + start + " 00:00:00' and SendDate<='" + 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>>;
             foreach (Dictionary<string, object> dic in diclist)

Areas/Admin/Controllers/MainServer/MachineChangeController.cs

@@ -51,13 +51,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具转换订单列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MachineChange data, string UserIdRealName, string UserIdMakerCode, string BackProductTypeSelect, string AuditResultSelect, string BackStoreIdStoreName, string BackStoreIdStoreNo, string BackStoreUserIdMakerCode, string BackStoreUserIdRealName, string OutProductTypeSelect, string OutStoreIdStoreName, string OutStoreIdStoreNo, int page = 1, int limit = 30)
+        public JsonResult IndexData(MachineChange data, string UserIdRealName, string UserIdMakerCode, string BackProductTypeSelect, string AuditResultSelect, string BackStoreIdStoreName, string BackStoreIdStoreNo, string BackStoreUserIdMakerCode, string BackStoreUserIdRealName, string OutProductTypeSelect, string OutStoreIdStoreName, string OutStoreIdStoreNo, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("ChangeNo", "1"); //转换单号
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("OutStoreManagerMobile", "1"); //出库仓库联系人手机号
 
 
@@ -117,6 +116,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreNo where StoreNo='" + OutStoreIdStoreNo + "')";
             }
+            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("MachineChange", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/OpenRewardController.cs

@@ -50,12 +50,11 @@ namespace MySystem.Areas.Admin.Controllers
         /// 开机奖励列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(OpenReward data, string MakerCode, string RealName, string CheckStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(OpenReward data, string MakerCode, string RealName, string CheckStatusSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //交易时间
             Fields.Add("BrandId", "0"); //品牌
             Fields.Add("TopUserId", "0"); //顶级创客
 
@@ -75,6 +74,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and CheckStatus=" + CheckStatusSelect;
             }
+            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("OpenReward", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Controllers/MainServer/OpenRewardDetailController.cs

@@ -56,7 +56,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("TradeDate", "3"); //达标日期
             Fields.Add("BrandId", "0"); //品牌
             Fields.Add("SnNo", "1"); //SN号
             Fields.Add("MerNo", "1"); //渠道商户号

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -60,12 +60,10 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("OrderNo", "1"); //订单号
             Fields.Add("RealName", "1"); //姓名
             Fields.Add("Mobile", "1"); //手机号
             Fields.Add("ErpCode", "1"); //运单号
-            Fields.Add("SendDate", "3"); //发货时间
             Fields.Add("TradeNo", "1"); //支付交易号
             Fields.Add("StoreContact", "1"); //仓库联系人
             Fields.Add("SnNos", "2"); //SN编号
@@ -148,12 +146,18 @@ namespace MySystem.Areas.Admin.Controllers
             //下单时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
-                condition += " and CreateDateData=" + 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 (!string.IsNullOrEmpty(SendDateData))
             {
-                condition += " and SendDateData=" + SendDateData;
+                string[] datelist = SendDateData.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'";
             }
 
             //退款状态

Areas/Admin/Controllers/MainServer/PosCouponOrdersController.cs

@@ -51,12 +51,11 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具券变更记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosCouponOrders data, string FromUserIdMakerCode, string FromUserIdRealName, string ToUserIdMakerCode, string ToUserIdRealName, string ChangeKindSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosCouponOrders data, string FromUserIdMakerCode, string FromUserIdRealName, string ToUserIdMakerCode, string ToUserIdRealName, string ChangeKindSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("OrderNo", "1"); //单号
 
 
@@ -86,6 +85,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ChangeKind=" + ChangeKindSelect;
             }
+            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("PosCouponOrders", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -64,13 +64,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分润奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ProfitRewardRecord data, string right, string BrandId, 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, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("BrandId", "1");
-            Fields.Add("CreateDate", "3"); //交易时间
             Fields.Add("TopUserId", "0"); //顶级创客
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
@@ -97,6 +96,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and CheckStatus=" + CheckStatusSelect;
             }
+            //交易时间
+            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("ProfitRewardRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Controllers/MainServer/StoreBalanceController.cs

@@ -56,7 +56,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("TransRecordNo", "1"); //交易流水编号
 
 

Areas/Admin/Controllers/MainServer/StoreChangeHistoryController.cs

@@ -50,12 +50,11 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具变动历史列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreChangeHistory data, string UserIdMakerCode, string UserIdRealName, string BrandIdSelect, string TransTypeSelect, string SnTypeSelect, string StockOpDirectSelect, string StoreIdStoreNo, string StoreIdStoreName, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreChangeHistory data, string UserIdMakerCode, string UserIdRealName, string BrandIdSelect, string TransTypeSelect, string SnTypeSelect, string StockOpDirectSelect, string StoreIdStoreNo, string StoreIdStoreName, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("SnNo", "1"); //SN编号
 
 
@@ -100,6 +99,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
             }
+            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("StoreChangeHistory", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -52,13 +52,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 仓库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreHouse data, string UserIdMakerCode, string UserIdRealName, string ManageUserIdRealName, string ManageUserIdMobile, string ManageUserIdMakerCode, string StoreStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreHouse data, string UserIdMakerCode, string UserIdRealName, string ManageUserIdRealName, string ManageUserIdMobile, string ManageUserIdMakerCode, string StoreStatusSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("StoreNo", "1"); //仓库编号
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("StoreName", "1"); //仓库名称
             Fields.Add("ManagerEmail", "1"); //管理者邮箱
 
@@ -94,6 +93,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreStatus=" + StoreStatusSelect;
             }
+            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("StoreHouse", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -56,7 +56,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("ApplyNo", "1"); //申请单号
             Fields.Add("BrandId", "1"); //品牌
-            Fields.Add("ApplyTime", "3"); //申请时间
             Fields.Add("ExpressNo", "1"); //快递单号
 
             string condition = " and Status>-1";

Areas/Admin/Controllers/MainServer/StoreSnActivateSummaryController.cs

@@ -50,13 +50,11 @@ namespace MySystem.Areas.Admin.Controllers
         /// 仓库SN激活统计列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreSnActivateSummary data, string StoreIdStoreNo, string StoreIdStoreName, string AgentStoreIdStoreNo, string AgentStoreIdStoreName, string BrandIdSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreSnActivateSummary data, string StoreIdStoreNo, string StoreIdStoreName, string AgentStoreIdStoreNo, string AgentStoreIdStoreName, string BrandIdSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
-
 
             string condition = " and Status>-1";
             //仓库仓库编号
@@ -84,6 +82,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and BrandId=" + BrandIdSelect;
             }
+            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("StoreSnActivateSummary", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/StoreStockChangeController.cs

@@ -50,12 +50,11 @@ namespace MySystem.Areas.Admin.Controllers
         /// 仓库库存变动记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreStockChange data, string StoreIdStoreNo, string StoreIdStoreName, string BrandIdSelect, string TransTypeSelect, string StockOpDirectSelect, string SnStatusSelect, string BindStatusSelect, string BindMerchantMerchantNo, string BindMerchantMerchantName, string ActiveStatusSelect, string BrandTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreStockChange data, string StoreIdStoreNo, string StoreIdStoreName, string BrandIdSelect, string TransTypeSelect, string StockOpDirectSelect, string SnStatusSelect, string BindStatusSelect, string BindMerchantMerchantNo, string BindMerchantMerchantName, string ActiveStatusSelect, string BrandTypeSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("SnNo", "1"); //SN编号
 
 
@@ -115,6 +114,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and BrandType=" + BrandTypeSelect;
             }
+            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("StoreStockChange", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/TradeDaySummaryController.cs

@@ -58,7 +58,6 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("BrandId", "1");
-            Fields.Add("CreateDate", "3"); //交易时间
             Fields.Add("TopUserId", "0"); //顶级创客
 
             string condition = " and Status>-1";

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -63,7 +63,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("BrandId", "1");
             Fields.Add("MerNo", "2"); //快钱商户编号
             Fields.Add("SnNo", "2"); //快钱SN号
-            Fields.Add("TradeDate", "3"); //交易日期
             Fields.Add("TopUserId", "0"); //顶级创客
 
             string condition = " and Status>-1";

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -64,7 +64,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ChangeType", "1"); //交易类型
             Fields.Add("ProductType", "1"); //产品类型
             Fields.Add("TransRecordNo", "3"); //交易流水编号
-            Fields.Add("CreateDate", "3"); //交易时间
 
             string condition = " and Status>-1";
             //创客编号

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -67,7 +67,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CashOrderNo", "1"); //提现单号
-            Fields.Add("CreateDate", "3"); //创建时间
             Fields.Add("TradeType", "0"); //交易类型
 
             string condition = " and Status>-1";
@@ -83,33 +82,24 @@ namespace MySystem.Areas.Admin.Controllers
                 // condition += " and UserId in (select Id from Users where RealName='" + RealName + "')";
             }
             //提现状态
-            if(!string.IsNullOrEmpty(StatusSelect))
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
                 condition += " and Status=" + StatusSelect;
             }
-            if(!string.IsNullOrEmpty(data.CashOrderNo))
+            if (!string.IsNullOrEmpty(data.CashOrderNo))
             {
                 condition += " and CashOrderNo='" + data.CashOrderNo + "'";
             }
             if (data.TradeType > 0)
-            { 
+            {
                 condition += " and TradeType=" + data.TradeType;
             }
             //提交到代付状态
             if (!string.IsNullOrEmpty(QueryCountSelect))
-            { 
-                int QueryCount = int.Parse(function.CheckInt(QueryCountSelect));
-                if (QueryCount == 2)
-                {
-                    QueryCount = 0;
-                }
+            {
                 condition += " and QueryCount=" + QueryCountSelect;
             }
-            if (data.Status > -1)
-            { 
-                condition += " and Status=" + data.Status;
-            }
-            if(!string.IsNullOrEmpty(CreateDateData))
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
@@ -127,16 +117,16 @@ 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>();
-            
+
             string WaitAmount = "0.00";//待处理总金额
             string SuccessAmount = "0.00";//提现成功总金额
             string FailAmount = "0.00";//提现失败总金额
@@ -508,11 +498,14 @@ namespace MySystem.Areas.Admin.Controllers
         /// 拒绝
         /// </summary>
         /// <returns></returns>
-        public IActionResult Reduce(string right)
+        public IActionResult Reduce(string right, int Id = 0)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
 
+            UserCashRecord editData = db.UserCashRecord.FirstOrDefault(m => m.Id == Id) ?? new UserCashRecord();
+            ViewBag.data = editData;
+
             return View();
         }
 

Areas/Admin/Controllers/MainServer/UserStoreChangeController.cs

@@ -56,7 +56,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("SnNo", "1"); //SN编号
 
 

Areas/Admin/Controllers/MainServer/UserTradeDaySummaryController.cs

@@ -57,7 +57,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //交易日期
             Fields.Add("BrandId", "0"); //品牌
 
             string condition = " and Status>-1";
@@ -84,7 +83,10 @@ namespace MySystem.Areas.Admin.Controllers
             //交易日期
             if (!string.IsNullOrEmpty(TradeDateSelect))
             {
-                condition += " and TradeDate=" + TradeDateSelect.Replace("", "");
+                string[] datelist = TradeDateSelect.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0].Replace("-", "");
+                string end = datelist[1].Replace("-", "");
+                condition += " and TradeDate>='" + start + "' and TradeDate<='" + end + "' ";
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserTradeDaySummary", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -58,14 +58,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Users data, string ParentMakerCode, string ParentRealName, string AuthFlagSelect, int TopUserId, string RiskFlagSelect, string MerchantTypeSelect, int? sSettleAmount, int? eSettleAmount, int? sCashFreezeAmt, int? eCashFreezeAmt, int SelfId = 0, int ParentId = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(Users data, string ParentMakerCode, string ParentRealName, string AuthFlagSelect, string CreateDateData, int TopUserId, string RiskFlagSelect, string MerchantTypeSelect, int? sSettleAmount, int? eSettleAmount, int? sCashFreezeAmt, int? eCashFreezeAmt, int SelfId = 0, int ParentId = 0, int page = 1, int limit = 30)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("MakerCode", "1"); //创客编号
             Fields.Add("RealName", "1"); //创客名称
             Fields.Add("Mobile", "1"); //手机号
             Fields.Add("CertId", "1"); //身份证号码
-            Fields.Add("CreateDate", "3"); //注册时间
             Fields.Add("SettleAmount", "3"); //结算金额
             Fields.Add("CashFreezeAmt", "3"); //冻结金额
             Fields.Add("UserLevel", "0"); //创客等级
@@ -132,6 +131,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ParentUserId=" + ParentId;
             }
+            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("Users", Fields, sort, "True", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -353,19 +359,19 @@ namespace MySystem.Areas.Admin.Controllers
             decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
             decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
             int ChangeType = 0;
-            if (Kind == 1)
+            if (Kind == 1 && data.CashFreezeAmt <= account.BalanceAmount)
             {
                 account.BalanceAmount -= data.CashFreezeAmt;
                 account.FreezeAmount += data.CashFreezeAmt;
                 ChangeType = 61;
             }
-            else if (Kind == 2)
+            else if (Kind == 2 && data.CashFreezeAmt <= account.FreezeAmount)
             {
                 account.BalanceAmount += data.CashFreezeAmt;
                 account.FreezeAmount -= data.CashFreezeAmt;
                 ChangeType = 62;
             }
-            else if (Kind == 3)
+            else if (Kind == 3 && data.CashFreezeAmt <= account.BalanceAmount)
             {
                 account.TotalAmount -= data.CashFreezeAmt;
                 account.BalanceAmount -= data.CashFreezeAmt;
@@ -709,6 +715,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else if (Kind == 4)
             {
+                string error = "";
                 for (int i = 1; i < list.Count; i++)
                 {
                     JsonData dr = list[i];
@@ -732,63 +739,67 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         if (User != null)
                         {
-                            if ((OperationType == "1" || OperationType == "3") && User.CashFreezeAmt > account.BalanceAmount)
-                            {
-                                return "账号余额不足";
-                            }
-                            decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                            decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                            decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                            int ChangeType = 0;
-                            if (OperationType == "1")
+                            if ((OperationType == "1" || OperationType == "3") && Convert.ToDecimal(OperationAmt) > account.BalanceAmount)
                             {
-                                account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
-                                account.FreezeAmount += Convert.ToDecimal(OperationAmt);
-                                ChangeType = 61;
+                                error += "以下操作失败" + User.MakerCode + ',' + User.RealName + '|' + '\n';
                             }
-                            else if (OperationType == "2")
+                            else
                             {
-                                account.BalanceAmount += Convert.ToDecimal(OperationAmt);
-                                account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
-                                ChangeType = 62;
+                                decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                                decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                                decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                                int ChangeType = 0;
+                                if (OperationType == "1" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
+                                {
+                                    account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                    account.FreezeAmount += Convert.ToDecimal(OperationAmt);
+                                    ChangeType = 61;
+                                }
+                                else if (OperationType == "2" && Convert.ToDecimal(OperationAmt) <= account.FreezeAmount)
+                                {
+                                    account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                    account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
+                                    ChangeType = 62;
+                                }
+                                else if (OperationType == "3" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
+                                {
+                                    account.TotalAmount -= Convert.ToDecimal(OperationAmt);
+                                    account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                    ChangeType = 63;
+                                }
+                                else if (OperationType == "4")
+                                {
+                                    account.TotalAmount += Convert.ToDecimal(OperationAmt);
+                                    account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                    ChangeType = 64;
+                                }
+                                decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                                decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                                decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                                UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
+                                {
+                                    CreateDate = DateTime.Now,
+                                    UpdateDate = DateTime.Now,
+                                    UserId = User.Id, //创客
+                                    ChangeType = ChangeType, //变动类型
+                                    ChangeAmount = Convert.ToDecimal(OperationAmt), //变更金额
+                                    BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                    AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                    BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                    AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                    BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                    AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                    Remark = dr[4].ToString(),
+                                }).Entity;
+                                db.SaveChanges();
+                                AddSysLog(User.Id.ToString(), "Users", "ChangeCashFreezeAmts");
+                                db.SaveChanges();
                             }
-                            else if (OperationType == "3")
-                            {
-                                account.TotalAmount -= Convert.ToDecimal(OperationAmt);
-                                account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
-                                ChangeType = 63;
-                            }
-                            else if (OperationType == "4")
-                            {
-                                account.TotalAmount += Convert.ToDecimal(OperationAmt);
-                                account.BalanceAmount += Convert.ToDecimal(OperationAmt);
-                                ChangeType = 64;
-                            }
-                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                            UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
-                            {
-                                CreateDate = DateTime.Now,
-                                UpdateDate = DateTime.Now,
-                                UserId = User.Id, //创客
-                                ChangeType = ChangeType, //变动类型
-                                ChangeAmount = Convert.ToDecimal(OperationAmt), //变更金额
-                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                Remark = dr[4].ToString(),
-                            }).Entity;
-                            db.SaveChanges();
-                            AddSysLog(User.Id.ToString(), "Users", "ChangeCashFreezeAmts");
-                            db.SaveChanges();
                         }
                     }
                 }
                 db.SaveChanges();
+                return "warning" + error;
             }
             AddSysLog("0", "Users", "Import");
             return "success";

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

@@ -73,7 +73,7 @@
                             </select>
                         </div>
                     </div>
-                
+
                     <div class="layui-inline">
                         <label class="layui-form-label">交易类型</label>
                         <div class="layui-input-inline">
@@ -108,6 +108,11 @@
                         <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 + "_reduce,"))
+                        {
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduce"><i
+                                class="layui-icon layui-icon-edit"></i>驳回</a>
+                        }
                         @if (RightInfo.Contains("," + right + "_export,"))
                         {
                             <button class="layui-btn" data-type="ExportExcel"><i

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -32,7 +32,7 @@ layui.config({
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
         elem: '#CreateDate',
-        type: 'datetime',
+        type: 'date',
         range: true,
         trigger: 'click',
         change: function (value, date, endDate) {

wwwroot/layuiadmin/modules_main/ProfitRewardRecord_Admin.js

@@ -124,6 +124,12 @@ layui.config({
                 title: '顶级创客名称',
                 sort: true
             }, {
+                field: 'CreateDate',
+                width: 200,
+                title: '创建时间',
+                sort: true
+            }
+            , {
                 field: 'TradeMonth',
                 width: 200,
                 title: '交易所在月份',

wwwroot/layuiadmin/modules_main/UserCashRecord_Admin.js

@@ -190,7 +190,7 @@ layui.config({
                     width: 200,
                     title: '创建时间',
                     sort: true
-                }
+                }, { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
 
             ]
         ],

wwwroot/layuiadmin/modules_main/Users_Admin.js

@@ -9,6 +9,11 @@ function ConfirmImport() {
             if (data == "success") {
                 layer.msg("导入成功", { time: 2000 }, function () {
                     window.location.reload();
+                }); 
+            } else if (data.indexOf("warning") == 0) {
+                var datalist = data.split('|');
+                layer.alert(datalist[0], { time: 20000 }, function () {
+                    window.location.reload();
                 });
             } else {
                 layer.msg(data);