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

BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs

@@ -699,7 +699,8 @@ namespace BBWY.Server.Business
         public void DeletePromotionTaskAndJDTask(DeletePromotionTaskRequest request)
         {
             var dbPromotionTask = fsql.Select<PromotionTask>(request.TaskId).ToOne();
-
+            if (dbPromotionTask.IsEnabled == false)
+                return;
             fsql.Transaction(() =>
             {
                 //fsql.Delete<PromotionTask>(request.TaskId).ExecuteAffrows();
@@ -709,6 +710,9 @@ namespace BBWY.Server.Business
 
             //if (dbPromotionTask.Status != Enums.PromitionTaskStatus.等待)
             //{
+
+            if (dbPromotionTask.PromotionId != null && dbPromotionTask.PromotionId != 0)
+            {
                 var httpResult = restApiService.SendRequest(GetPlatformRelayAPIHost(Enums.Platform.京东),
                                                            "api/platformsdk/DeleteJDPromotionTask",
                                                            new DeleteJDPromotionTaskRequest()
@@ -726,6 +730,7 @@ namespace BBWY.Server.Business
                 var response = JsonConvert.DeserializeObject<ApiResponse>(httpResult.Content);
                 if (!response.Success)
                     throw new BusinessException($"【{dbPromotionTask.ActivityName}】评价助手活动删除成功,JD活动删除失败,请手动到JD后台删除,并通知技术员分析失败原因,{response.Msg}");
+            }
             //}
         }
 

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -80,7 +80,7 @@ namespace BBWY.Server.Business
                                .WhereIf(searchOrderRequest.IncludeExceptionOrder,
                                         (o, ocs, oct, sh) => o.OrderState != Enums.OrderState.已取消 &&
                                                          ((o.StorageType != Enums.StorageType.SD && o.StorageType != null && oct.PurchaseAmount == 0M) ||
-                                                         (o.StorageType != Enums.StorageType.SD && oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) ||
+                                                         (o.StorageType != Enums.StorageType.SD && oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice + o.PingTaiChengDanYouHuiQuan) ||
                                                          (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购)))
                                .WhereIf(searchOrderRequest.OnlyDF, (o, ocs, oct, sh) => o.StorageType == Enums.StorageType.代发)
                                .WhereIf(searchOrderRequest.ExcludeCanceled, (o, ocs, oct, sh) => o.OrderState != Enums.OrderState.已取消)

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -375,7 +375,7 @@ namespace BBWY.Server.Business
                                                             o.IsGift == false &&
                                                             o.OrderState != Enums.OrderState.已取消 &&
                                                             ((o.StorageType != Enums.StorageType.SD && o.StorageType != null && oc.PurchaseAmount == 0M) ||
-                                                             (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) ||
+                                                             (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice + o.PingTaiChengDanYouHuiQuan) ||
                                                              (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购))).Count();
 
             response.WaitOutStoreCount = fsql.Select<Order>().Where(o => o.ShopId == shopId && o.OrderState == Enums.OrderState.待出库 && o.StartTime >= dt &&

BBWY.Server.Business/TestBusiness.cs

@@ -189,6 +189,7 @@ namespace BBWY.Server.Business
                                                       o.StartTime >= request.StartTime &&
                                                       o.StartTime <= request.EndTime)
                                           .WhereIf(!string.IsNullOrEmpty(request.OrderId), o => o.Id == request.OrderId)
+                                          .WhereIf(request.OrderIdList != null && request.OrderIdList.Count() > 0, o => request.OrderIdList.Contains(o.Id))
                                           .OrderByDescending(o => o.StartTime)
                                           .ToList(o => o.Id);
 

BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace BBWY.Server.Model.Dto
 {
@@ -11,5 +12,7 @@ namespace BBWY.Server.Model.Dto
         public long? ShopId { get; set; }
 
         public string OrderId { get; set; }
+
+        public List<string> OrderIdList { get; set; }
     }
 }