shanji 3 years ago
parent
commit
51f538f644
  1. 2
      BBWY.Client/APIServices/PurchaseOrderService.cs
  2. 4
      BBWY.Client/App.xaml.cs
  3. 8
      BBWY.Server.Business/Vender/VenderBusiness.cs
  4. 100
      BBWY.Server.Model/Db/Mds/Shops.cs

2
BBWY.Client/APIServices/PurchaseOrderService.cs

@ -106,7 +106,7 @@ namespace BBWY.Client.APIServices
string buyerAccount,
string sellerAccount)
{
return SendRequest<object>(globalContext.BBYWApiHost, "api/purchaseOrder/FastCreateOrder", new
return SendRequest<object>(globalContext.BBYWApiHost, "api/purchaseOrder/NewFastCreateOrder", new
{
purchaseOrderMode,
consignee,

4
BBWY.Client/App.xaml.cs

@ -28,8 +28,8 @@ namespace BBWY.Client
var gl = new GlobalContext();
string userToken = string.Empty;
#if DEBUG
userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQzOTg5OTEyMzk1NTI3MzcyOCIsImV4cCI6MTY3MTkwMTU1NH0.UaUubqP442qxVc6ppQt7FO0jcFs3w6KR6q1OeBuL1i8"; //齐越小一
//"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTE0MjYwNjQwNTY3Mjk2IiwidGVhbUlkIjoiIiwiZXhwIjoxNjgyMDUyNjc0fQ.VhJugJphNMdrqeCpfhCDZhks2_64smil3ckDt2J9DSA"; //齐越青子
userToken = //"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQzOTg5OTEyMzk1NTI3MzcyOCIsImV4cCI6MTY3MTkwMTU1NH0.UaUubqP442qxVc6ppQt7FO0jcFs3w6KR6q1OeBuL1i8"; //齐越小一
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNjg0MDk4MTYyNjg4IiwidGVhbUlkIjoiMTQzOTg5ODY0MDU0OTE1NDgxNiIsImV4cCI6MTY4MjI0MDM4OX0.qNk6qNTdDpa4icCi6LN4lKRTa2gTRXuzvCY-BKNXKUQ"; //齐越青子
#else
var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty;
if (string.IsNullOrEmpty(uid))

8
BBWY.Server.Business/Vender/VenderBusiness.cs

@ -72,6 +72,12 @@ namespace BBWY.Server.Business
public long SaveShopSetting(ShopSettingRequest shopSettingRequest)
{
//根据shopId查询mds shop的主键Id
var shopId = shopSettingRequest.ShopId.ToString();
var mdsShop = freeSqlMultiDBManager.MDSfsql.Select<Model.Db.Mds.Shops>().Where(s => s.ShopId == shopId).ToOne();
if (mdsShop == null)
throw new BusinessException($"mds未找到shopId {shopSettingRequest.ShopId}");
if (shopSettingRequest.PurchaseAccountId == 0)
{
shopSettingRequest.PurchaseAccountId = idGenerator.NewLong();
@ -100,7 +106,7 @@ namespace BBWY.Server.Business
CreatorId = "",
Deleted = 0,
PurchasePlatformId = ((int)shopSettingRequest.PurchasePlatformId).ToString(),
ShopId = shopSettingRequest.ShopId.ToString()
ShopId = mdsShop.Id
};

100
BBWY.Server.Model/Db/Mds/Shops.cs

@ -0,0 +1,100 @@
using FreeSql.DataAnnotations;
using System;
namespace BBWY.Server.Model.Db.Mds
{
[Table(Name = "shops", DisableSyncStructure = true)]
public partial class Shops
{
/// <summary>
/// Id
/// </summary>
[Column(StringLength = 50, IsPrimary = true, IsNullable = false)]
public string Id { get; set; }
/// <summary>
/// 店铺Key
/// </summary>
public string AppKey { get; set; }
/// <summary>
/// 店铺Secret
/// </summary>
public string AppSecret { get; set; }
/// <summary>
/// 店铺Token
/// </summary>
public string AppToken { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[Column(DbType = "datetime")]
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建人Id
/// </summary>
[Column(StringLength = 50)]
public string CreatorId { get; set; }
/// <summary>
/// 创建人
/// </summary>
[Column(StringLength = 50, IsNullable = false)]
public string CreatorRealName { get; set; }
/// <summary>
/// 0淘宝,1京东,2阿里巴巴
/// </summary>
public int? PlatformId { get; set; }
/// <summary>
/// 平台名称
/// </summary>
[Column(StringLength = 50)]
public string PlatformName { get; set; }
public string PurchaseAppKey { get; set; }
public string PurchaseAppSecret { get; set; }
/// <summary>
/// 采购平台
/// </summary>
[Column(StringLength = 50)]
public string PurchasePlatformId { get; set; }
/// <summary>
/// 店铺ID
/// </summary>
public string ShopId { get; set; }
public string ShopName { get; set; }
/// <summary>
/// 店铺账号
/// </summary>
public string ShopNick { get; set; }
/// <summary>
/// 店铺类型
/// </summary>
public string ShopType { get; set; }
}
}
Loading…
Cancel
Save