diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 1eeaca8..fb2cac8 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -56,7 +56,7 @@ namespace BBWYB.Server.Business .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate) .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate) .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId) - .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName.Contains(request.SourceShopName)) + .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName) .WhereIf(!string.IsNullOrEmpty(request.SourceSku), (o, ocs, oct) => o.SourceSku.Contains(request.SourceSku)); } @@ -147,8 +147,18 @@ namespace BBWYB.Server.Business #region 处理采购信息 var orderPurchaseInfoList = fsql.Select().Where(op => orderIdList.Contains(op.OrderId)).ToList(); + var orderPurchaseSkuInfoList = fsql.Select().Where(o => orderIdList.Contains(o.OrderId)).ToList(); + foreach (var order in orderList) + { order.OrderPurchaseInfoList = orderPurchaseInfoList.Where(op => op.OrderId == order.Id).ToList(); + foreach (var purchaseOrder in order.OrderPurchaseInfoList) + { + purchaseOrder.ExpressState = orderPurchaseSkuInfoList.FirstOrDefault(x => !string.IsNullOrEmpty(x.ExpressState) && + x.PurchaseOrderId == purchaseOrder.PurchaseOrderId)?.ExpressState; + } + } + #endregion } return new OrderListResponse() diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 4860ce8..28749ba 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -505,12 +505,12 @@ namespace BBWYB.Server.Business try { restApiService.SendRequest("https://bbwy.qiyue666.com", - "/Api/PurchaseOrder/OutStock", + "/Api/PurchaseOrder/QuanTanSendGoodsCallback", new { OrderId = orderPurchaseInfo.OrderId, - SourceExpressId = wayBillNoResponse.ExpressId, - SourceExpressName = wayBillNoResponse.ExpressName, + ExpressId = wayBillNoResponse.ExpressId, + ExpressName = wayBillNoResponse.ExpressName, wayBillNoResponse.WayBillNo }, null, diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs index 0e2ffa0..9ab28d2 100644 --- a/BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs @@ -4,5 +4,10 @@ namespace BBWYB.Server.Model.Dto { public class OrderPurchaseInfoResponse : OrderPurchaseInfo { + /// + /// 物流状态 + /// 1688物流状态: 发货(CONSIGN)、揽收(ACCEPT)、运输(TRANSPORT)、派送(DELIVERING)、签收(SIGN) + /// + public string ExpressState { get; set; } } }