订单状态处理

BBWYB.Server.Business/Extensions/OrderStateExtension.cs

@@ -0,0 +1,25 @@
+
+
+using BBWYB.Server.Model;
+using BBWYB.Server.Model.Db;
+
+namespace BBWYB.Server.Business
+{
+    public static class OrderStateExtension
+    {
+        /// <summary>
+        /// 计算订单状态
+        /// </summary>
+        /// <param name="order"></param>
+        /// <param name="orderSkuList"></param>
+        /// <param name="orderPurchaseInfoList"></param>
+        /// <returns></returns>
+        public static Enums.OrderState CalculationOrderState(this Order order,
+                                                             IList<OrderSku> orderSkuList,
+                                                             IList<OrderPurchaseInfo> orderPurchaseInfoList)
+        {
+
+            return Enums.OrderState.Unknow;
+        }
+    }
+}

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -342,6 +342,7 @@ namespace BBWYB.Server.Business
                     PurchaseAccountId = purchaseAccount.Id,
                     PurchaseAccountName = purchaseAccount.AccountName,
                     PurchaseMethod = Enums.PurchaseMethod.线上采购,
+                    OrderState = Enums.PurchaseOrderState.待发货,
                     PurchaseOrderId = createOrderResponse.OrderId,
                     PurchasePlatform = cargoParamGroup.PurchasePlatform,
                     PurchaserId = cargoParamGroup.PurchaserId,
@@ -401,10 +402,7 @@ namespace BBWYB.Server.Business
                     fsql.Update<OrderPurchaseInfo>(updatePurchaseOrderIdList).Set(opi => opi.IsEnabled, false).ExecuteAffrows();
                 if (updateOrderCostDetailIdList.Count() > 0)
                     fsql.Update<OrderCostDetail>(updateOrderCostDetailIdList).Set(ocd => ocd.IsEnabled, false).ExecuteAffrows();
-            });
 
-            fsql.Transaction(() =>
-            {
                 fsql.Insert(insertOrderCostDetails).ExecuteAffrows();
                 fsql.Insert(insertOrderPurchaseInfos).ExecuteAffrows();
                 fsql.Insert(insertOrderPurchaseSkuInfos).ExecuteAffrows();
@@ -655,6 +653,7 @@ namespace BBWYB.Server.Business
                         BelongSkuIds = string.Join(",", purchaseOrder.AssocationOrderCostDetailList.Select(x => x.SkuId)),
                         CreateTime = DateTime.Now,
                         PurchaseMethod = Enums.PurchaseMethod.关联外部单,
+                        OrderState = Enums.PurchaseOrderState.待发货,
                         PurchaseOrderId = purchaseOrder.PurchaseOrderId,
                         PurchasePlatform = purchaseOrder.PurchasePlatform,
                         PurchaserId = purchaseOrder.PurchaserId,
@@ -796,6 +795,7 @@ namespace BBWYB.Server.Business
             {
                 fsql.Update<OrderPurchaseInfo>()
                     .Set(opi => opi.IsEnabled, false)
+                    .Set(opi => opi.OrderState, Enums.PurchaseOrderState.已取消)
                     .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId)
                     .ExecuteAffrows();
 

BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@@ -175,21 +175,21 @@ namespace BBWYB.Server.Business.Sync
                     }
                     else
                     {
-                        var updateOrderState = false;
+                        Enums.OrderState? updateOrderState = null;
-                        //var updateWaybillNo = false;
-                        //var updateExpressName = false;
                         var updateModifyTime = false;
                         var updateBuyerRemark = false;
                         var updateVenderRemark = false;
                         var updateBuyerAccount = false;
                         var updateOrderSn = false;
 
-                        if (dbOrder.OrderState != orderState)
+                        #region 订单状态脱离拳探 只处理付款和取消
-                            updateOrderState = true;
+                        if (dbOrder.OrderState == Enums.OrderState.待付款 && orderState != Enums.OrderState.待付款)
-                        //if (dbOrder.WaybillNo != qtOrder.DeliveryResponse.WayBillNo)
+                            updateOrderState = Enums.OrderState.等待采购;
-                        //    updateWaybillNo = true;
+
-                        //if (dbOrder.ExpressName != qtOrder.DeliveryResponse.ExpressName)
+                        if (dbOrder.OrderState != Enums.OrderState.已取消 && orderState == Enums.OrderState.已取消)
-                        //    updateExpressName = true;
+                            updateOrderState = Enums.OrderState.已取消;
+                        #endregion
+
                         if (dbOrder.ModifyTime != qtOrder.ModifyTime)
                             updateModifyTime = true;
                         if (dbOrder.BuyerRemark != qtOrder.BuyerRemark)
@@ -201,11 +201,9 @@ namespace BBWYB.Server.Business.Sync
                         if (dbOrder.OrderSn != qtOrder.OrderSn)
                             updateOrderSn = true;
 
-                        if (updateOrderState || updateModifyTime || updateBuyerRemark || updateVenderRemark || updateBuyerAccount || updateOrderSn)
+                        if (updateOrderState != null || updateModifyTime || updateBuyerRemark || updateVenderRemark || updateBuyerAccount || updateOrderSn)
                         {
-                            var update = fsql.Update<Model.Db.Order>(dbOrder.Id).SetIf(updateOrderState, o => o.OrderState == orderState)
+                            var update = fsql.Update<Model.Db.Order>(dbOrder.Id).SetIf(updateOrderState != null, o => o.OrderState, orderState)
-                                                                                //.SetIf(updateWaybillNo, o => o.WaybillNo, qtOrder.DeliveryResponse.WayBillNo)
-                                                                                //.SetIf(updateExpressName, o => o.ExpressName, qtOrder.DeliveryResponse.ExpressName)
                                                                                 .SetIf(updateModifyTime, o => o.ModifyTime, qtOrder.ModifyTime)
                                                                                 .SetIf(updateBuyerRemark, o => o.BuyerRemark, qtOrder.BuyerRemark)
                                                                                 .SetIf(updateVenderRemark, o => o.VenderRemark, qtOrder.VenderRemark)

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

@@ -106,6 +106,12 @@ namespace BBWYB.Server.Model.Db
         /// </summary>
         [Column(DbType = "bit")]
         public bool? IsSign { get; set; } = false;
+
+        /// <summary>
+        /// 꽃뭔데榴檄
+        /// </summary>
+        [Column(MapType = typeof(int?))]
+        public Enums.PurchaseOrderState? OrderState { get; set; }
     }
 
 }

BBWYB.Server.Model/Enums.cs

@@ -72,23 +72,53 @@
         }
 
         /// <summary>
-        /// 订单状态 待付款 = 0,等待采购 = 1,待出库 = 2,待收货 = 3,已完成 = 4,锁定 = 5,已取消 = 6,暂停 = 7,已退款 = 8,Unknow = 100
+        /// 订单状态 
+        /// <para>待付款 = 0</para>
+        /// <para>等待采购 = 1, 部分采购 = 110</para>
+        /// <para>待发货 = 2, 部分发货 = 120</para>
+        /// <para>待收货 = 3, 部分收货 = 130</para>
+        /// <para>已完成 = 4</para>
+        /// <para>锁定 = 5</para>
+        /// <para>已取消 = 6</para>
+        /// <para>暂停 = 7</para>
+        /// <para>已退款 = 8</para>
+        /// <para>Unknow = 100</para>
+        /// <para>打包中 = 140</para>
+        /// <para>待完结 = 150</para>
         /// </summary>
         public enum OrderState
         {
             待付款 = 0,
             等待采购 = 1,
-            待出库 = 2,
+            部分采购 = 110,
+            待发货 = 2,
+            部分发货 = 120,
             待收货 = 3,
+            部分收货 = 130,
             已完成 = 4,
             锁定 = 5,
             已取消 = 6,
             暂停 = 7,
             已退款 = 8,
-            Unknow = 100
+            Unknow = 100,
+            打包中 = 140,
+            待完结 = 150
+
             //待配置 = 101,
         }
 
+        /// <summary>
+        /// 采购单状态 待发货 = 0, 待收货 = 10, 已签收 = 20, 已取消 = 100
+        /// </summary>
+        public enum PurchaseOrderState
+        {
+            待发货 = 0,
+            待收货 = 10,
+            已签收 = 20,
+            已取消 = 100
+            //部分签收 = 21,
+        }
+
         /// <summary>
         /// 刷单类型
         /// </summary>