Browse Source

修改备注

updatebug
shanji 2 years ago
parent
commit
7447d14976
  1. 33
      BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs
  2. 1
      BBWYB.Server.Model/Db/Order/OrderSku.cs
  3. 21
      BBWYB.Server.Model/Dto/Request/Order/OutStockRequest.cs
  4. 33
      BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
  5. 16
      BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs
  6. 3
      BBWYB.Server.Model/Dto/Request/PurchaseOrder/ConsigneeRequest.cs
  7. 6
      BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs
  8. 9
      BBWYB.Server.Model/Dto/Request/PurchaseOrder/PreviewOrderRequest.cs
  9. 12
      BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs
  10. 22
      BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs
  11. 3
      BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs
  12. 2
      BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs
  13. 10
      BBWYB.Server.Model/Enums.cs
  14. 3
      SDKAdapter/AdapterEnums.cs
  15. 9
      SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs
  16. 6
      SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs

33
BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs

@ -15,41 +15,74 @@ namespace BBWYB.Server.Model.Db
[Column(DbType = "datetime")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 꽃뭔瑯뵀Id
/// </summary>
[Column(StringLength = 100)]
public string PurchaseAccountId { get; set; }
/// <summary>
/// 꽃뭔瑯뵀츰냔
/// </summary>
[Column(StringLength = 100)]
public string PurchaseAccountName { get; set; }
[Column(MapType = typeof(int?))]
public Enums.PurchaseMethod? PurchaseMethod { get; set; }
/// <summary>
/// 꽃뭔데Id
/// </summary>
[Column(StringLength = 100)]
public string PurchaseOrderId { get; set; }
[Column(MapType = typeof(int?))]
public Enums.Platform? PurchasePlatform { get; set; }
/// <summary>
/// 꽃뭔�츰냔
/// </summary>
[Column(StringLength = 100)]
public string PurchaserName { get; set; }
/// <summary>
/// 듦팟Id
/// </summary>
public long? ShopId { get; set; }
/// <summary>
/// 우뒵데뵀
/// </summary>
[Column(StringLength = 100)]
public string WaybillNo { get; set; }
/// <summary>
/// 覩迦우뒵무鱇츰냔
/// </summary>
[Column(StringLength = 100)]
public string SourceExpressName { get; set; }
/// <summary>
/// 覩迦우뒵무鱇Id
/// </summary>
[Column(StringLength = 100)]
public string SourceExpressId { get; set; }
/// <summary>
/// 커깃우뒵무鱇츰냔
/// </summary>
[Column(StringLength = 100)]
public string TargetExpressName { get; set; }
/// <summary>
/// 커깃우뒵무鱇Id
/// </summary>
[Column(StringLength = 100)]
public string TargetExpressId { get; set; }
/// <summary>
/// 백橄땐데Sku
/// </summary>
[Column(StringLength = 500)]
public string BelongSkuIds { get; set; }
}

1
BBWYB.Server.Model/Db/Order/OrderSku.cs

@ -30,7 +30,6 @@ namespace BBWYB.Server.Model.Db
/// <summary>
/// Logo
/// </summary>
public string Logo { get; set; }

21
BBWYB.Server.Model/Dto/Request/Order/OutStockRequest.cs

@ -2,18 +2,39 @@
{
public class OutStockRequest : PlatformRequest
{
/// <summary>
/// 订单Id
/// </summary>
public string OrderId { get; set; }
/// <summary>
/// 采购单Id
/// </summary>
public string PurchaseOrderId { get; set; }
/// <summary>
/// 运单号
/// </summary>
public string WayBillNo { get; set; }
/// <summary>
/// 原快递公司Id
/// </summary>
public string SourceExpressId { get; set; }
/// <summary>
/// 原快递公司名称
/// </summary>
public string SourceExpressName { get; set; }
/// <summary>
/// 目标快递公司Id 手动出库必传
/// </summary>
public string TargetExpressId { get; set; }
/// <summary>
/// 目标快递公司名称 手动出库必传
/// </summary>
public string TargetExpressName { get; set; }
}
}

33
BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs

@ -6,28 +6,61 @@
/// </summary>
public string OrderId { get; set; }
/// <summary>
/// 店铺Id
/// </summary>
public long? ShopId { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public DateTime? StartDate { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public DateTime? EndDate { get; set; }
/// <summary>
/// 订单状态
/// </summary>
public Enums.OrderState? OrderState { get; set; }
/// <summary>
/// 页数 起始1
/// </summary>
public int PageIndex { get; set; }
/// <summary>
/// 每页记录数
/// </summary>
public int PageSize { get; set; }
/// <summary>
/// 商品Id(Spu)
/// </summary>
public string ProductId { get; set; }
public string Sku { get; set; }
/// <summary>
/// 三方订单Id
/// </summary>
public string ClientOrderId { get; set; }
/// <summary>
/// 采购单Id
/// </summary>
public string PurchaseOrderId { get; set; }
/// <summary>
/// 来源店铺名
/// </summary>
public string SourceShopName { get; set; }
/// <summary>
/// 来源Sku
/// </summary>
public string SourceSku { get; set; }
}
}

16
BBWYB.Server.Model/Dto/Request/PurchaseOrder/CargoParamRequest.cs

@ -11,8 +11,14 @@
/// </summary>
public string SkuId { get; set; }
/// <summary>
/// SpecId 1688独有
/// </summary>
public string SpecId { get; set; }
/// <summary>
/// 采购数量
/// </summary>
public int Quantity { get; set; }
/// <summary>
@ -27,10 +33,20 @@
}
public class CargoParamGroupRequest
{
/// <summary>
/// 采购商Id
/// </summary>
public string PurchaserId { get; set; }
/// <summary>
/// 采购商名称
/// </summary>
public string PurchaserName { get; set; }
public Enums.Platform PurchasePlatform { get; set; }
/// <summary>
/// 采购商品列表
/// </summary>
public IList<CargoParamRequest> CargoParamList { get; set; }
}
}

3
BBWYB.Server.Model/Dto/Request/PurchaseOrder/ConsigneeRequest.cs

@ -17,6 +17,9 @@
/// </summary>
public string Mobile { get; set; }
/// <summary>
/// 详细地址
/// </summary>
public string Address { get; set; }
/// <summary>

6
BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs

@ -2,6 +2,9 @@
{
public class CreateOrderRequest: PreviewOrderRequest
{
/// <summary>
/// 报价扩展信息
/// </summary>
public string Extensions { get; set; }
public string Remark { get; set; }
@ -11,6 +14,9 @@
/// </summary>
public string OrderId { get; set; }
/// <summary>
/// 店铺Id
/// </summary>
public long ShopId { get; set; }
}
}

9
BBWYB.Server.Model/Dto/Request/PurchaseOrder/PreviewOrderRequest.cs

