|
|
@ -50,9 +50,8 @@ namespace BBWY.Server.Business |
|
|
|
var orderSkuIds = validRefundOrderTokenJArray.Select(j => j["sameOrderServiceBill"]["wareId"].ToString()).Distinct().ToList(); |
|
|
|
|
|
|
|
var updateOrders = fsql.Select<Order>().Where(o => orderIds.Contains(o.Id) && o.IsAfterSaleOrder == false).ToList(); |
|
|
|
var updateOrderSkus = fsql.Select<OrderSku>().Where(osku => orderIds.Contains(osku.OrderId) && |
|
|
|
orderSkuIds.Contains(osku.SkuId) && |
|
|
|
osku.IsRefund == false).ToList(); |
|
|
|
var dbOrderSkus = fsql.Select<OrderSku>().Where(osku => orderIds.Contains(osku.OrderId) && orderSkuIds.Contains(osku.SkuId)).ToList(); |
|
|
|
var updateOrderSkus = dbOrderSkus.Where(osku => osku.IsRefund == false).ToList(); |
|
|
|
|
|
|
|
var afterOrders = fsql.Select<AfterSaleOrder>().Where(aso => orderIds.Contains(aso.OrderId)).ToList(); |
|
|
|
|
|
|
@ -72,15 +71,15 @@ namespace BBWY.Server.Business |
|
|
|
var afterOrder = afterOrders.FirstOrDefault(aso => aso.ServiceId == serviceId); |
|
|
|
if (afterOrder == null) |
|
|
|
{ |
|
|
|
var updateSku = updateOrderSkus.FirstOrDefault(osku => osku.OrderId == orderId && osku.SkuId == skuId); |
|
|
|
if (updateSku == null) |
|
|
|
var dbSku = dbOrderSkus.FirstOrDefault(osku => osku.OrderId == orderId && osku.SkuId == skuId); |
|
|
|
if (dbSku == null) |
|
|
|
continue; |
|
|
|
insertAfterSaleOrders.Add(new AfterSaleOrder() |
|
|
|
{ |
|
|
|
Id = idGenerator.NewLong(), |
|
|
|
CreateTime = DateTime.Now, |
|
|
|
OrderId = updateSku.OrderId, |
|
|
|
ProductId = updateSku.ProductId, |
|
|
|
OrderId = dbSku.OrderId, |
|
|
|
ProductId = dbSku.ProductId, |
|
|
|
RefundAmount = refundAmount, |
|
|
|
RefundTime = refundCompleteTime, |
|
|
|
SkuId = skuId, |
|
|
|