diff --git a/BBWYB.Server.API/Controllers/VenderController.cs b/BBWYB.Server.API/Controllers/VenderController.cs index 3d3ee2b..87825cf 100644 --- a/BBWYB.Server.API/Controllers/VenderController.cs +++ b/BBWYB.Server.API/Controllers/VenderController.cs @@ -23,7 +23,7 @@ namespace BBWYB.Server.API.Controllers /// /// [HttpPost] - public long SaveShopSetting([FromBody] ShopSettingRequest shopSettingRequest) + public string SaveShopSetting([FromBody] ShopSettingRequest shopSettingRequest) { return venderBusiness.SaveShopSetting(shopSettingRequest); } diff --git a/BBWYB.Server.Business/Vender/VenderBusiness.cs b/BBWYB.Server.Business/Vender/VenderBusiness.cs index c98317d..fe396a3 100644 --- a/BBWYB.Server.Business/Vender/VenderBusiness.cs +++ b/BBWYB.Server.Business/Vender/VenderBusiness.cs @@ -40,7 +40,7 @@ namespace BBWYB.Server.Business } - public long SaveShopSetting(ShopSettingRequest shopSettingRequest) + public string SaveShopSetting(ShopSettingRequest shopSettingRequest) { //根据shopId查询mds shop的主键Id var shopId = shopSettingRequest.ShopId.ToString(); @@ -48,13 +48,13 @@ namespace BBWYB.Server.Business if (mdsShop == null) throw new BusinessException($"mds未找到shopId {shopSettingRequest.ShopId}"); - if (shopSettingRequest.PurchaseAccountId == 0) + if (string.IsNullOrEmpty(shopSettingRequest.PurchaseAccountId) || shopSettingRequest.PurchaseAccountId == "0") { - shopSettingRequest.PurchaseAccountId = idGenerator.NewLong(); + shopSettingRequest.PurchaseAccountId = idGenerator.NewLong().ToString(); var mdspa = new Purchaseaccount() { - Id = shopSettingRequest.PurchaseAccountId.ToString(), + Id = shopSettingRequest.PurchaseAccountId, AccountName = shopSettingRequest.AccountName, AppKey = shopSettingRequest.AppKey, AppSecret = shopSettingRequest.AppSecret, @@ -70,7 +70,7 @@ namespace BBWYB.Server.Business } else { - fsqlManager.MDSfsql.Update(shopSettingRequest.PurchaseAccountId.ToString()) + fsqlManager.MDSfsql.Update(shopSettingRequest.PurchaseAccountId) .Set(pa => pa.AppKey, shopSettingRequest.AppKey) .Set(pa => pa.AppSecret, shopSettingRequest.AppSecret) .Set(pa => pa.AppToken, shopSettingRequest.AppToken) diff --git a/BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs b/BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs index 71a6f1e..6b93f0d 100644 --- a/BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs @@ -5,9 +5,9 @@ public long ShopId { get; set; } /// - /// 采购账号Id=0 将视为新增操作 + /// 采购账号Id=0或者空 将视为新增操作 /// - public long PurchaseAccountId { get; set; } + public string PurchaseAccountId { get; set; } ///