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

Mall.Module.Product/OrderModule.cs

@@ -11228,6 +11228,7 @@ namespace Mall.Module.Product
                 model.Income,
                 model.FreightMoney,
                 CouponMoney = model.CouponMoney ?? 0,
+                InsuranceMoney = (model.DetailList != null && model.DetailList.Any()) ? (model.DetailList.Sum(x => x.InsuranceMoney ?? 0)) : 0,
                 IntegralMoney = (model.DetailList != null && model.DetailList.Any()) ? (model.DetailList.Sum(x => x.IntegralMoney ?? 0)) : 0,
                 IntegralNumber = (model.DetailList != null && model.DetailList.Any()) ? (model.DetailList.Sum(x => x.IntegralNumber ?? 0)) : 0,
                 MemberDiscountCouponList = memberCouponList.Select(y => new

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -377,6 +377,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.PaymentWay,
                 PaymentWayName = x.PaymentWay.GetEnumName(),
                 CouponMoney = x.CouponMoney ?? 0,
+                InsuranceMoney = (x.DetailList != null && x.DetailList.Any()) ? (x.DetailList.Sum(x => x.InsuranceMoney ?? 0)) : 0,
                 IntegralMoney = (x.DetailList != null && x.DetailList.Any()) ? (x.DetailList.Sum(x => x.IntegralMoney ?? 0)) : 0,
                 IntegralNumber = (x.DetailList != null && x.DetailList.Any()) ? (x.DetailList.Sum(x => x.IntegralNumber ?? 0)) : 0,
                 MemberDiscountCouponList = x.MemberDiscountCouponList.Select(y => new
@@ -480,7 +481,7 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult GetOrderListExportForSDEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(OrderListExportForSDEnum));
-            return ApiResult.Success("", list.OrderBy(x => x.Value).Select(x => new
+            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
             {
                 Name = x.Key,
                 Id = Convert.ToInt32(x.Value)
@@ -583,11 +584,11 @@ namespace Mall.WebApi.Controllers.MallBase
                                 case 20:
                                     datarow.ExcelRows.Add(new ExcelColumn(value: item.PaymentTime.HasValue ? item.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") { }); break;
                                 case 21:
-                                    datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus > OrderStatusEnum.WaitSendGoods ? "已发货" : "未发货") { }); break;
+                                    datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus > OrderStatusEnum.WaitSendGoods ? "已确认" : "待确认") { }); break;
                                 case 22:
                                     datarow.ExcelRows.Add(new ExcelColumn(value: item.DeliveryTime.HasValue ? item.DeliveryTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") { }); break;
                                 case 23:
-                                    datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus > OrderStatusEnum.WaitReceiving ? "已收货" : "未收货") { }); break;
+                                    datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus > OrderStatusEnum.WaitReceiving ? "出行中" : "待出行") { }); break;
                                 case 24:
                                     datarow.ExcelRows.Add(new ExcelColumn(value: item.ReceivingTime.HasValue ? item.ReceivingTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") { }); break;
                                 case 29: