Browse Source

1

updatebug
shanji 2 years ago
parent
commit
d23947742c
  1. 1
      BBWYB.Server.Business/Order/OrderBusiness.cs
  2. 9
      BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
  3. 5
      BBWYB.Server.Model/Db/Order/Order.cs
  4. 5
      BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs

1
BBWYB.Server.Business/Order/OrderBusiness.cs

@ -85,6 +85,7 @@ namespace BBWYB.Server.Business
SourceSku = o.SourceSku, SourceSku = o.SourceSku,
ExpressName = o.ExpressName, ExpressName = o.ExpressName,
IsPurchased = o.IsPurchased, IsPurchased = o.IsPurchased,
BuyerAccount = o.BuyerAccount,
ContactName = ocs.ContactName, ContactName = ocs.ContactName,
Address = ocs.Address, Address = ocs.Address,

9
BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@ -110,7 +110,8 @@ namespace BBWYB.Server.Business.Sync
VenderRemark = qtOrder.VenderRemark, VenderRemark = qtOrder.VenderRemark,
WaybillNo = qtOrder.DeliveryResponse.WayBillNo, WaybillNo = qtOrder.DeliveryResponse.WayBillNo,
OrderState = orderState, OrderState = orderState,
ClientOrderId = qtOrder.ClientOrderId ClientOrderId = qtOrder.ClientOrderId,
BuyerAccount = qtOrder.UserAccount
}; };
if (!string.IsNullOrEmpty(qtOrder.Extended)) if (!string.IsNullOrEmpty(qtOrder.Extended))
{ {
@ -170,6 +171,7 @@ namespace BBWYB.Server.Business.Sync
var updateModifyTime = false; var updateModifyTime = false;
var updateBuyerRemark = false; var updateBuyerRemark = false;
var updateVenderRemark = false; var updateVenderRemark = false;
var updateBuyerAccount = false;
if (dbOrder.OrderState != orderState) if (dbOrder.OrderState != orderState)
updateOrderState = true; updateOrderState = true;
@ -183,6 +185,8 @@ namespace BBWYB.Server.Business.Sync
updateBuyerRemark = true; updateBuyerRemark = true;
if (dbOrder.VenderRemark != qtOrder.VenderRemark) if (dbOrder.VenderRemark != qtOrder.VenderRemark)
updateVenderRemark = true; updateVenderRemark = true;
if (dbOrder.BuyerAccount != qtOrder.UserAccount)
updateBuyerAccount = true;
if (updateOrderState || updateWaybillNo || updateModifyTime || updateBuyerRemark || updateVenderRemark) if (updateOrderState || updateWaybillNo || updateModifyTime || updateBuyerRemark || updateVenderRemark)
{ {
@ -191,7 +195,8 @@ namespace BBWYB.Server.Business.Sync
.SetIf(updateExpressName, o => o.ExpressName, qtOrder.DeliveryResponse.ExpressName) .SetIf(updateExpressName, o => o.ExpressName, qtOrder.DeliveryResponse.ExpressName)
.SetIf(updateModifyTime, o => o.ModifyTime, qtOrder.ModifyTime) .SetIf(updateModifyTime, o => o.ModifyTime, qtOrder.ModifyTime)
.SetIf(updateBuyerRemark, o => o.BuyerRemark, qtOrder.BuyerRemark) .SetIf(updateBuyerRemark, o => o.BuyerRemark, qtOrder.BuyerRemark)
.SetIf(updateVenderRemark, o => o.VenderRemark, qtOrder.VenderRemark); .SetIf(updateVenderRemark, o => o.VenderRemark, qtOrder.VenderRemark)
.SetIf(updateBuyerAccount, o => o.BuyerAccount, qtOrder.UserAccount);
updateOrderList.Add(update); updateOrderList.Add(update);
} }
} }

5
BBWYB.Server.Model/Db/Order/Order.cs

@ -19,6 +19,11 @@ namespace BBWYB.Server.Model.Db
public string BuyerRemark { get; set; } public string BuyerRemark { get; set; }
/// <summary>
/// 买家账号
/// </summary>
public string BuyerAccount { get; set; }
/// <summary> /// <summary>
/// 结束时间 /// 结束时间
/// </summary> /// </summary>

5
BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs

@ -79,6 +79,11 @@
/// </summary> /// </summary>
public string BuyerRemark { get; set; } public string BuyerRemark { get; set; }
/// <summary>
/// 买家账号
/// </summary>
public string BuyerAccount { get; set; }
/// <summary> /// <summary>
/// 商家备注 /// 商家备注
/// </summary> /// </summary>

Loading…
Cancel
Save