|
|
@ -380,7 +380,7 @@ namespace BBWY.Server.Business |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
preferentialAmount = dbOrder.PreferentialAmount; |
|
|
|
//preferentialAmount = dbOrder.PreferentialAmount;
|
|
|
|
if (storageType != null && dbOrder.StorageType != storageType) |
|
|
|
dbOrder.StorageType = storageType; |
|
|
|
|
|
|
@ -421,18 +421,19 @@ namespace BBWY.Server.Business |
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region 订单优惠
|
|
|
|
if (!dbOrderCouponList.Any(oc => oc.OrderId == orderId)) |
|
|
|
|
|
|
|
var orderCouponJArray = (JArray)orderJToken["couponDetailList"]; |
|
|
|
if (orderCouponJArray.HasValues) |
|
|
|
{ |
|
|
|
var orderCouponJArray = (JArray)orderJToken["couponDetailList"]; |
|
|
|
if (orderCouponJArray.HasValues) |
|
|
|
foreach (var orderCouponJToken in orderCouponJArray) |
|
|
|
{ |
|
|
|
foreach (var orderCouponJToken in orderCouponJArray) |
|
|
|
var couponType = orderCouponJToken.Value<string>("couponType"); |
|
|
|
if (string.IsNullOrEmpty(couponType)) |
|
|
|
continue; |
|
|
|
//dbOrder.PreferentialAmount += orderCouponJToken.Value<decimal>("couponPrice");
|
|
|
|
preferentialAmount += orderCouponJToken.Value<decimal>("couponPrice"); |
|
|
|
if (!dbOrderCouponList.Any(oc => oc.OrderId == orderId)) |
|
|
|
{ |
|
|
|
var couponType = orderCouponJToken.Value<string>("couponType"); |
|
|
|
if (string.IsNullOrEmpty(couponType)) |
|
|
|
continue; |
|
|
|
//dbOrder.PreferentialAmount += orderCouponJToken.Value<decimal>("couponPrice");
|
|
|
|
preferentialAmount += orderCouponJToken.Value<decimal>("couponPrice"); |
|
|
|
insertOrderCouponList.Add(new OrderCoupon() |
|
|
|
{ |
|
|
|
Id = idGenerator.NewLong(), |
|
|
@ -620,7 +621,7 @@ namespace BBWY.Server.Business |
|
|
|
(orderSellerPrice > 0M && dbOrder.IsGift) || |
|
|
|
orderTotalPrice != dbOrder.OrderTotalPrice || |
|
|
|
storeOrder != dbOrder.StoreOrder || |
|
|
|
//preferentialAmount != dbOrder.PreferentialAmount ||
|
|
|
|
preferentialAmount != dbOrder.PreferentialAmount || |
|
|
|
storeId != dbOrder.StoreId) |
|
|
|
{ |
|
|
|
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(storeOrder != dbOrder.StoreOrder, o => o.StoreOrder, storeOrder) |
|
|
|
.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); |
|
|
|
updateOrderList.Add(updateSql); |
|
|
|
} |
|
|
|