From b4176dc7c044fc18052c57a28c08fd69acdea6dc Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 12 Jan 2024 12:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.API/Controllers/VenderController.cs       |  2 +-
 BBWYB.Server.Business/Vender/VenderBusiness.cs         | 10 +++++-----
 .../Dto/Request/Vender/ShopSettingRequest.cs           |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

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
         /// <param name="shopSettingRequest"></param>
         /// <returns></returns>
         [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<Purchaseaccount>(shopSettingRequest.PurchaseAccountId.ToString())
+                fsqlManager.MDSfsql.Update<Purchaseaccount>(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; }
 
         /// <summary>
-        /// 采购账号Id=0 将视为新增操作
+        /// 采购账号Id=0或者空 将视为新增操作
         /// </summary>
-        public long PurchaseAccountId { get; set; }
+        public string PurchaseAccountId { get; set; }
 
 
         /// <summary>