Merge branch 'feature-dgy-后台优化' into DuGuYang

商城订单导出添加支付时间筛选

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -1046,7 +1046,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportsExcel(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, string RedisKey = "ExportKey")
+        public JsonResult ExportsExcel(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, string PayDateData, string RedisKey = "ExportKey")
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CreateDate", "3"); //时间
@@ -1126,7 +1126,15 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PayStatus=" + PayStatusSelect;
             }
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Orders", Fields, "Id desc", "0", 1, 20000, condition, "UserId,OrderNo,RealName,Mobile,TotalPrice,Areas,Address,ErpName,ErpCode,SendDate,PayMode,TradeNo,StoreId,RefundStatus,DeliveryType,SendStatus,ProductId,StoreContact,StoreType,StoreUserId,TopUserId,PayStatus,BuyCount,Remark,Id", false);
+            //支付时间
+            if (!string.IsNullOrEmpty(PayDateData))
+            {
+                string[] datelist = PayDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and PayDate>='" + start + " 00:00:00' and PayDate<='" + end + " 23:59:59'";
+            }
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Orders", Fields, "Id desc", "0", 1, 20000, condition, "UserId,OrderNo,RealName,Mobile,TotalPrice,Areas,Address,ErpName,ErpCode,SendDate,PayMode,PayDate,TradeNo,StoreId,RefundStatus,DeliveryType,SendStatus,ProductId,StoreContact,StoreType,StoreUserId,TopUserId,PayStatus,BuyCount,Remark,Id", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -1220,6 +1228,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("ErpCode", "运单号");
             ReturnFields.Add("SendDate", "发货时间");
             ReturnFields.Add("PayMode", "支付方式");
+            ReturnFields.Add("PayDate", "支付时间");
             ReturnFields.Add("TradeNo", "支付交易号");
             ReturnFields.Add("StoreIdStoreNo", "仓库编号");
             ReturnFields.Add("StoreIdStoreName", "仓库名称");

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -164,6 +164,7 @@ layui.config({
             ,{field:'RefundStatusName', width: 200, title:'退款状态', sort: true}
             ,{field:'ErpInfo', width: 200, title:'快递单号-快递名称', sort: true}
             ,{field:'CreateDate', width: 200, title:'下单时间', sort: true}
+            ,{field:'PayDate', width: 200, title:'支付时间', sort: true}
 
             , { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
         ]]