退款明细导出财务格式时，增加站点和交易号字段

Bailun.DC.Models/Orders/mRefundForFinance.cs

@@ -16,6 +16,8 @@ namespace Bailun.DC.Models.Orders
         /// </summary>
         public string origin_order_id { get; set; }
 
+        public string trancation_id { get; set; }
+
         /// <summary>
         /// 退款时间
         /// </summary>
@@ -61,6 +63,8 @@ namespace Bailun.DC.Models.Orders
         /// </summary>
         public string order_currency { get; set; }
 
+        public string website { get; set; }
+
     }
 
 }

Bailun.DC.Services/OrdersServices.cs

@@ -5843,7 +5843,7 @@ namespace Bailun.DC.Services
         public List<mRefundForFinance> ListRefundForFinance(DateTime start,DateTime end)
         {
             var sql = $@"select * from (
-                        select distinct t1.platform_type,CONCAT('`',t1.origin_order_id) as origin_order_id,t1.refund_time,t1.amount_refund,t1.order_currency as currency,t1.shipping_status,t1.bailun_sku,t4.financecategoryname,t2.shipping_time,t1.order_total_amount,t6.order_currency
+                        select distinct t1.platform_type,CONCAT('`',t1.origin_order_id) as origin_order_id,t1.refund_time,t1.amount_refund,t1.order_currency as currency,t1.shipping_status,t1.bailun_sku,t4.financecategoryname,t2.shipping_time,t1.order_total_amount,t6.order_currency,t6.website,t6.transaction_id as trancation_id
                         from dc_base_crm_refund t1
                         left join dc_base_oms_order t6 on t1.origin_order_id=t6.origin_order_id
                         left join dc_base_oms_pick t2 on t1.origin_order_id=t2.origin_order_id and t1.bailun_sku=t2.bailun_sku and t2.has_delete=0 and t2.shipping_status='TotalShipping'
@@ -5851,7 +5851,7 @@ namespace Bailun.DC.Services
                         left join dc_base_sku_finance_category t4 on t3.bailun_category_id=t4.bailuncategoryid
                         where t1.refund_time>='{start.ToString("yyyy-MM-dd")}' and t1.refund_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' and t1.platform_type!='Ebay' and t1.is_deleted=0
                         union all
-                        select t1.platform_type,CONCAT('`',t1.origin_order_id) as origin_order_id,t1.refund_time,t1.amount_refund,t1.order_currency as currency,t1.shipping_status,t1.bailun_sku,t4.financecategoryname,t2.shipping_time,t1.order_total_amount,t6.order_currency
+                        select t1.platform_type,CONCAT('`',t1.origin_order_id) as origin_order_id,t1.refund_time,t1.amount_refund,t1.order_currency as currency,t1.shipping_status,t1.bailun_sku,t4.financecategoryname,t2.shipping_time,t1.order_total_amount,t6.order_currency,t6.website,t6.transaction_id
                         from dc_base_crm_refund t1
                         left join dc_base_oms_order t6 on t1.origin_order_id=t6.transaction_id
                         left join dc_base_oms_pick t2 on t6.origin_order_id=t2.origin_order_id and t1.bailun_sku=t2.bailun_sku and t2.has_delete=0 and t2.shipping_status='TotalShipping'

Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs

@@ -2933,24 +2933,29 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             return File(ms, "text/csv", filename + ".csv");
         }
 
-
+        /// <summary>
+        /// 导出退款明细（财务格式）
+        /// </summary>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <returns></returns>
         public ActionResult ExportRefundOrder(DateTime start,DateTime end)
         {
             var _service = new Services.OrdersServices();
             var obj = _service.ListRefundForFinance(start, end);
 
-            var colNames = new List<string> {"平台","单号(交易号)","退款时间", "退款金额(原币)", "币种",
+            var colNames = new List<string> {"平台","单号","交易号","退款时间", "退款金额(原币)", "币种",
                                              "发货状态", "Sku","财务分类","发货时间","订单金额",
-                                             "订单币种"
+                                             "订单币种","站点"
             };
 
             var listVal = new List<string>();
             foreach (var item in obj)
             {
                 listVal.Add(
-                    item.platform_type + "|" + item.origin_order_id + "|" + item.refund_time.ToString("yyyy-MM-dd HH:mm:ss") + "|" + item.amount_refund + "|" + item.currency + "|" +
+                    item.platform_type + "|" + item.origin_order_id +"|"+item.trancation_id+ "|" + item.refund_time.ToString("yyyy-MM-dd HH:mm:ss") + "|" + item.amount_refund + "|" + item.currency + "|" +
                     item.shipping_status + "|" + item.bailun_sku+"|"+item.financecategoryname+"|"+(item.shipping_time?.ToString("yyyy-MM-dd HH:mm:ss")??"")+"|"+item.order_total_amount+
-                    "|"+item.order_currency
+                    "|"+item.order_currency+"|"+item.website
                     );
             }