diff --git a/BBWYB.Client/APIServices/PurchaseProductAPIService.cs b/BBWYB.Client/APIServices/PurchaseProductAPIService.cs index 17b0308..6a75477 100644 --- a/BBWYB.Client/APIServices/PurchaseProductAPIService.cs +++ b/BBWYB.Client/APIServices/PurchaseProductAPIService.cs @@ -210,6 +210,7 @@ namespace BBWYB.Client.APIServices Id = jobject["globalData"]["tempModel"]["sellerUserId"].ToString(), Id2 = jobject["globalData"]["tempModel"]["sellerLoginId"]?.ToString(), Name = jobject["globalData"]["tempModel"]["companyName"].ToString(), + MemberId = jobject["globalData"]?["tempModel"]?["sellerMemberId"]?.ToString(), Location = location, Platform = platform }; diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index 373eabc..cbf3c6a 100644 --- a/BBWYB.Client/GlobalContext.cs +++ b/BBWYB.Client/GlobalContext.cs @@ -22,7 +22,7 @@ namespace BBWYB.Client { public GlobalContext() { - BBWYBApiVersion = "10031"; + BBWYBApiVersion = "10032"; } private User user; diff --git a/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeProductResponse.cs b/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeProductResponse.cs index 995aa88..fb5ed5b 100644 --- a/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeProductResponse.cs +++ b/BBWYB.Client/Models/APIModel/Response/PurchaseSchemeProductResponse.cs @@ -23,6 +23,8 @@ namespace BBWYB.Client.Models public Platform? PurchasePlatform { get; set; } + public string PurchaserMemberId { get; set; } + public List PurchaseSchemeProductSkuList { get; set; } } diff --git a/BBWYB.Client/Models/Product/Purchaser.cs b/BBWYB.Client/Models/Product/Purchaser.cs index 0b021fb..46be3e5 100644 --- a/BBWYB.Client/Models/Product/Purchaser.cs +++ b/BBWYB.Client/Models/Product/Purchaser.cs @@ -25,5 +25,7 @@ namespace BBWYB.Client.Models public string Location { get; set; } public Platform Platform { get; set; } + + public string MemberId { get; set; } } } diff --git a/BBWYB.Client/Models/PurchaseScheme/PurchaseSchemeProduct.cs b/BBWYB.Client/Models/PurchaseScheme/PurchaseSchemeProduct.cs index 052bbca..6f8d9c7 100644 --- a/BBWYB.Client/Models/PurchaseScheme/PurchaseSchemeProduct.cs +++ b/BBWYB.Client/Models/PurchaseScheme/PurchaseSchemeProduct.cs @@ -34,6 +34,8 @@ namespace BBWYB.Client.Models public string PurchaserName { get; set; } public Platform PurchasePlatform { get; set; } + + public string PurchaserMemberId { get; set; } public bool IsEditing { get => isEditing; @@ -90,7 +92,8 @@ namespace BBWYB.Client.Models PurchaserId2 = apiModel.PurchaserId2, PurchaserName = apiModel.PurchaserName, PurchasePlatform = apiModel.PurchasePlatform.Value, - PurchaserLocation = apiModel.PurchaserLocation + PurchaserLocation = apiModel.PurchaserLocation, + PurchaserMemberId = apiModel.PurchaserMemberId }; model.SelectedSkuIdList.AddRange(apiModel.PurchaseSchemeProductSkuList.Select(s => s.PurchaseSkuId)); return model; diff --git a/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs b/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs index 26cb3c9..8bf6aa2 100644 --- a/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs +++ b/BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs @@ -251,6 +251,7 @@ namespace BBWYB.Client.ViewModels purchaseSchemeProduct.PurchaserId2 = data.Value.purchaser.Id2; purchaseSchemeProduct.PurchaserName = data.Value.purchaser.Name; purchaseSchemeProduct.PurchaserLocation = data.Value.purchaser.Location; + purchaseSchemeProduct.PurchaserMemberId = data.Value.purchaser.MemberId; //PurchaserId = data.Value.purchaser.Id; //PurchaserId2 = data.Value.purchaser.Id2; diff --git a/BBWYB.Client/appsettings.json b/BBWYB.Client/appsettings.json index 67f255d..cce26a2 100644 --- a/BBWYB.Client/appsettings.json +++ b/BBWYB.Client/appsettings.json @@ -1,6 +1,6 @@ { - "BBWYApiHost": "http://localhost:5000", - //"BBWYApiHost": "http://bbwyb.qiyue666.com", + //"BBWYApiHost": "http://localhost:5000", + "BBWYApiHost": "http://bbwyb.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com", "BBWYCApiHost": "http://bbwytest.qiyue666.com", "QKApiHost": "http://localhost:8080" diff --git a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs index 1b87505..840a9c4 100644 --- a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs +++ b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs @@ -28,7 +28,7 @@ namespace BBWYB.Server.API.Controllers } /// - /// 获取采购方案列表 (不含采购配配件基本信息) + /// 获取采购方案列表 /// /// ///