Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -217,8 +217,7 @@ namespace BBWYB.Server.Business
                 #endregion
 
                 #region 处理SKU
-                var orderSkuList = fsql.Select<OrderSku>().Where(osku => osku.Price != 0 &&
-                                                                         orderIdList.Contains(osku.OrderId)).ToList<OrderSkuResponse>();
+                var orderSkuList = fsql.Select<OrderSku>().Where(osku => orderIdList.Contains(osku.OrderId)).ToList<OrderSkuResponse>();
                 foreach (var order in orderList)
                 {
                     order.ItemList = orderSkuList.Where(osku => osku.OrderId == order.Id).ToList();

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -253,7 +253,7 @@ namespace BBWYB.Server.Business
 
 
             var isRepurchase = fsql.Select<OrderCost>(dbOrder.Id).Any();
-            var orderSkus = fsql.Select<OrderSku>().Where(osku => osku.Price != 0 && osku.OrderId == request.OrderId).ToList();
+            var orderSkus = fsql.Select<OrderSku>().Where(osku => osku.OrderId == request.OrderId).ToList();
             var orderPurchaseInfoList = fsql.Select<OrderPurchaseInfo>().Where(opi => opi.OrderId == request.OrderId && opi.IsEnabled == true).ToList();
 
             var extJArray = JsonConvert.DeserializeObject<JArray>(request.Extensions);