订单表新增售后单属性

BBWY.Client/Models/APIModel/Response/Order/ExportOrderResponse.cs

@@ -74,8 +74,8 @@ namespace BBWY.Client.Models
 
         public override string ToString()
         {
-            //日期,店铺订单号,SKU编码,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式
-            return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{PurchaseFreight},{FirstFreight},{StorageAmount},{DeliveryExpressFreight},{PlatformCommissionAmount},{FreightPrice},{Profit},{ProfitRatio},{ConsigneeStr}";
+            //日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式,售后类型,售后与特殊情况备注
+            return $"{OrderStartTime:yyyy-MM-dd HH:mm:ss},{OrderId},{SkuIds},{OrderState},{StorageType},{PurchaseOrderIds},{OrderTotalPrice},{PurchaseSkuAmount},{PurchaseFreight},{FirstFreight},{StorageAmount},{DeliveryExpressFreight},{PlatformCommissionAmount},{FreightPrice},{Profit},{ProfitRatio},{ConsigneeStr}";
         }
     }
 }

BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs

@@ -138,6 +138,11 @@ namespace BBWY.Client.Models
         /// </summary>
         public string SDOperator { get; set; }
 
+        /// <summary>
+        /// 是否包含售后单
+        /// </summary>
+        public bool IsAfterOrder { get; set; }
+
         /// <summary>
         /// 收货人信息
         /// </summary>

BBWY.Client/Models/Order/Order.cs

@@ -159,6 +159,11 @@ namespace BBWY.Client.Models
         /// </summary>
         public string Flag { get => flag; set { Set(ref flag, value); } }
 
+        /// <summary>
+        /// 是否包含售后单
+        /// </summary>
+        public bool IsAfterOrder { get; set; }
+
         /// <summary>
         /// 收货人信息
         /// </summary>

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -689,7 +689,7 @@ namespace BBWY.Client.ViewModels
                                                          try
                                                          {
                                                              var list = r.Data.Select(x => x.ToString()).ToList();
-                                                             list.Insert(0, "日期,店铺订单号,SKU编码,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式,售后类型,售后与特殊情况备注");
+                                                             list.Insert(0, "日期,店铺订单号,SKU编码,订单状态,仓储类型,代发下单单号,售价,商品成本,采购运费,头程费用,仓储服务费,快递费,平台扣点,补差金额,利润,利润率,收件人联系方式,售后类型,售后与特殊情况备注");
                                                              System.IO.File.WriteAllLines(ssaveFileName, list, Encoding.UTF8);
                                                              App.Current.Dispatcher.Invoke(() => MessageBox.Show("导出完成", "导出"));
                                                          }

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -87,6 +87,7 @@ namespace BBWY.Server.Business
             }
 
             select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId)
+                           .Where((o, ocs, oct) => o.IsAfterOrder == searchOrderRequest.IsContainsAfterOrder)
                            .OrderByDescending((o, ocs, oct) => o.StartTime)
                            .Count(out var total)
                            .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize);
@@ -119,6 +120,7 @@ namespace BBWY.Server.Business
                 SDOperator = o.SDOperator,
                 SDPayBillNo = o.SDPayBillNo,
                 SDPayChannel = o.SDPayChannel,
+                IsAfterOrder = o.IsAfterOrder,
 
                 ContactName = ocs.ContactName,
                 Address = ocs.Address,

BBWY.Server.Model/Db/Order/Order.cs

@@ -167,6 +167,12 @@ namespace BBWY.Server.Model.Db
         [Column(StringLength = 20)]
         public string SDOperator { get; set; }
 
+        /// <summary>
+        /// 是否为售后订单
+        /// </summary>
+        [Column(DbType = "bit")]
+        public bool IsAfterOrder { get; set; } = false;
+
         #region 订单成本
         /// <summary>
         /// 平台扣点金额

BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs

@@ -52,5 +52,11 @@ namespace BBWY.Server.Model.Dto
         /// 过滤已取消
         /// </summary>
         public bool ExcludeCanceled { get; set; }
+
+        /// <summary>
+        /// 是否包含售后单
+        /// </summary>
+        public bool IsContainsAfterOrder { get;set; }
+
     }
 }

BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs

@@ -149,6 +149,12 @@ namespace BBWY.Server.Model.Dto
         /// </summary>
         public string SDOperator { get; set; }
 
+        /// <summary>
+        /// 是否包含售后单
+        /// </summary>
+        public bool IsAfterOrder { get; set; }
+
+
         /// <summary>
         /// 收货人信息
         /// </summary>