mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 20:03:26 +08:00
接口【修复】:修复后台合并发货,前端获取发货物流信息失效的问题。
This commit is contained in:
@@ -805,7 +805,7 @@ namespace CoreCms.Net.Services
|
|||||||
//售后单
|
//售后单
|
||||||
order.aftersalesItem = await _billAftersalesServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
|
order.aftersalesItem = await _billAftersalesServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
|
||||||
//发货单
|
//发货单
|
||||||
order.delivery = await _billDeliveryServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
|
order.delivery = await _billDeliveryServices.QueryListByClauseAsync(p => p.orderId.Contains(order.orderId));
|
||||||
if (order.delivery != null && order.delivery.Any())
|
if (order.delivery != null && order.delivery.Any())
|
||||||
{
|
{
|
||||||
foreach (var item in order.delivery)
|
foreach (var item in order.delivery)
|
||||||
@@ -1676,7 +1676,7 @@ namespace CoreCms.Net.Services
|
|||||||
return jm;
|
return jm;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (orderInfo.status!= (int)GlobalEnumVars.OrderStatus.Normal)
|
if (orderInfo.status != (int)GlobalEnumVars.OrderStatus.Normal)
|
||||||
{
|
{
|
||||||
jm.status = false;
|
jm.status = false;
|
||||||
jm.msg = "不满足条件,订单必须是进行中状态。";
|
jm.msg = "不满足条件,订单必须是进行中状态。";
|
||||||
|
|||||||
Reference in New Issue
Block a user