diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 8d013252..963bd169 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -9,7 +9,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10125"; + ClientVersion = "10126"; } private User user; diff --git a/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs b/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs index c2278421..29d69414 100644 --- a/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs +++ b/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs @@ -88,9 +88,6 @@ namespace BBWY.Client.Models //public bool? IsSubscribeKuaiDi100 { get; set; } = false; - /// - /// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6) - /// public PurchaseOrderState? OrderState { get; set; } /// diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index f9f7c205..9e0ff3b9 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -401,12 +401,41 @@ } /// - /// 采购单状态 待付款 = 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 Settle { 未结算 = 0, diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml index 2ea7916f..4349e0ca 100644 --- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml +++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml @@ -132,14 +132,14 @@ Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待质检:#8080FF:#F2F2F2}" Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待质检:White:#4A4A4A}" Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待质检}"/>--> - - --> + - + + diff --git a/BBWY.Server.API/Controllers/BatchPurchaseController.cs b/BBWY.Server.API/Controllers/BatchPurchaseController.cs index 81eb963d..508217b3 100644 --- a/BBWY.Server.API/Controllers/BatchPurchaseController.cs +++ b/BBWY.Server.API/Controllers/BatchPurchaseController.cs @@ -1,5 +1,6 @@ using BBWY.Server.Business; using BBWY.Server.Model.Dto; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; @@ -109,6 +110,7 @@ namespace BBWY.Server.API.Controllers /// /// [HttpPost] + [AllowAnonymous] public UpdatePackStateResponse UpdatePurchaseOrderState([FromBody] UpdatePurchaseOrderStateRequest request) { return batchPurchaseBusiness.UpdatePurchaseOrderState(request); 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 3ab3a661..87178fea 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs @@ -448,7 +448,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, @@ -661,7 +661,7 @@ namespace BBWY.Server.Business var currentOrderSkuFreightAmount = purchaseOrderSimpleInfo.FreightAmount / belongSkuGroups.Count(); //采购运费(按sku数均分) - var belongSkuBasicInfo = belongSkuBasicInfoList.FirstOrDefault(x=>x.Id == belongSkuGroup.Key); + var belongSkuBasicInfo = belongSkuBasicInfoList.FirstOrDefault(x => x.Id == belongSkuGroup.Key); var purchaseOrderSku = new PurchaseOrderSku() { @@ -712,7 +712,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 = purchaseGroup.PurchasePlatform, ConsigneeContactName = request.Consignee.ContactName, ConsigneeMobile = request.Consignee.Mobile, @@ -832,8 +832,19 @@ namespace BBWY.Server.Business select = select.Where((po, pa) => childSelect.Where(posku => posku.PurchaseOrderId == po.Id).Any()); } - select = select.WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName) - .WhereIf(request.PurchaseOrderState != null, (po, pa) => po.OrderState == request.PurchaseOrderState) + select = select.WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待付款 || + request.PurchaseOrderState == Enums.PurchaseOrderState.打包中 || + request.PurchaseOrderState == Enums.PurchaseOrderState.待完结 || + request.PurchaseOrderState == Enums.PurchaseOrderState.已完成 || + request.PurchaseOrderState == Enums.PurchaseOrderState.已取消, + (po,pa) => po.OrderState == request.PurchaseOrderState) + .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.等待采购, (po,pa) => po.OrderState == Enums.PurchaseOrderState.等待采购 || + po.OrderState == Enums.PurchaseOrderState.部分采购) + .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待发货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待发货 || + po.OrderState == Enums.PurchaseOrderState.部分发货) + .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待收货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待收货 || + po.OrderState == Enums.PurchaseOrderState.部分收货) + .WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName) .WhereIf(request.StartDate != null, (po, pa) => po.CreateTime >= request.StartDate) .WhereIf(request.EndDate != null, (po, pa) => po.CreateTime <= request.EndDate); } @@ -946,13 +957,12 @@ namespace BBWY.Server.Business public UpdatePackStateResponse UpdatePurchaseOrderState(UpdatePurchaseOrderStateRequest request) { - - - - var order = fsql.Select().Where(p => p.Id == request.OrderId).ToOne(); - fsql.Update(order) - .Set(a => a.OrderState, request.PurchaseOrderState) - .ExecuteAffrows(); + // var order = fsql.Select().Where(p => p.Id == request.OrderId).ToOne(); + // fsql.Update(order) + //.Set(a => a.OrderState, request.PurchaseOrderState) + //.ExecuteAffrows(); + // return new UpdatePackStateResponse(); + fsql.Update(request.OrderId).Set(o => o.OrderState, request.PurchaseOrderState).ExecuteAffrows(); return new UpdatePackStateResponse(); } @@ -964,5 +974,6 @@ namespace BBWY.Server.Business .ExecuteAffrows(); return new UpdatePackStateResponse(); } + } } diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs index c5ecae56..784e9920 100644 --- a/BBWY.Server.Model/Enums.cs +++ b/BBWY.Server.Model/Enums.cs @@ -322,17 +322,44 @@ } /// - /// 采购单状态 待付款 = 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 { - 待发布=0,打包中=1,已完成=2 + 待发布 = 0, 打包中 = 1, 已完成 = 2 } public enum IsDeleted @@ -346,7 +373,7 @@ 未结算 = 0, 已结清 = 1 } - + public enum BillOrigin {