Commit 9b43f225 authored by 吴春's avatar 吴春

提交代码

parent aae3ad06
...@@ -650,8 +650,13 @@ where {where} order by o.CreateDate desc"; ...@@ -650,8 +650,13 @@ where {where} order by o.CreateDate desc";
where += $@" and o.{nameof(RB_Goods_Order.UserId)} ={dmodel.UserId}"; where += $@" and o.{nameof(RB_Goods_Order.UserId)} ={dmodel.UserId}";
} }
string sql = $@"SELECT a.* FROM rb_goods_orderdetail as a string sql = $@"SELECT a.*,e.`Name` as CarName,e.CarType as GuideCarType,e.CarClass,f.ColorName as CarColorName,cb.`Name` as CarBrandName,g.RideNum,gcg.Name as GuideName,gcg.GuidePhoto,gcg.WorkYears as GuideWorkYears,gcg.Score as GuideScore,gcg.Telephone as GuideTelephone FROM rb_goods_orderdetail as a
left join rb_goods_order o on a.OrderId = o.OrderId left join rb_goods_order o on a.OrderId = o.OrderId
LEFT JOIN rb_guidecar_car as e on e.ID=a.CarId
LEFT JOIN rb_guidecar_carbrand as cb on e.CarBrandId=cb.ID
LEFT JOIN rb_guidecar_carcolor as f on f.ID=a.CarColorId
LEFT JOIN rb_guidecar_guide as gcg on gcg.ID=a.GuideId
LEFT JOIN rb_goods as g on g.ID=a.GoodsId
where {where} order by a.Id desc"; where {where} order by a.Id desc";
return GetPage<RB_Goods_OrderDetail_Extend>(pageIndex, pageSize, out count, sql).ToList(); return GetPage<RB_Goods_OrderDetail_Extend>(pageIndex, pageSize, out count, sql).ToList();
} }
......
...@@ -1108,7 +1108,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1108,7 +1108,12 @@ namespace Mall.WebApi.Controllers.MallBase
x.SpecificationList, x.SpecificationList,
x.IsComment, x.IsComment,
x.OrderId, x.OrderId,
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
x.CarName,
x.CarColorName,
x.CarBrandName,
x.GuideName,
x.GuidePhoto
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment