状态调整

BBWY.Server.API/Controllers/PurchaseOrderController.cs

@@ -88,16 +88,16 @@ namespace BBWY.Server.API.Controllers
             purchaseOrderBusiness.CallbackFrom1688(message);
         }
 
-        /// <summary>
+        ///// <summary>
-        /// 拳探发货回调
+        ///// 拳探发货回调
-        /// </summary>
+        ///// </summary>
-        /// <param name="request"></param>
+        ///// <param name="request"></param>
-        [HttpPost]
+        //[HttpPost]
-        [AllowAnonymous]
+        //[AllowAnonymous]
-        public void QuanTanSendGoodsCallback([FromBody] QuanTanSendGoodsNotifyRequest request)
+        //public void QuanTanSendGoodsCallback([FromBody] QuanTanSendGoodsNotifyRequest request)
-        {
+        //{
-            purchaseOrderBusiness.QuanTanSendGoodsCallback(request);
+        //    purchaseOrderBusiness.QuanTanSendGoodsCallback(request);
-        }
+        //}
 
         /// <summary>
         /// 拳探改价回调
@@ -109,16 +109,5 @@ namespace BBWY.Server.API.Controllers
         {
             purchaseOrderBusiness.QuanTanEditPriceCallback(request);
         }
-
-        /// <summary>
-        /// 签收采购单
-        /// </summary>
-        /// <param name="request"></param>
-        [HttpPost]
-        [AllowAnonymous]
-        public void SignPurchaseOrder([FromBody] BBWYBSignCallBackRequest request)
-        {
-            purchaseOrderBusiness.SignPurchaseOrder(request);
-        }
     }
 }

BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs

@@ -23,44 +23,44 @@ namespace BBWY.Server.Business
 
         public override PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest)
         {
-
             var qtResponse = quanTanOrderClient.PayOrder(new QuanTanPayOrderRequest
             {
                 orderId = payPurchaseOrderRequest.OrderId,
                 userAccount = payPurchaseOrderRequest.AppToken
             }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
-            if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = PurchaseOrderState.待发货 };
+            if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = PurchaseOrderState.等待采购 };
 
             if (qtResponse.Message != null && qtResponse.Message.Contains("已支付"))
             {
-                var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest
+                throw new BusinessException("无需重复支付");
-                {
+                //var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest
-                    orderId = payPurchaseOrderRequest.OrderId,
+                //{
-                    userAccount = payPurchaseOrderRequest.AppToken
+                //    orderId = payPurchaseOrderRequest.OrderId,
-                }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
+                //    userAccount = payPurchaseOrderRequest.AppToken
-                if (res.Status == 200)
+                //}, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
-                {
+                //if (res.Status == 200)
-                    PurchaseOrderState purchaseOrder = PurchaseOrderState.待发货;
+                //{
-                    switch (res.Data.Status)
+                //    PurchaseOrderState purchaseOrder = PurchaseOrderState.待发货;
-                    {
+                //    switch (res.Data.Status)
-                        case -1:
+                //    {
-                            purchaseOrder = PurchaseOrderState.已取消;
+                //        case -1:
-                            break;
+                //            purchaseOrder = PurchaseOrderState.已取消;
-                        case 0:
+                //            break;
-                            purchaseOrder = PurchaseOrderState.待发货;
+                //        case 0:
-                            break;
+                //            purchaseOrder = PurchaseOrderState.待发货;
-                        case 1:
+                //            break;
-                            purchaseOrder = PurchaseOrderState.待收货;
+                //        case 1:
-                            break;
+                //            purchaseOrder = PurchaseOrderState.待收货;
-                        case 2:
+                //            break;
-
+                //        case 2:
-                        case 3:
+
-                            purchaseOrder = PurchaseOrderState.已完成;
+                //        case 3:
-                            break;
+                //            purchaseOrder = PurchaseOrderState.已完成;
-                    }
+                //            break;
-                    return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = purchaseOrder };
+                //    }
-
+                //    return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = purchaseOrder };
-                }
+
+                //}
 
             }
             if (qtResponse.Message != null && qtResponse.Message.Contains("已删除"))
@@ -72,9 +72,6 @@ namespace BBWY.Server.Business
                 Success = false,
                 Msg = qtResponse.Message
             };
-
-
-
         }
         public override CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request)
         {

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -443,16 +443,9 @@ namespace BBWY.Server.Business
         #endregion
 
         #region bbwyb Callback
-        public void SignPurchaseOrder(BBWYBSignCallBackRequest request)
+
-        {
+
-            var pv2 = fsql.Select<PurchaseOrderV2>(request.OrderId).ToOne();
+
-            if (pv2.OrderState == Enums.PurchaseOrderState.待收货)
-            {
-                fsql.Update<PurchaseOrderV2>(request.OrderId).Set(p => p.OrderState, Enums.PurchaseOrderState.待质检)
-                                                             .Set(p => p.SignTime, DateTime.Now)
-                                                             .ExecuteAffrows();
-            }
-        }
         #endregion
 
         /// <summary>

BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@@ -367,7 +367,7 @@ namespace BBWY.Server.Business
                     {
                         Id = createOrderResponse.PurchaseOrderId,
                         ShopId = request.ShopId,
-                        OrderState = createOrderResponse.IsPay ? Enums.PurchaseOrderState.待发货 : Enums.PurchaseOrderState.待付款,
+                        OrderState = createOrderResponse.IsPay ? Enums.PurchaseOrderState.等待采购 : Enums.PurchaseOrderState.待付款,
                         PurchasePlatform = purchasePlatform,
                         ConsigneeContactName = request.Consignee.ContactName,
                         ConsigneeMobile = request.Consignee.Mobile,

BBWY.Server.Model/Enums.cs

@@ -322,11 +322,38 @@
         }
 
         /// <summary>
-        /// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
+        /// 订单状态 
+        /// <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 PurchaseOrderState
         {
-            待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
+            /*待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/
+            待付款 = 0,
+            等待采购 = 1,
+            部分采购 = 110,
+            待发货 = 2,
+            部分发货 = 120,
+            待收货 = 3,
+            部分收货 = 130,
+            已完成 = 4,
+            锁定 = 5,
+            已取消 = 6,
+            暂停 = 7,
+            已退款 = 8,
+            Unknow = 100,
+            打包中 = 140,
+            待完结 = 150
     }