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

Merge branch 'orderstate'

yijia
shanji 2 years ago
parent
e5360f5d88 8dcc88cb6d
commit
731f4504b5
2 changed files with 37 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      BBWYB.Server.Business/Order/OrderBusiness.cs
  2. 46
      BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

13
BBWYB.Server.Business/Order/OrderBusiness.cs
View File

@ -53,19 +53,6 @@ namespace BBWYB.Server.Business
.Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId);
select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any());
}
if (request.OrderState != null)
{
if (request.OrderState == Enums.OrderState.待付款 ||
request.OrderState == Enums.OrderState.打包中 ||
request.OrderState == Enums.OrderState.待完结 ||
request.OrderState == Enums.OrderState.已完成 ||
request.OrderState == Enums.OrderState.已取消)
{
select = select.Where((o, ocs, oct) => o.OrderState == request.OrderState);
}
else if (request.OrderState == Enums.OrderState.等待采购)
select = select.Where((o, ocs, oct) => o.OrderState == Enums.OrderState.等待采购 || o.OrderState == Enums.OrderState.部分采购);
}
select = select.WhereIf(request.OrderState == Enums.OrderState.待付款 ||
request.OrderState == Enums.OrderState.打包中 ||
request.OrderState == Enums.OrderState.待完结 ||

46
BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
View File

@ -17,6 +17,7 @@ using Yitter.IdGenerator;
using BBWYB.Server.Business.Extensions;
using Microsoft.Extensions.DependencyInjection;
using BBWYB.Server.Model.Db.Mds;
using static BBWYB.Server.Model.Enums;
namespace BBWYB.Server.Business
{
@ -29,6 +30,7 @@ namespace BBWYB.Server.Business
private Lazy<KuaiDi100Manager> kuaiDi100ManagerLazy;
private Lazy<DingDingBusiness> dingDingBusinessLazy;
private Lazy<QiKuManager> qiKuManagerLazy;
private Lazy<RestApiService> restApiServiceLazy;
private PP_PlatformClientFactory ppPlatformClientFactory => pplatformClientFactoryLazy.Value;
private TaskSchedulerManager taskSchedulerManager => taskSchedulerManagerLazy.Value;
@ -37,6 +39,8 @@ namespace BBWYB.Server.Business
private KuaiDi100Manager kuaiDi100Manager => kuaiDi100ManagerLazy.Value;
private DingDingBusiness dingDingBusiness => dingDingBusinessLazy.Value;
private QiKuManager qiKuManager => qiKuManagerLazy.Value;
private RestApiService restApiService => restApiServiceLazy.Value;
private IList<Enums.OrderState> cantPurchaseOrderStateList;
public PurchaseOrderBusiness(IFreeSql fsql,
@ -51,7 +55,7 @@ namespace BBWYB.Server.Business
kuaiDi100ManagerLazy = new Lazy<KuaiDi100Manager>(() => serviceProvider.GetService<KuaiDi100Manager>());
dingDingBusinessLazy = new Lazy<DingDingBusiness>(() => serviceProvider.GetService<DingDingBusiness>());
qiKuManagerLazy = new Lazy<QiKuManager>(() => serviceProvider.GetService<QiKuManager>());
restApiServiceLazy = new Lazy<RestApiService>(() => serviceProvider.GetService<RestApiService>());
cantPurchaseOrderStateList = new List<Enums.OrderState>()
{
Enums.OrderState.已取消,
@ -410,6 +414,10 @@ namespace BBWYB.Server.Business
dbOrder.CalculationOrderState(fsql, orderSkus, orderPurchaseInfoList.Union(insertOrderPurchaseInfos).ToList());
#endregion
#region 通知C端状态
Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
fsql.Transaction(() =>
{
if (updatePurchaseOrderIdList.Count() > 0)
@ -781,6 +789,10 @@ namespace BBWYB.Server.Business
dbOrder.CalculationOrderState(fsql, dbOrderSkuList, dbvalidPurchaseOrderList.Union(insertOrderPurchaseInfoList).ToList());
#endregion
#region 通知C端状态
Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
fsql.Transaction(() =>
{
if (insertOrderPurchaseInfoList.Count() > 0)
@ -950,7 +962,7 @@ namespace BBWYB.Server.Business
dingdingMsg.AppendLine($"目标物流公司:{request.ExpressName} {request.ExpressId}");
dingdingMsg.AppendLine($"快递单号:{request.WaybillNo}");
dingdingMsg.Append($"店铺名:{shop.ShopName}");
SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString());
Task.Factory.StartNew(() => SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString()), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
}
#endregion
@ -991,8 +1003,8 @@ namespace BBWYB.Server.Business
.Set(o => o.OrderState, dbOrder.OrderState);
#endregion
#region 通知C端订单状态
#region 通知C端状态
Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
fsql.Transaction(() =>
@ -1095,8 +1107,8 @@ namespace BBWYB.Server.Business
taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
#region 通知C端订单状态
#region 通知C端状态
Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
fsql.Transaction(() =>
@ -1294,7 +1306,7 @@ namespace BBWYB.Server.Business
dingdingMsg.AppendLine($"目标物流公司:{kuaidi100Company?.TargetName} {kuaidi100Company?.TargetCode}");
dingdingMsg.AppendLine($"快递单号:{logisticsInfo.WayBillNo}");
dingdingMsg.Append($"店铺名:{shop.ShopName}");
SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString());
Task.Factory.StartNew(() => SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString()), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
}
#endregion
@ -1343,7 +1355,7 @@ namespace BBWYB.Server.Business
#endregion
#region 通知C端订单状态
Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
fsql.Transaction(() =>
@ -1826,7 +1838,7 @@ namespace BBWYB.Server.Business
#endregion
#region 通知C端状态
Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
#endregion
fsql.Transaction(() =>
@ -1852,5 +1864,21 @@ namespace BBWYB.Server.Business
}
catch { }
}
private void SendPurchaseOrderStateToC(string orderId, Enums.OrderState orderState)
{
try
{
restApiService.SendRequest("https://bbwy.qiyue666.com", "api/BatchPurchase/UpdatePurchaseOrderState", new
{
OrderId = orderId,
PurchaseOrderState = orderState
}, null, HttpMethod.Post);
}
catch
{
}
}
}
}

Write Preview
Loading…
Cancel
Save