ebay平台按币种合并金额显示，etsy币种改为港币

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

@@ -10633,7 +10633,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="715",creator = "张滢萍",subject_no="2203",customer_no="030j3",currency="USD",currencyname="美元",website="",text="eBay-paypal平台发货确认收入",},
 
 
-                new mPlatformAccountingSetting{ platform_type="Etsy",cert_id="721",creator = "张滢萍",subject_no="2203",customer_no="30001",currency="USD",currencyname="美元",website="US",text="Etsy平台发货确认收入",projectno="28001"},
+                new mPlatformAccountingSetting{ platform_type="Etsy",cert_id="721",creator = "张滢萍",subject_no="2203",customer_no="30001",currency="HKD",currencyname="港元",website="US",text="Etsy平台发货确认收入",projectno="28001"},
 
                 new mPlatformAccountingSetting{ platform_type="Fyndiq",cert_id="722",creator = "张滢萍",subject_no="2203",customer_no="31001",currency="SEK",currencyname="瑞典克朗",website="SE",text="Fyniq平台发货确认收入",projectno="30001"},
 
@@ -10668,6 +10668,31 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             var day = DateTime.Parse(month + "-01");
             var list = new List<string>();
+
+            var listEbay = result.Where(a => a.platform_type.ToLower() == "ebay").ToList();
+            result = result.Where(a => a.platform_type.ToLower() != "ebay").ToList();
+
+            foreach (var item in listEbay.GroupBy(a=>a.currency))
+            {
+                foreach(var _financename in item.GroupBy(f=>f.financecategoryname))
+                {
+                    var _first = _financename.FirstOrDefault();
+                    var _m = new dc_month_shipping_incoming
+                    {
+                        platform_type = _first.platform_type,
+                        website = "",
+                        amount = _financename.Sum(b => b.amount),
+                        createtime = _first.createtime,
+                        currency = item.Key,
+                        financecategoryname = _financename.Key,
+                        month = _first.month,
+                    };
+
+                    result.Add(_m);
+                }
+                
+            }
+
             foreach (var item in result)
             {