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)