Merge branch 'feature-dgy-第一批新式导出功能' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -1333,11 +1333,15 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string QuickExportExcelDo(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 CreateDateData, string SendDateData, string PayDateData)
+        public string QuickExportExcelDo(string OrderNo, 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 CreateDateData, string SendDateData, string PayDateData)
         {
 
             string SqlString = " where 1=1 and a.Status>=-1 and a.Sort=0";
-            //创客编号
+            //订单号
+            if (!string.IsNullOrEmpty(OrderNo))
+            {
+                SqlString += " and a.OrderNo='" + OrderNo + "'";
+            }
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 SqlString += " and a.UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";