Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Module.Product/OrderModule.cs

@@ -5967,8 +5967,8 @@ namespace Mall.Module.Product
                     TripETime = item.TripETime,
                     TripSTime = item.TripSTime,
                     UseDay = item.UseDay,
-                    InsuranceMoney = item.InsuranceMoney,
-                    InsuranceCostMoney = item.InsuranceCostMoney,
+                    InsuranceMoney = item.InsuranceMoney ?? 0,
+                    InsuranceCostMoney = item.InsuranceCostMoney ?? 0,
                     InsuranceFinanceId = 0,
                     CommentGiveIntegral = item.CommentGiveIntegral
                 }, trans);

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -182,7 +182,7 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult GetOrderListExportEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(OrderListExportEnum));
-            return ApiResult.Success("", list.OrderBy(x => x.Value).Select(x => new
+            return ApiResult.Success("", list.Select(x => new
             {
                 Name = x.Key,
                 Id = Convert.ToInt32(x.Value)
@@ -481,7 +481,7 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult GetOrderListExportForSDEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(OrderListExportForSDEnum));
-            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
+            return ApiResult.Success("", list.Select(x => new
             {
                 Name = x.Key,
                 Id = Convert.ToInt32(x.Value)