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 d2d296c..3d3ee2b 100644
--- a/BBWYB.Server.API/Controllers/VenderController.cs
+++ b/BBWYB.Server.API/Controllers/VenderController.cs
@@ -29,16 +29,25 @@ namespace BBWYB.Server.API.Controllers
}
///
- /// 获取店铺下的采购账号
+ /// 查询采购账号列表
///
- ///
+ ///
///
- [HttpGet]
- public IList GetPurchaserListByShopId([FromBody]long shopId)
+ [HttpPost]
+ public IList GetPurchaserList([FromBody] QueryPurchaseAccountRequest request)
{
- return venderBusiness.GetPurchaserListByShopId(shopId);
+ 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 f8b5822..c98317d 100644
--- a/BBWYB.Server.Business/Vender/VenderBusiness.cs
+++ b/BBWYB.Server.Business/Vender/VenderBusiness.cs
@@ -81,16 +81,27 @@ namespace BBWYB.Server.Business
return shopSettingRequest.PurchaseAccountId;
}
- public IList GetPurchaserListByShopId(long shopId)
+ public IList GetPurchaserList(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 && pa.Deleted == 0)
+ .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;
}
+ 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)
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; }
}
}