Commit 1aedb5a1 authored by 黄奎's avatar 黄奎

页面修改

parent ab284459
...@@ -390,5 +390,10 @@ namespace Mall.Model.Extend.Product ...@@ -390,5 +390,10 @@ namespace Mall.Model.Extend.Product
/// 绑定物品列表 /// 绑定物品列表
/// </summary> /// </summary>
public List<RB_Goods_Relevance_Extend> GoodsRelevanceList { get; set; } public List<RB_Goods_Relevance_Extend> GoodsRelevanceList { get; set; }
/// <summary>
/// 进阶小课堂老师Id
/// </summary>
public int EduTeacherId { get; set; }
} }
} }
...@@ -64,7 +64,7 @@ namespace Mall.Repository.Product ...@@ -64,7 +64,7 @@ namespace Mall.Repository.Product
} }
string sql = $@" string sql = $@"
SELECT a.*,b.`Name` as SupplierName,C.EduJsonData SELECT a.*,b.`Name` as SupplierName,C.EduJsonData,IFNULL(C.EduTeacherId,0) AS EduTeacherId
FROM rb_goods_orderdetail as a LEFT JOIN rb_supplier as b on a.SupplierId=b.ID FROM rb_goods_orderdetail as a LEFT JOIN rb_supplier as b on a.SupplierId=b.ID
LEFT JOIN rb_goods AS C ON a.GoodsId=C.Id LEFT JOIN rb_goods AS C ON a.GoodsId=C.Id
WHERE {where} order by a.Id asc"; WHERE {where} order by a.Id asc";
......
...@@ -266,7 +266,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -266,7 +266,8 @@ namespace Mall.WebApi.Controllers.MallBase
y.Number, y.Number,
y.IsComment, y.IsComment,
y.FreeShippingRemarks, y.FreeShippingRemarks,
InsuranceMoney = y.InsuranceMoney ?? 0 InsuranceMoney = y.InsuranceMoney ?? 0,
y.EduTeacherId,
}), }),
x.OrderStatus, x.OrderStatus,
OrderStatusName = x.OrderStatus.GetEnumName(), OrderStatusName = x.OrderStatus.GetEnumName(),
...@@ -275,7 +276,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -275,7 +276,8 @@ namespace Mall.WebApi.Controllers.MallBase
x.TenantId, x.TenantId,
x.MallBaseId, x.MallBaseId,
x.PresentFXGrade, x.PresentFXGrade,
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.JJSWStuId,
}); });
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