Commit fbb616e1 authored by liudong1993's avatar liudong1993

1

parent 53741b29
...@@ -672,6 +672,14 @@ namespace Mall.Module.Product ...@@ -672,6 +672,14 @@ namespace Mall.Module.Product
return ApiResult.Failed("未查询到订单商品信息"); return ApiResult.Failed("未查询到订单商品信息");
} }
dModel.CoverImagePath = dModel.CoverImage; dModel.CoverImagePath = dModel.CoverImage;
var omodel = goods_OrderRepository.GetEntity(dModel.OrderId);
if (omodel == null) {
return ApiResult.Failed("未查询到订单信息");
}
decimal Final_Price = dModel.Final_Price ?? 0;
if (omodel.Income < dModel.Final_Price) {
Final_Price = omodel.Income ?? 0;
}
return ApiResult.Success("", new return ApiResult.Success("", new
{ {
DetailId = dModel.Id, DetailId = dModel.Id,
...@@ -680,7 +688,7 @@ namespace Mall.Module.Product ...@@ -680,7 +688,7 @@ namespace Mall.Module.Product
dModel.GoodsName, dModel.GoodsName,
SpecificationList = JsonConvert.DeserializeObject<List<string>>(dModel.Specification), SpecificationList = JsonConvert.DeserializeObject<List<string>>(dModel.Specification),
dModel.Number, dModel.Number,
dModel.Final_Price, Final_Price,
dModel.FreightMoney dModel.FreightMoney
}); });
} }
...@@ -2574,7 +2582,7 @@ namespace Mall.Module.Product ...@@ -2574,7 +2582,7 @@ namespace Mall.Module.Product
{ {
continue; continue;
} }
//item.SupplierId = gmodel.SpplierID; item.SupplierId = gmodel.SupplierId;
item.CouponMoney = 0; item.CouponMoney = 0;
var couponModel = GoodsCouponList.Where(x => x.GoodsId == item.GoodsId).FirstOrDefault(); var couponModel = GoodsCouponList.Where(x => x.GoodsId == item.GoodsId).FirstOrDefault();
if (couponModel != null) if (couponModel != null)
......
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