Browse Source

客户端支持memberId

yijia
shanji 2 years ago
parent
commit
675facb4ed
  1. 1
      BBWYB.Client/APIServices/PurchaseProductAPIService.cs
  2. 2
      BBWYB.Client/GlobalContext.cs
  3. 2
      BBWYB.Client/Models/APIModel/Response/PurchaseSchemeProductResponse.cs
  4. 2
      BBWYB.Client/Models/Product/Purchaser.cs
  5. 5
      BBWYB.Client/Models/PurchaseScheme/PurchaseSchemeProduct.cs
  6. 1
      BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs
  7. 4
      BBWYB.Client/appsettings.json
  8. 2
      BBWYB.Server.API/Controllers/PurchaseSchemeController.cs

1
BBWYB.Client/APIServices/PurchaseProductAPIService.cs

@ -210,6 +210,7 @@ namespace BBWYB.Client.APIServices
Id = jobject["globalData"]["tempModel"]["sellerUserId"].ToString(), Id = jobject["globalData"]["tempModel"]["sellerUserId"].ToString(),
Id2 = jobject["globalData"]["tempModel"]["sellerLoginId"]?.ToString(), Id2 = jobject["globalData"]["tempModel"]["sellerLoginId"]?.ToString(),
Name = jobject["globalData"]["tempModel"]["companyName"].ToString(), Name = jobject["globalData"]["tempModel"]["companyName"].ToString(),
MemberId = jobject["globalData"]?["tempModel"]?["sellerMemberId"]?.ToString(),
Location = location, Location = location,
Platform = platform Platform = platform
}; };

2
BBWYB.Client/GlobalContext.cs

@ -22,7 +22,7 @@ namespace BBWYB.Client
{ {
public GlobalContext() public GlobalContext()
{ {
BBWYBApiVersion = "10031"; BBWYBApiVersion = "10032";
} }
private User user; private User user;

2
BBWYB.Client/Models/APIModel/Response/PurchaseSchemeProductResponse.cs

@ -23,6 +23,8 @@ namespace BBWYB.Client.Models
public Platform? PurchasePlatform { get; set; } public Platform? PurchasePlatform { get; set; }
public string PurchaserMemberId { get; set; }
public List<PurchaseSchemeProductSkuResponse> PurchaseSchemeProductSkuList { get; set; } public List<PurchaseSchemeProductSkuResponse> PurchaseSchemeProductSkuList { get; set; }
} }

2
BBWYB.Client/Models/Product/Purchaser.cs

@ -25,5 +25,7 @@ namespace BBWYB.Client.Models
public string Location { get; set; } public string Location { get; set; }
public Platform Platform { get; set; } public Platform Platform { get; set; }
public string MemberId { get; set; }
} }
} }

5
BBWYB.Client/Models/PurchaseScheme/PurchaseSchemeProduct.cs

@ -34,6 +34,8 @@ namespace BBWYB.Client.Models
public string PurchaserName { get; set; } public string PurchaserName { get; set; }
public Platform PurchasePlatform { get; set; } public Platform PurchasePlatform { get; set; }
public string PurchaserMemberId { get; set; }
public bool IsEditing public bool IsEditing
{ {
get => isEditing; get => isEditing;
@ -90,7 +92,8 @@ namespace BBWYB.Client.Models
PurchaserId2 = apiModel.PurchaserId2, PurchaserId2 = apiModel.PurchaserId2,
PurchaserName = apiModel.PurchaserName, PurchaserName = apiModel.PurchaserName,
PurchasePlatform = apiModel.PurchasePlatform.Value, PurchasePlatform = apiModel.PurchasePlatform.Value,
PurchaserLocation = apiModel.PurchaserLocation PurchaserLocation = apiModel.PurchaserLocation,
PurchaserMemberId = apiModel.PurchaserMemberId
}; };
model.SelectedSkuIdList.AddRange(apiModel.PurchaseSchemeProductSkuList.Select(s => s.PurchaseSkuId)); model.SelectedSkuIdList.AddRange(apiModel.PurchaseSchemeProductSkuList.Select(s => s.PurchaseSkuId));
return model; return model;

1
BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs

@ -251,6 +251,7 @@ namespace BBWYB.Client.ViewModels
purchaseSchemeProduct.PurchaserId2 = data.Value.purchaser.Id2; purchaseSchemeProduct.PurchaserId2 = data.Value.purchaser.Id2;
purchaseSchemeProduct.PurchaserName = data.Value.purchaser.Name; purchaseSchemeProduct.PurchaserName = data.Value.purchaser.Name;
purchaseSchemeProduct.PurchaserLocation = data.Value.purchaser.Location; purchaseSchemeProduct.PurchaserLocation = data.Value.purchaser.Location;
purchaseSchemeProduct.PurchaserMemberId = data.Value.purchaser.MemberId;
//PurchaserId = data.Value.purchaser.Id; //PurchaserId = data.Value.purchaser.Id;
//PurchaserId2 = data.Value.purchaser.Id2; //PurchaserId2 = data.Value.purchaser.Id2;

4
BBWYB.Client/appsettings.json

@ -1,6 +1,6 @@
{ {
"BBWYApiHost": "http://localhost:5000", //"BBWYApiHost": "http://localhost:5000",
//"BBWYApiHost": "http://bbwyb.qiyue666.com", "BBWYApiHost": "http://bbwyb.qiyue666.com",
"MDSApiHost": "http://mdsapi.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com",
"BBWYCApiHost": "http://bbwytest.qiyue666.com", "BBWYCApiHost": "http://bbwytest.qiyue666.com",
"QKApiHost": "http://localhost:8080" "QKApiHost": "http://localhost:8080"

2
BBWYB.Server.API/Controllers/PurchaseSchemeController.cs

@ -28,7 +28,7 @@ namespace BBWYB.Server.API.Controllers
} }
/// <summary> /// <summary>
/// 获取采购方案列表 (不含采购配配件基本信息) /// 获取采购方案列表
/// </summary> /// </summary>
/// <param name="querySchemeRequest"></param> /// <param name="querySchemeRequest"></param>
/// <returns></returns> /// <returns></returns>

Loading…
Cancel
Save