调整

Bailun.DC.Models/Api/mPlatformSkuSales.cs

@@ -6,26 +6,51 @@ namespace Bailun.DC.Models.Api
 {
     public class mPlatformSkuSales
     {
+        /// <summary>
+        /// 平台类型
+        /// </summary>
         public string platform { get; set; }
 
+        /// <summary>
+        /// 站点
+        /// </summary>
         public string website { get; set; }
 
+        /// <summary>
+        /// 销售帐号
+        /// </summary>
         public string seller_account { get; set; }
 
+        /// <summary>
+        /// 销售帐号id
+        /// </summary>
         public int accountid { get; set; }
 
+        /// <summary>
+        /// 平台sku列表
+        /// </summary>
         public List<PlatformSku> platform_skus { get; set; }
 
     }
 
     public class PlatformSku { 
 
+        /// <summary>
+        /// 平台sku编码
+        /// </summary>
         public string platformsku { get; set; }
 
+        /// <summary>
+        /// 售价
+        /// </summary>
         public decimal price { get; set; }
 
+        
         public string itemid { get; set; }
 
+        /// <summary>
+        /// 对应的百伦sku
+        /// </summary>
         public List<BLSkuInfo> listSku { get; set; }
     }
 

Bailun.DC.Services/OrdersServices.cs

@@ -7930,7 +7930,7 @@ namespace Bailun.DC.Services
         /// <returns></returns>
         public List<dc_base_oms_platform_sku> ListOrderPlatformSku(DateTime start, DateTime end, int page, int pagesize, string platform,ref int total)
         {
-            var sql = $@"select t1.origin_order_id,t1.bailun_order_id,t1.website,t1.platform_type,t1.seller_name,t1.platform_sku_quantity_ordered,t1.platform_sku_unit_price,t1.platform_sku,t1.order_currency,t1.item_id from dc_base_oms_platform_sku t1 where t1.bailun_order_status != 'Canceled' and t1.has_delete = 0 and t1.has_cancle = 0 and t1.create_time_site >= '{start.ToString("yyyy-MM-dd")}' and t1.create_time_site < '{end.AddDays(1).ToString("yyyy-MM-dd")}'";
+            var sql = $@"select t1.origin_order_id,t1.bailun_order_id,t1.website,t1.platform_type,t1.seller_name,t1.bailun_account_id,t1.platform_sku_quantity_ordered,t1.platform_sku_unit_price,t1.platform_sku,t1.order_currency,t1.item_id from dc_base_oms_platform_sku t1 where t1.bailun_order_status != 'Canceled' and t1.has_delete = 0 and t1.has_cancle = 0 and t1.create_time_site >= '{start.ToString("yyyy-MM-dd")}' and t1.create_time_site < '{end.AddDays(1).ToString("yyyy-MM-dd")}'";
 
             if(!string.IsNullOrEmpty(platform))
             {

Bailun.DC.Web/Controllers/ApiController.cs

@@ -1226,7 +1226,7 @@ namespace Bailun.DC.Web.Controllers
 
                 foreach (var s in m.platform_skus)
                 {
-                    var mapskus = listMapInfo.Where(a => a.plat == m.platform && a.itemId == s.itemid && a.platSku == s.platformsku && a.accountId == m.accountid).ToList();
+                    var mapskus = listMapInfo.Where(a => a.plat.ToLower() == m.platform.ToLower() && a.platSku.ToLower() == s.platformsku.ToLower()).ToList();
                     var orders = listOrders.Where(a => a.bailun_order_id == item.Key).ToList();
                     
                     foreach(var map in mapskus)