|
@ -148,15 +148,15 @@ namespace BBWY.Server.Business |
|
|
if ((syncOrderByDateRequest.EndTime - syncOrderByDateRequest.StartTime).Days > 7) |
|
|
if ((syncOrderByDateRequest.EndTime - syncOrderByDateRequest.StartTime).Days > 7) |
|
|
throw new BusinessException("同步任务时差最长7天"); |
|
|
throw new BusinessException("同步任务时差最长7天"); |
|
|
|
|
|
|
|
|
var orderSyncTask = new OrderSyncTask() |
|
|
//var orderSyncTask = new OrderSyncTask()
|
|
|
{ |
|
|
//{
|
|
|
Id = idGenerator.NewLong(), |
|
|
// Id = idGenerator.NewLong(),
|
|
|
ShopId = syncOrderByDateRequest.ShopId, |
|
|
// ShopId = syncOrderByDateRequest.ShopId,
|
|
|
State = Enums.OrderSyncState.Running, |
|
|
// State = Enums.OrderSyncState.Running,
|
|
|
SyncStartTime = syncOrderByDateRequest.StartTime, |
|
|
// SyncStartTime = syncOrderByDateRequest.StartTime,
|
|
|
SyncEndTime = syncOrderByDateRequest.EndTime |
|
|
// SyncEndTime = syncOrderByDateRequest.EndTime
|
|
|
}; |
|
|
//};
|
|
|
fsql.Insert(orderSyncTask).ExecuteAffrows(); |
|
|
//fsql.Insert(orderSyncTask).ExecuteAffrows();
|
|
|
Task.Factory.StartNew(() => |
|
|
Task.Factory.StartNew(() => |
|
|
{ |
|
|
{ |
|
|
var currentStartTime = syncOrderByDateRequest.StartTime; |
|
|
var currentStartTime = syncOrderByDateRequest.StartTime; |
|
@ -188,11 +188,11 @@ namespace BBWY.Server.Business |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
try |
|
|
//try
|
|
|
{ |
|
|
//{
|
|
|
fsql.Update<OrderSyncTask>(orderSyncTask.Id).Set(ost => ost.State, Enums.OrderSyncState.End).ExecuteAffrows(); |
|
|
// fsql.Update<OrderSyncTask>(orderSyncTask.Id).Set(ost => ost.State, Enums.OrderSyncState.End).ExecuteAffrows();
|
|
|
} |
|
|
//}
|
|
|
catch (Exception ex) { } |
|
|
//catch (Exception ex) { }
|
|
|
}, System.Threading.CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.SyncOrderTaskScheduler); |
|
|
}, System.Threading.CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.SyncOrderTaskScheduler); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -308,7 +308,12 @@ namespace BBWY.Server.Business |
|
|
if (orderCouponDetailResponse.Success) |
|
|
if (orderCouponDetailResponse.Success) |
|
|
{ |
|
|
{ |
|
|
var jtoken = orderCouponDetailResponse.Data["jingdong_pop_order_queryCouponDetai_responce"]["couponDetailExternal"]["couponDetailVo"]; |
|
|
var jtoken = orderCouponDetailResponse.Data["jingdong_pop_order_queryCouponDetai_responce"]["couponDetailExternal"]["couponDetailVo"]; |
|
|
if (jtoken.Value<decimal>("totalShouldPay") > 0M) |
|
|
if (jtoken.Value<decimal>("totalShouldPay") > 0M || |
|
|
|
|
|
jtoken.Value<decimal>("totalSuperRedEnvelope") > 0M || |
|
|
|
|
|
jtoken.Value<decimal>("totalDongQuan") > 0M || |
|
|
|
|
|
jtoken.Value<decimal>("totalJingDou") > 0M || |
|
|
|
|
|
jtoken.Value<decimal>("totalXianPinLeiDongQuan") > 0M || |
|
|
|
|
|
jtoken.Value<decimal>("totalPingTaiChengDanYouHuiQuan") > 0M ) |
|
|
{ |
|
|
{ |
|
|
#region 订单合计信息
|
|
|
#region 订单合计信息
|
|
|
var orderTotal = new OrderTotalInfo() |
|
|
var orderTotal = new OrderTotalInfo() |
|
|