采购单 订单增加平价标识

BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs

@@ -126,7 +126,7 @@ namespace BBWYB.Server.Business
                     PurchaseFreight = osc.PurchaseFreight,
                     SkuAmount = osc.SkuAmount,
                     TotalCost = osc.PurchaseFreight + osc.SkuAmount,
-                    Profit = ((osku.Price * osku.ItemTotal) ?? 0M) - osc.PurchaseFreight - osc.SkuAmount
+                    Profit = ((osku.Price * osku.ItemTotal) ?? 0M) + osku.BuyerPayFreight - osc.PurchaseFreight - osc.SkuAmount
                 };
                 insertOrderSkuCostList.Add(insert);
             }

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -179,7 +179,7 @@ namespace BBWYB.Server.Business
                 InPackAmount = o.InPackAmount,
                 IsWaitPack = o.IsWaitPack,
                 IntoStoreType = o.IntoStoreType,
-                PayTime = o.PayTime,
+                PayTime = o.PayTime
 
                 ContactName = ocs.ContactName,
                 Address = ocs.Address,
@@ -289,6 +289,25 @@ namespace BBWYB.Server.Business
                         orderPurchaseInfo.OrderPurchaseSkuInfoList = orderPurchaseSkuInfoList.Where(opsi => opsi.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList();
                         orderPurchaseInfo.PurchaseExpressOrderList = purchaseExpressOrderList.Where(peo => peo.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList();
                     }
+
+                    if (order.OrderPurchaseInfoList != null && order.OrderPurchaseInfoList.Count() > 0)
+                    {
+                        if (order.OrderState == Enums.OrderState.部分采购 &&
+                            order.OrderPurchaseInfoList.Any(opi => opi.IsAutoEditOrderPrice == Enums.AutoEditOrderPriceType.已平价))
+                        {
+                            order.IsAutoEditOrderPrice = Enums.AutoEditOrderPriceType.部分平价;
+                            continue;
+                        }
+
+                        var opiCount = order.OrderPurchaseInfoList.Count();
+                        var pjCount = order.OrderPurchaseInfoList.Count(opi => opi.IsAutoEditOrderPrice == Enums.AutoEditOrderPriceType.已平价);
+                        if (pjCount == 0)
+                            order.IsAutoEditOrderPrice = Enums.AutoEditOrderPriceType.未平价;
+                        if (opiCount == pjCount)
+                            order.IsAutoEditOrderPrice = Enums.AutoEditOrderPriceType.已平价;
+                        else if (opiCount > pjCount)
+                            order.IsAutoEditOrderPrice = Enums.AutoEditOrderPriceType.部分平价;
+                    }
                 }
                 #endregion
 

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -2810,7 +2810,7 @@ namespace BBWYB.Server.Business
             bool isEditOrderPrice = true;
             try
             {
-                var orderPurchaseInfo = fsql.Select<OrderPurchaseInfo>().Where(opi => opi.PurchaseOrderId == purchaseOrderId).ToOne();
+                var orderPurchaseInfo = fsql.Select<OrderPurchaseInfo>().Where(opi => opi.PurchaseOrderId == purchaseOrderId && opi.IsEnabled == true).ToOne();
                 if (orderPurchaseInfo == null)
                     throw new Exception($"采购单{purchaseOrderId}-未查询到采购单");
 
@@ -2862,6 +2862,8 @@ namespace BBWYB.Server.Business
 
                 IList<OP_EditPriceSkuRequest> op_EditPriceSkuRequests = new List<OP_EditPriceSkuRequest>();
 
+                IUpdate<OrderPurchaseInfo> updatePurchaseOrder = null;
+
                 var ppclient = ppPlatformClientFactory.GetClient(AdapterEnums.PlatformType.阿里巴巴);
 
                 var totalPurchaseProductAmount = 0M;
@@ -2944,6 +2946,8 @@ namespace BBWYB.Server.Business
                     updateOrder = fsql.Update<Order>(dbOrder.Id).Set(o => o.OrderTotalPrice, dbOrder.OrderTotalPrice)
                                                                 .Set(o => o.OrderSellerPrice, dbOrder.OrderSellerPrice)
                                                                 .Set(o => o.FreightPrice, dbOrder.FreightPrice);
+
+                    updatePurchaseOrder = fsql.Update<OrderPurchaseInfo>(orderPurchaseInfo.Id).Set(opi => opi.IsAutoEditOrderPrice, Enums.AutoEditOrderPriceType.已平价);
                 }
 
                 #region 订单Sku成本
@@ -2983,6 +2987,7 @@ namespace BBWYB.Server.Business
 
                 fsql.Transaction(() =>
                 {
+                    updatePurchaseOrder?.ExecuteAffrows();
                     foreach (var update in updateOrderCostDetailList)
                         update.ExecuteAffrows();
                     updateOrderCost?.ExecuteAffrows();

BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs

@@ -83,6 +83,12 @@ namespace BBWYB.Server.Model.Db
         /// </summary>
         [Column(MapType = typeof(int?))]
         public Enums.PurchaseOrderState? OrderState { get; set; }
+
+        /// <summary>
+        /// 是否平价
+        /// </summary>
+        [Column(MapType = typeof(int?))]
+        public Enums.AutoEditOrderPriceType? IsAutoEditOrderPrice { get; set; }
     }
 
 }

BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs

@@ -152,6 +152,8 @@
         public Enums.PackConfigState? PackConfigState { get; set; }
 
         public Enums.IntoStoreType? IntoStoreType { get; set; }
+
+        public Enums.AutoEditOrderPriceType? IsAutoEditOrderPrice { get; set; }
     }
 
     public class OrderListResponse

BBWYB.Server.Model/Enums.cs

@@ -314,5 +314,13 @@
         {
             采购任务 = 0, 合格证拟定任务 = 10, 合格证补充任务 = 11, 待核算任务 = 20
         }
+
+        /// <summary>
+        /// 平价状态 未平价=0 已平价=1 部分平价=2
+        /// </summary>
+        public enum AutoEditOrderPriceType
+        {
+            未平价 = 0, 已平价 = 1, 部分平价 = 2
+        }
     }
 }