pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改订单同步逻辑

AddValidOverTime
sanji 2 years ago
parent
8870f18331
commit
33d2fcaa0e
1 changed files with 13 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      BBWY.Server.Business/Sync/OrderSyncBusiness.cs

11
BBWY.Server.Business/Sync/OrderSyncBusiness.cs
View File

@ -380,7 +380,7 @@ namespace BBWY.Server.Business
} }
else else
{ {
preferentialAmount = dbOrder.PreferentialAmount; //preferentialAmount = dbOrder.PreferentialAmount;
if (storageType != null && dbOrder.StorageType != storageType) if (storageType != null && dbOrder.StorageType != storageType)
dbOrder.StorageType = storageType; dbOrder.StorageType = storageType;
@ -421,8 +421,7 @@ namespace BBWY.Server.Business
#endregion #endregion
#region 订单优惠 #region 订单优惠
if (!dbOrderCouponList.Any(oc => oc.OrderId == orderId))
{
var orderCouponJArray = (JArray)orderJToken["couponDetailList"]; var orderCouponJArray = (JArray)orderJToken["couponDetailList"];
if (orderCouponJArray.HasValues) if (orderCouponJArray.HasValues)
{ {
@ -433,6 +432,8 @@ namespace BBWY.Server.Business
continue; continue;
//dbOrder.PreferentialAmount += orderCouponJToken.Value<decimal>("couponPrice"); //dbOrder.PreferentialAmount += orderCouponJToken.Value<decimal>("couponPrice");
preferentialAmount += orderCouponJToken.Value<decimal>("couponPrice"); preferentialAmount += orderCouponJToken.Value<decimal>("couponPrice");
if (!dbOrderCouponList.Any(oc => oc.OrderId == orderId))
{
insertOrderCouponList.Add(new OrderCoupon() insertOrderCouponList.Add(new OrderCoupon()
{ {
Id = idGenerator.NewLong(), Id = idGenerator.NewLong(),
@ -620,7 +621,7 @@ namespace BBWY.Server.Business
(orderSellerPrice > 0M && dbOrder.IsGift) || (orderSellerPrice > 0M && dbOrder.IsGift) ||
orderTotalPrice != dbOrder.OrderTotalPrice || orderTotalPrice != dbOrder.OrderTotalPrice ||
storeOrder != dbOrder.StoreOrder || storeOrder != dbOrder.StoreOrder ||
//preferentialAmount != dbOrder.PreferentialAmount || preferentialAmount != dbOrder.PreferentialAmount ||
storeId != dbOrder.StoreId) storeId != dbOrder.StoreId)
{ {
var updateSql = fsql.Update<Order>(orderId).SetIf(orderState != null && orderState != dbOrder.OrderState, o => o.OrderState, orderState) var updateSql = fsql.Update<Order>(orderId).SetIf(orderState != null && orderState != dbOrder.OrderState, o => o.OrderState, orderState)
@ -637,7 +638,7 @@ namespace BBWY.Server.Business
.SetIf(orderSellerPrice > 0M && dbOrder.IsGift == true, o => o.IsGift, false) .SetIf(orderSellerPrice > 0M && dbOrder.IsGift == true, o => o.IsGift, false)
.SetIf(storeOrder != dbOrder.StoreOrder, o => o.StoreOrder, storeOrder) .SetIf(storeOrder != dbOrder.StoreOrder, o => o.StoreOrder, storeOrder)
.SetIf(storeOrder != dbOrder.StoreOrder, o => o.StorageType, storageType) .SetIf(storeOrder != dbOrder.StoreOrder, o => o.StorageType, storageType)
//.SetIf(preferentialAmount != dbOrder.PreferentialAmount, o => o.PreferentialAmount, preferentialAmount) .SetIf(preferentialAmount != dbOrder.PreferentialAmount, o => o.PreferentialAmount, preferentialAmount)
.SetIf(storeId != dbOrder.StoreId, o => o.StoreId, storeId); .SetIf(storeId != dbOrder.StoreId, o => o.StoreId, storeId);
updateOrderList.Add(updateSql); updateOrderList.Add(updateSql);
} }

Write Preview
Loading…
Cancel
Save