Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb

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;

BBWYB.Server.API/Controllers/VenderController.cs

@@ -29,16 +29,25 @@ namespace BBWYB.Server.API.Controllers
         }
 
         /// <summary>
-        /// 获取店铺下的采购账号
+        /// 查询采购账号列表
         /// </summary>
-        /// <param name="shopId"></param>
+        /// <param name="request"></param>
         /// <returns></returns>
-        [HttpGet]
-        public IList<Purchaseaccount> GetPurchaserListByShopId([FromBody]long shopId)
+        [HttpPost]
+        public IList<Purchaseaccount> GetPurchaserList([FromBody] QueryPurchaseAccountRequest request)
         {
-            return venderBusiness.GetPurchaserListByShopId(shopId);
+            return venderBusiness.GetPurchaserList(request);
         }
 
+        /// <summary>
+        /// 删除采购账号
+        /// </summary>
+        /// <param name="purchaseAccountId"></param>
+        [HttpDelete("{purchaseAccountId}")]
+        public void DeletePurchaseAccount([FromRoute] long purchaseAccountId)
+        {
+            venderBusiness.DeletePurchaseAccount(purchaseAccountId);
+        }
 
         /// <summary>
         /// 查询店铺关联的物流公司列表
@@ -56,7 +65,7 @@ namespace BBWYB.Server.API.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public IList<KuaiDi100ExpressCompany> GetKuaiDi100ExpressCompanyList([FromBody]KuaiDi100ExpressSearchRequest request)
+        public IList<KuaiDi100ExpressCompany> GetKuaiDi100ExpressCompanyList([FromBody] KuaiDi100ExpressSearchRequest request)
         {
             return venderBusiness.GetKuaiDi100ExpressCompanyList(request);
         }

BBWYB.Server.Business/Vender/VenderBusiness.cs

@@ -81,16 +81,27 @@ namespace BBWYB.Server.Business
             return shopSettingRequest.PurchaseAccountId;
         }
 
-        public IList<Purchaseaccount> GetPurchaserListByShopId(long shopId)
+        public IList<Purchaseaccount> 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<Shops>().Where(s => s.ShopId == shopIdStr).ToOne();
-            var plist = fsqlManager.MDSfsql.Select<Purchaseaccount>().Where(pa => pa.ShopId == mdsShop.Id).ToList();
+            var plist = fsqlManager.MDSfsql.Select<Purchaseaccount>()
+                                           .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<Purchaseaccount>(pk).Set(pa => pa.Deleted, 1).ExecuteAffrows();
+        }
+
         public IList<OP_QueryExpressCompanyResponse> GetExpressCompanyList(PlatformRequest request)
         {
             return opPlatformClientFactory.GetClient((SDKAdapter.AdapterEnums.PlatformType)request.Platform)

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;}
+    }
+}

BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs

@@ -10,17 +10,29 @@
         public long PurchaseAccountId { get; set; }
 
 
+        /// <summary>
+        /// 采购账号AccountName
+        /// </summary>
         public string AccountName { get; set; }
 
-
+        /// <summary>
+        /// 采购账号AppKey
+        /// </summary>
         public string AppKey { get; set; }
 
-
+        /// <summary>
+        /// 采购账号AppSecret
+        /// </summary>
         public string AppSecret { get; set; }
 
-
+        /// <summary>
+        /// 采购账号Token
+        /// </summary>
         public string AppToken { get; set; }
 
+        /// <summary>
+        /// 采购平台
+        /// </summary>
         public Enums.Platform PurchasePlatformId { get; set; }
     }
 }