修正订单矫正

BBWY.Server.Business/BillCorrection/BillCorrectionBusiness.cs

@@ -36,31 +36,55 @@ namespace BBWY.Server.Business
             var orderIds = orderList.Select(o => o.OrderId).ToList();
             var sdOrderIds = orderList.Where(o => o.StorageType == Model.Enums.StorageType.SD).Select(o => o.OrderId).ToArray();
 
-            var orderCostDetailList = fsql.Select<OrderCostDetail>()
-                                          .Where(ocd => orderIds.Contains(ocd.OrderId) && ocd.IsEnabled == true)
-                                          .GroupBy(ocd => ocd.OrderId)
-                                          .ToList(g => new
-                                          {
-                                              OrderId = g.Key,
-                                              DeliveryExpressFreight = g.Sum(g.Value.DeliveryExpressFreight),
-                                              SkuAmount = g.Sum(g.Value.SkuAmount),
-                                              PurchaseFreight = g.Sum(g.Value.PurchaseFreight),
-                                              FirstFreight = g.Sum(g.Value.FirstFreight),
-                                              InStorageAmount = g.Sum(g.Value.InStorageAmount),
-                                              OutStorageAmount = g.Sum(g.Value.OutStorageAmount),
-                                              ConsumableAmount = g.Sum(g.Value.ConsumableAmount),
-                                              StorageAmount = g.Sum(g.Value.StorageAmount)
-                                          });
+            //var orderCostDetailList = fsql.Select<OrderCostDetail>()
+            //                              .Where(ocd => orderIds.Contains(ocd.OrderId) && ocd.IsEnabled == true)
+            //                              .GroupBy(ocd => ocd.OrderId)
+            //                              .ToList(g => new
+            //                              {
+            //                                  OrderId = g.Key,
+            //                                  DeliveryExpressFreight = g.Sum(g.Value.DeliveryExpressFreight),
+            //                                  SkuAmount = g.Sum(g.Value.SkuAmount),
+            //                                  PurchaseFreight = g.Sum(g.Value.PurchaseFreight),
+            //                                  FirstFreight = g.Sum(g.Value.FirstFreight),
+            //                                  InStorageAmount = g.Sum(g.Value.InStorageAmount),
+            //                                  OutStorageAmount = g.Sum(g.Value.OutStorageAmount),
+            //                                  ConsumableAmount = g.Sum(g.Value.ConsumableAmount),
+            //                                  StorageAmount = g.Sum(g.Value.StorageAmount)
+            //                              });
+            var orderCostDetailList = fsql.Select<OrderCostDetail, Order>().InnerJoin((ocd, o) => ocd.OrderId == o.Id)
+                                                                           .Where((ocd, o) => ocd.IsEnabled == true)
+                                                                           .Where((ocd, o) => request.ShopIds.Contains(o.ShopId) &&
+                                                                                              o.StartTime >= request.StartTime &&
+                                                                                              o.StartTime <= request.EndTime &&
+                                                                                              o.IsGift == false)
+                                                                           .GroupBy((ocd, o) => ocd.OrderId)
+                                                                           .ToList(g => new
+                                                                           {
+                                                                               OrderId = g.Key,
+                                                                               DeliveryExpressFreight = g.Sum(g.Value.Item1.DeliveryExpressFreight),
+                                                                               SkuAmount = g.Sum(g.Value.Item1.SkuAmount),
+                                                                               PurchaseFreight = g.Sum(g.Value.Item1.PurchaseFreight),
+                                                                               FirstFreight = g.Sum(g.Value.Item1.FirstFreight),
+                                                                               InStorageAmount = g.Sum(g.Value.Item1.InStorageAmount),
+                                                                               OutStorageAmount = g.Sum(g.Value.Item1.OutStorageAmount),
+                                                                               ConsumableAmount = g.Sum(g.Value.Item1.ConsumableAmount),
+                                                                               StorageAmount = g.Sum(g.Value.Item1.StorageAmount)
+                                                                           });
+
 
             var sdOrderCostList = fsql.Select<OrderCost>(sdOrderIds).ToList();
 
-            var afterOrderList = fsql.Select<AfterSaleOrder>()
-                                     .Where(aso => orderIds.Contains(aso.OrderId))
-                                     .GroupBy(aso => aso.OrderId)
+            var afterOrderList = fsql.Select<AfterSaleOrder, Order>()
+                                     .InnerJoin((aso, o) => aso.OrderId == o.Id)
+                                     .Where((aso, o) => request.ShopIds.Contains(o.ShopId) &&
+                                                      o.StartTime >= request.StartTime &&
+                                                      o.StartTime <= request.EndTime &&
+                                                      o.IsGift == false)
+                                     .GroupBy((aso, o) => aso.OrderId)
                                      .ToList(g => new
                                      {
                                          OrderId = g.Key,
-                                         AfterTotalCost = g.Sum(g.Value.AfterTotalCost)
+                                         AfterTotalCost = g.Sum(g.Value.Item1.AfterTotalCost)
                                      });
 
             foreach (var order in orderList)