@ -4,12 +4,21 @@ namespace BBWYB.Server.Model.Dto
{
public class PreviewOrderRequest
{
/// <summary>
/// 采购账号列表
/// </summary>
public IList<PurchaseAccountRequest> PurchaseAccountList { get; set; }
public Enums.PurchaseOrderMode PurchaseOrderMode { get; set; }
/// <summary>
/// 收货人信息
/// </summary>
public ConsigneeRequest Consignee { get; set; }
/// <summary>
/// 采购参数列表(以采购商分组)
/// </summary>
public IList<CargoParamGroupRequest> CargoParamGroupList { get; set; }
}

12
BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs

@ -6,9 +6,21 @@ namespace BBWYB.Server.Model.Dto
{
public class InputPurchaseSchemeProductRequest
{
/// <summary>
/// 店铺商品Id
/// </summary>
public string ProductId { get; set; }
/// <summary>
/// 店铺商品Skull
/// </summary>
public string SkuId { get; set; }
/// <summary>
/// 采购商品id
/// </summary>
public string PurchaseProductId { get; set; }
/// <summary>
/// 采购链接
/// </summary>
public string PurchaseUrl { get; set; }
public IList<InputPurchaseSchemeProductSkuRequest> PurchaseSchemeProductSkuList { get; set; }
}

22
BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductSkuRequest.cs

@ -1,15 +1,25 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWYB.Server.Model.Dto
namespace BBWYB.Server.Model.Dto
{
public class InputPurchaseSchemeProductSkuRequest
{
{/// <summary>
/// 店铺商品Id
/// </summary>
public string ProductId { get; set; }
/// <summary>
/// 店铺商品Sku
/// </summary>
public string SkuId { get; set; }
/// <summary>
/// 采购商品Id
/// </summary>
public string PurchaseProductId { get; set; }
/// <summary>
/// 采购Sku
/// </summary>
public string PurchaseSkuId { get; set; }
/// <summary>
/// 采购Ske SpecId (1688独有)
/// </summary>
public string PurchaseSkuSpecId { get; set; }
}
}

3
BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs

@ -19,6 +19,9 @@ namespace BBWYB.Server.Model.Dto
/// 采购商Id
/// </summary>
public string PurchaserId { get; set; }
/// <summary>
/// 采购商名称
/// </summary>
public string PurchaserName { get; set; }
/// <summary>
/// 采购商发货地

2
BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs

@ -18,7 +18,7 @@
public decimal FreightAmount { get; set; }
/// <summary>
/// 扩展数据
/// 扩展数据 下单需要
/// </summary>
public string Extensions { get; set; }
}

10
BBWYB.Server.Model/Enums.cs

@ -3,7 +3,7 @@
public class Enums
{
/// <summary>
/// 电商平台
/// 电商平台 淘宝 = 0,京东 = 1,阿里巴巴 = 2,拼多多 = 3,微信 = 4,拳探 = 10
/// </summary>
public enum Platform
{
@ -16,7 +16,7 @@
}
/// <summary>
/// 采购方式
/// 采购方式 线上采购 = 0,线下采购 = 1
/// </summary>
public enum PurchaseMethod
{
@ -25,7 +25,7 @@
}
/// <summary>
/// 采购单模式
/// 采购单模式 批发 = 0,代发 = 1
/// </summary>
public enum PurchaseOrderMode
{
@ -71,7 +71,7 @@
}
/// <summary>
/// 订单状态
/// 订单状态 待付款 = 0,等待采购 = 1,待出库 = 2,待收货 = 3,已完成 = 4,锁定 = 5,已取消 = 6,暂停 = 7,已退款 = 8,Unknow = 100
/// </summary>
public enum OrderState
{
@ -154,7 +154,7 @@
}
/// <summary>
/// 排序时间类型
/// 排序时间类型 ModifyTime = 0, StartTime = 1
/// </summary>
public enum SortTimeType
{

3
SDKAdapter/AdapterEnums.cs

@ -2,6 +2,9 @@
{
public class AdapterEnums
{
/// <summary>
/// 电商平台 淘宝 = 0,京东 = 1,阿里巴巴 = 2,拼多多 = 3,微信 = 4,拳探 = 10
/// </summary>
public enum PlatformType
{
= 0,

9
SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs

@ -9,10 +9,19 @@
/// </summary>
public string ProductItem { get; set; }
/// <summary>
/// 产品名称
/// </summary>
public string ProductName { get; set; }
/// <summary>
/// 页码 起始1
/// </summary>
public int PageIndex { get; set; }
/// <summary>
/// 每页记录数
/// </summary>
public int PageSize { get; set; }
}
}

6
SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs

@ -12,8 +12,14 @@
/// </summary>
public string Sku { get; set; }
/// <summary>
/// 页码 起始1
/// </summary>
public int PageIndex { get; set; }
/// <summary>
/// 每页记录数
/// </summary>
public int PageSize { get; set; }
}
}

Loading…
Cancel
Save