bbwyb 采购单返回物流状态

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<OrderPurchaseInfo>().Where(op => orderIdList.Contains(op.OrderId)).ToList<OrderPurchaseInfoResponse>();
+                var orderPurchaseSkuInfoList = fsql.Select<OrderPurchaseSkuInfo>().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()

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,
+                                 ExpressId = wayBillNoResponse.ExpressId,
-                                 SourceExpressName = wayBillNoResponse.ExpressName,
+                                 ExpressName = wayBillNoResponse.ExpressName,
                                  wayBillNoResponse.WayBillNo
                              },
                              null,

BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs

@@ -4,5 +4,10 @@ namespace BBWYB.Server.Model.Dto
 {
     public class OrderPurchaseInfoResponse : OrderPurchaseInfo
     {
+        /// <summary>
+        /// 物流状态
+        /// <para>1688物流状态: 发货(CONSIGN)、揽收(ACCEPT)、运输(TRANSPORT)、派送(DELIVERING)、签收(SIGN)</para>
+        /// </summary>
+        public string ExpressState { get; set; }
     }
 }