diff --git a/BBWY.Server.API/Controllers/PurchaseOrderController.cs b/BBWY.Server.API/Controllers/PurchaseOrderController.cs
index caf9b7c4..72b1669c 100644
--- a/BBWY.Server.API/Controllers/PurchaseOrderController.cs
+++ b/BBWY.Server.API/Controllers/PurchaseOrderController.cs
@@ -88,16 +88,16 @@ namespace BBWY.Server.API.Controllers
purchaseOrderBusiness.CallbackFrom1688(message);
}
- ///
- /// 拳探发货回调
- ///
- ///
- [HttpPost]
- [AllowAnonymous]
- public void QuanTanSendGoodsCallback([FromBody] QuanTanSendGoodsNotifyRequest request)
- {
- purchaseOrderBusiness.QuanTanSendGoodsCallback(request);
- }
+ /////
+ ///// 拳探发货回调
+ /////
+ /////
+ //[HttpPost]
+ //[AllowAnonymous]
+ //public void QuanTanSendGoodsCallback([FromBody] QuanTanSendGoodsNotifyRequest request)
+ //{
+ // purchaseOrderBusiness.QuanTanSendGoodsCallback(request);
+ //}
///
/// 拳探改价回调
@@ -109,16 +109,5 @@ namespace BBWY.Server.API.Controllers
{
purchaseOrderBusiness.QuanTanEditPriceCallback(request);
}
-
- ///
- /// 签收采购单
- ///
- ///
- [HttpPost]
- [AllowAnonymous]
- public void SignPurchaseOrder([FromBody] BBWYBSignCallBackRequest request)
- {
- purchaseOrderBusiness.SignPurchaseOrder(request);
- }
}
}
diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
index c52a4bba..40f33bc5 100644
--- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
+++ b/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
- {
- orderId = payPurchaseOrderRequest.OrderId,
- userAccount = payPurchaseOrderRequest.AppToken
- }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
- if (res.Status == 200)
- {
- PurchaseOrderState purchaseOrder = PurchaseOrderState.待发货;
- switch (res.Data.Status)
- {
- case -1:
- purchaseOrder = PurchaseOrderState.已取消;
- break;
- case 0:
- purchaseOrder = PurchaseOrderState.待发货;
- break;
- case 1:
- purchaseOrder = PurchaseOrderState.待收货;
- break;
- case 2:
-
- case 3:
- purchaseOrder = PurchaseOrderState.已完成;
- break;
- }
- return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = purchaseOrder };
-
- }
+ throw new BusinessException("无需重复支付");
+ //var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest
+ //{
+ // orderId = payPurchaseOrderRequest.OrderId,
+ // userAccount = payPurchaseOrderRequest.AppToken
+ //}, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
+ //if (res.Status == 200)
+ //{
+ // PurchaseOrderState purchaseOrder = PurchaseOrderState.待发货;
+ // switch (res.Data.Status)
+ // {
+ // case -1:
+ // purchaseOrder = PurchaseOrderState.已取消;
+ // break;
+ // case 0:
+ // purchaseOrder = PurchaseOrderState.待发货;
+ // break;
+ // case 1:
+ // purchaseOrder = PurchaseOrderState.待收货;
+ // break;
+ // case 2:
+
+ // case 3:
+ // purchaseOrder = PurchaseOrderState.已完成;
+ // break;
+ // }
+ // 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)
{
diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index c86f3325..12f44cf1 100644
--- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/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(request.OrderId).ToOne();
- if (pv2.OrderState == Enums.PurchaseOrderState.待收货)
- {
- fsql.Update(request.OrderId).Set(p => p.OrderState, Enums.PurchaseOrderState.待质检)
- .Set(p => p.SignTime, DateTime.Now)
- .ExecuteAffrows();
- }
- }
+
+
+
#endregion
///
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 9f5b44e1..dee1c9ae 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/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,
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 917b567c..0d2eb456 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -322,12 +322,39 @@
}
///
- /// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
+ /// 订单状态
+ /// 待付款 = 0
+ /// 等待采购 = 1, 部分采购 = 110
+ /// 待发货 = 2, 部分发货 = 120
+ /// 待收货 = 3, 部分收货 = 130
+ /// 已完成 = 4
+ /// 锁定 = 5
+ /// 已取消 = 6
+ /// 暂停 = 7
+ /// 已退款 = 8
+ /// Unknow = 100
+ /// 打包中 = 140
+ /// 待完结 = 150
///
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
+ }
public enum PackState