From 07941b3b094f31a047e46d9d22876dff78c00991 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 10 Jan 2024 16:43:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/VenderController.cs | 10 +++++----- BBWYB.Server.Business/Vender/VenderBusiness.cs | 11 ++++++++--- .../Vender/QueryPurchaseAccountRequest.cs | 14 ++++++++++++++ .../Dto/Request/Vender/ShopSettingRequest.cs | 18 +++++++++++++++--- 4 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 BBWYB.Server.Model/Dto/Request/Vender/QueryPurchaseAccountRequest.cs diff --git a/BBWYB.Server.API/Controllers/VenderController.cs b/BBWYB.Server.API/Controllers/VenderController.cs index d2d296c..df3a8e3 100644 --- a/BBWYB.Server.API/Controllers/VenderController.cs +++ b/BBWYB.Server.API/Controllers/VenderController.cs @@ -29,14 +29,14 @@ namespace BBWYB.Server.API.Controllers } /// - /// 获取店铺下的采购账号 + /// 查询采购账号列表 /// - /// + /// /// - [HttpGet] - public IList GetPurchaserListByShopId([FromBody]long shopId) + [HttpPost] + public IList GetPurchaserListByShopId([FromBody] QueryPurchaseAccountRequest request) { - return venderBusiness.GetPurchaserListByShopId(shopId); + return venderBusiness.GetPurchaserListByShopId(request); } diff --git a/BBWYB.Server.Business/Vender/VenderBusiness.cs b/BBWYB.Server.Business/Vender/VenderBusiness.cs index f8b5822..13c71d3 100644 --- a/BBWYB.Server.Business/Vender/VenderBusiness.cs +++ b/BBWYB.Server.Business/Vender/VenderBusiness.cs @@ -81,11 +81,16 @@ namespace BBWYB.Server.Business return shopSettingRequest.PurchaseAccountId; } - public IList GetPurchaserListByShopId(long shopId) + public IList GetPurchaserListByShopId(QueryPurchaseAccountRequest request) { - var shopIdStr = shopId.ToString(); + var purchasePlatofrmId = request.PurchasePlatofrmId != null ? ((int)request.PurchasePlatofrmId).ToString() : string.Empty; + var shopIdStr = request.ShopId.ToString(); var mdsShop = fsqlManager.MDSfsql.Select().Where(s => s.ShopId == shopIdStr).ToOne(); - var plist = fsqlManager.MDSfsql.Select().Where(pa => pa.ShopId == mdsShop.Id).ToList(); + var plist = fsqlManager.MDSfsql.Select() + .Where(pa => pa.ShopId == mdsShop.Id) + .WhereIf(!string.IsNullOrEmpty(purchasePlatofrmId), pa => pa.PurchasePlatformId == purchasePlatofrmId) + .WhereIf(!string.IsNullOrEmpty(request.AccountName), pa => pa.AccountName == request.AccountName) + .ToList(); foreach (var pa in plist) pa.ShopId = shopIdStr; return plist; diff --git a/BBWYB.Server.Model/Dto/Request/Vender/QueryPurchaseAccountRequest.cs b/BBWYB.Server.Model/Dto/Request/Vender/QueryPurchaseAccountRequest.cs new file mode 100644 index 0000000..72fb4c6 --- /dev/null +++ b/BBWYB.Server.Model/Dto/Request/Vender/QueryPurchaseAccountRequest.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; + +namespace BBWYB.Server.Model.Dto +{ + public class QueryPurchaseAccountRequest + { + [Required] + public long ShopId { get; set; } + + public Enums.Platform? PurchasePlatofrmId { get; set; } + + public string AccountName { get; set;} + } +} diff --git a/BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs b/BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs index 96bf413..71a6f1e 100644 --- a/BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs @@ -10,17 +10,29 @@ public long PurchaseAccountId { get; set; } + /// + /// 采购账号AccountName + /// public string AccountName { get; set; } - + /// + /// 采购账号AppKey + /// public string AppKey { get; set; } - + /// + /// 采购账号AppSecret + /// public string AppSecret { get; set; } - + /// + /// 采购账号Token + /// public string AppToken { get; set; } + /// + /// 采购平台 + /// public Enums.Platform PurchasePlatformId { get; set; } } } From ed2575077070edcea8bb1db1c6cea0a55ffb1d44 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 10 Jan 2024 16:43:55 +0800 Subject: [PATCH 2/4] 1 --- BBWYB.Server.API/Controllers/VenderController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BBWYB.Server.API/Controllers/VenderController.cs b/BBWYB.Server.API/Controllers/VenderController.cs index df3a8e3..3ee348e 100644 --- a/BBWYB.Server.API/Controllers/VenderController.cs +++ b/BBWYB.Server.API/Controllers/VenderController.cs @@ -34,9 +34,9 @@ namespace BBWYB.Server.API.Controllers /// /// [HttpPost] - public IList GetPurchaserListByShopId([FromBody] QueryPurchaseAccountRequest request) + public IList GetPurchaserList([FromBody] QueryPurchaseAccountRequest request) { - return venderBusiness.GetPurchaserListByShopId(request); + return venderBusiness.GetPurchaserList(request); } From 3ba39e41d1f993d288798b62e84771fe39482fbf Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 10 Jan 2024 16:44:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=8E=A5=E5=8F=A3=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.Business/Vender/VenderBusiness.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWYB.Server.Business/Vender/VenderBusiness.cs b/BBWYB.Server.Business/Vender/VenderBusiness.cs index 13c71d3..73b632c 100644 --- a/BBWYB.Server.Business/Vender/VenderBusiness.cs +++ b/BBWYB.Server.Business/Vender/VenderBusiness.cs @@ -81,7 +81,7 @@ namespace BBWYB.Server.Business return shopSettingRequest.PurchaseAccountId; } - public IList GetPurchaserListByShopId(QueryPurchaseAccountRequest request) + public IList GetPurchaserList(QueryPurchaseAccountRequest request) { var purchasePlatofrmId = request.PurchasePlatofrmId != null ? ((int)request.PurchasePlatofrmId).ToString() : string.Empty; var shopIdStr = request.ShopId.ToString(); From b45019043f8189a2235bdf7243af45a0da7014d0 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 10 Jan 2024 18:13:26 +0800 Subject: [PATCH 4/4] 1 --- BBWYB.Client/ViewModels/WebVM.cs | 1 + BBWYB.Server.API/Controllers/VenderController.cs | 11 ++++++++++- BBWYB.Server.Business/Vender/VenderBusiness.cs | 8 +++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/BBWYB.Client/ViewModels/WebVM.cs b/BBWYB.Client/ViewModels/WebVM.cs index 9e5b38c..9f3b3d5 100644 --- a/BBWYB.Client/ViewModels/WebVM.cs +++ b/BBWYB.Client/ViewModels/WebVM.cs @@ -78,6 +78,7 @@ namespace BBWYB.Client.ViewModels } } + GlobalContext.User.DepartmentList = departmentList; WeakReferenceMessenger.Default.Send(new Message_WebB_LoginCompleted(null)); IsLoading = false; diff --git a/BBWYB.Server.API/Controllers/VenderController.cs b/BBWYB.Server.API/Controllers/VenderController.cs index 3ee348e..3d3ee2b 100644 --- a/BBWYB.Server.API/Controllers/VenderController.cs +++ b/BBWYB.Server.API/Controllers/VenderController.cs @@ -39,6 +39,15 @@ namespace BBWYB.Server.API.Controllers return venderBusiness.GetPurchaserList(request); } + /// + /// 删除采购账号 + /// + /// + [HttpDelete("{purchaseAccountId}")] + public void DeletePurchaseAccount([FromRoute] long purchaseAccountId) + { + venderBusiness.DeletePurchaseAccount(purchaseAccountId); + } /// /// 查询店铺关联的物流公司列表 @@ -56,7 +65,7 @@ namespace BBWYB.Server.API.Controllers /// /// [HttpPost] - public IList GetKuaiDi100ExpressCompanyList([FromBody]KuaiDi100ExpressSearchRequest request) + public IList GetKuaiDi100ExpressCompanyList([FromBody] KuaiDi100ExpressSearchRequest request) { return venderBusiness.GetKuaiDi100ExpressCompanyList(request); } diff --git a/BBWYB.Server.Business/Vender/VenderBusiness.cs b/BBWYB.Server.Business/Vender/VenderBusiness.cs index 73b632c..c98317d 100644 --- a/BBWYB.Server.Business/Vender/VenderBusiness.cs +++ b/BBWYB.Server.Business/Vender/VenderBusiness.cs @@ -87,7 +87,7 @@ namespace BBWYB.Server.Business var shopIdStr = request.ShopId.ToString(); var mdsShop = fsqlManager.MDSfsql.Select().Where(s => s.ShopId == shopIdStr).ToOne(); var plist = fsqlManager.MDSfsql.Select() - .Where(pa => pa.ShopId == mdsShop.Id) + .Where(pa => pa.ShopId == mdsShop.Id && pa.Deleted == 0) .WhereIf(!string.IsNullOrEmpty(purchasePlatofrmId), pa => pa.PurchasePlatformId == purchasePlatofrmId) .WhereIf(!string.IsNullOrEmpty(request.AccountName), pa => pa.AccountName == request.AccountName) .ToList(); @@ -96,6 +96,12 @@ namespace BBWYB.Server.Business return plist; } + public void DeletePurchaseAccount(long purchaseAccountId) + { + var pk = purchaseAccountId.ToString(); + fsqlManager.MDSfsql.Update(pk).Set(pa => pa.Deleted, 1).ExecuteAffrows(); + } + public IList GetExpressCompanyList(PlatformRequest request) { return opPlatformClientFactory.GetClient((SDKAdapter.AdapterEnums.PlatformType)request.Platform)