商家备注

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

@@ -72,10 +72,12 @@ namespace BBWY.Client.Models
 
         public OrderState OrderState { get; set; }
 
+        public string VenderRemark { get; set; }
+
         public override string ToString()
         {
-            //日期,店铺订单号,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}";
+            //日期,店铺订单号,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},{VenderRemark}";
         }
     }
 }

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

@@ -262,7 +262,8 @@ namespace BBWY.Server.Business
                 Profit = oct.Profit,
                 TotalCost = oct.SDCommissionAmount + oct.PlatformCommissionAmount + oct.PurchaseAmount + oct.DeliveryExpressFreight,
                 //PurchaseOrderIds = ods.PurchaseOrderId,
-                OrderState = o.OrderState.Value
+                OrderState = o.OrderState.Value,
+                VenderRemark = o.VenderRemark
             });
 
             var orderIdList = orderSourceList.Select(o => o.OrderId).ToList();
@@ -1541,8 +1542,7 @@ namespace BBWY.Server.Business
         private void SyncJDRefundOrder(JArray refundOrderTokenJArray, ShopResponse shopResponse)
         {
             var validRefundOrderTokenJArray = refundOrderTokenJArray.Where(j => j.Value<int>("status") == 13 && j.Value<decimal>("refoundAmount") != 0M).ToList();
-
-
+            //var orderIds 
         }
 
         public void SyncRefundOrder(ShopResponse shop, string orderId, DateTime? startTime = null, DateTime? endTime = null, bool isAuto = false)

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

@@ -71,5 +71,7 @@ namespace BBWY.Server.Model.Dto
         public Enums.StorageType? StorageType { get; set; }
 
         public Enums.OrderState OrderState { get; set; }
+
+        public string VenderRemark { get; set; }
     }
 }