Skip to content

M
mall.oytour.com
Commit 71bd60c5 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent c5e71897
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 15 deletions
Mall.Module.Education/EducationModule.cs
View file @ 71bd60c5
...@@ -783,7 +783,8 @@ namespace Mall.Module.Education ...@@ -783,7 +783,8 @@ namespace Mall.Module.Education
var coinsertList = demodel.CourseList.Where(x => !courselist.Select(y => y.Id).Contains(x.Id)).ToList(); var coinsertList = demodel.CourseList.Where(x => !courselist.Select(y => y.Id).Contains(x.Id)).ToList();
var codeleteList = courselist.Where(x => !demodel.CourseList.Select(y => y.Id).Contains(x.Id)).ToList(); var codeleteList = courselist.Where(x => !demodel.CourseList.Select(y => y.Id).Contains(x.Id)).ToList();
var coupdateList = courselist.Where(x => demodel.CourseList.Select(y => y.Id).Contains(x.Id)).ToList(); var coupdateList = courselist.Where(x => demodel.CourseList.Select(y => y.Id).Contains(x.Id)).ToList();
foreach (var item in coinsertList) { foreach (var item in coinsertList)
{
int courseId = goods_WK_CourseRepository.Insert(new RB_Goods_WK_Course() int courseId = goods_WK_CourseRepository.Insert(new RB_Goods_WK_Course()
{ {
Id = 0, Id = 0,
...@@ -827,11 +828,13 @@ namespace Mall.Module.Education ...@@ -827,11 +828,13 @@ namespace Mall.Module.Education
})); }));
} }
} }
foreach (var item in coupdateList) { foreach (var item in coupdateList)
{
var courseModel = demodel.CourseList.Where(x => x.Id == item.Id).FirstOrDefault(); var courseModel = demodel.CourseList.Where(x => x.Id == item.Id).FirstOrDefault();
if (courseModel == null) { continue; } if (courseModel == null) { continue; }
bool IsUpdateImage = false; bool IsUpdateImage = false;
if (item.FilePath != courseModel.FilePath) { if (item.FilePath != courseModel.FilePath)
{
IsUpdateImage = true; IsUpdateImage = true;
} }
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() { Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
...@@ -881,7 +884,8 @@ namespace Mall.Module.Education ...@@ -881,7 +884,8 @@ namespace Mall.Module.Education
})); }));
} }
} }
foreach (var item in codeleteList) { foreach (var item in codeleteList)
{
goods_WK_CourseRepository.Delete(item); goods_WK_CourseRepository.Delete(item);
} }
#endregion #endregion
...@@ -979,7 +983,8 @@ namespace Mall.Module.Education ...@@ -979,7 +983,8 @@ namespace Mall.Module.Education
}); });
} }
//插入课程列表 //插入课程列表
foreach (var item in demodel.CourseList) { foreach (var item in demodel.CourseList)
{
int courseId = goods_WK_CourseRepository.Insert(new RB_Goods_WK_Course() int courseId = goods_WK_CourseRepository.Insert(new RB_Goods_WK_Course()
{ {
Id = 0, Id = 0,
...@@ -1013,7 +1018,8 @@ namespace Mall.Module.Education ...@@ -1013,7 +1018,8 @@ namespace Mall.Module.Education
UserName = "guest", UserName = "guest",
Password = "viitto2019", Password = "viitto2019",
QueenName = RabbitKey.QUEEN_GENERATE_EDUCARION QueenName = RabbitKey.QUEEN_GENERATE_EDUCARION
}, JsonConvert.SerializeObject(new { }, JsonConvert.SerializeObject(new
{
GoodsId = Id, GoodsId = Id,
CourseId = courseId, CourseId = courseId,
item.FilePath, item.FilePath,
...@@ -1931,7 +1937,7 @@ namespace Mall.Module.Education ...@@ -1931,7 +1937,7 @@ namespace Mall.Module.Education
} }
/// <summary> /// <summary>
///资讯列表 ///资讯列表
/// </summary> /// </summary>
...@@ -2005,6 +2011,25 @@ namespace Mall.Module.Education ...@@ -2005,6 +2011,25 @@ namespace Mall.Module.Education
} }
/// <summary>
/// 更新资讯浏览数
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool UpdateArticleBrowseNum(RB_Education_Article_Extend model)
{
bool flag = false;
try
{
flag = educationArticleRepository.UpdateBrowseNum(model.ID);
}
catch (Exception ex)
{
LogHelper.Write(ex, "UpdateArticleBrowseNum");
return false;
}
return flag;
}
/// <summary> /// <summary>
/// 批量上下架资讯 /// 批量上下架资讯
...@@ -2114,7 +2139,7 @@ namespace Mall.Module.Education ...@@ -2114,7 +2139,7 @@ namespace Mall.Module.Education
#endregion #endregion
#region 教育-资讯评论管理 #region 教育-资讯评论管理
/// <summary> /// <summary>
/// 获取订单评论分页列表 /// 获取订单评论分页列表
/// </summary> /// </summary>
...@@ -2150,9 +2175,9 @@ namespace Mall.Module.Education ...@@ -2150,9 +2175,9 @@ namespace Mall.Module.Education
/// <returns></returns> /// <returns></returns>
public bool SetArticleCommentInfo(RB_Education_ArticleComment_Extend demodel) public bool SetArticleCommentInfo(RB_Education_ArticleComment_Extend demodel)
{ {
bool flag = educationArticleCommentRepository.Insert(demodel) > 0; bool flag = educationArticleCommentRepository.Insert(demodel) > 0;
return flag; return flag;
} }
...@@ -2281,8 +2306,8 @@ namespace Mall.Module.Education ...@@ -2281,8 +2306,8 @@ namespace Mall.Module.Education
GetType = item.TriggerType, GetType = item.TriggerType,
UseType = item.UseType, UseType = item.UseType,
Name = item.Name, Name = item.Name,
HeXiao=item.HeXiao, HeXiao = item.HeXiao,
UseHeXiao=0 UseHeXiao = 0
}; };
isReceive = memberCouponRepository.Insert(nowMemberCoupon, trans) > 0; isReceive = memberCouponRepository.Insert(nowMemberCoupon, trans) > 0;
......
Mall.Repository/Education/RB_Education_ArticleRepository.cs
View file @ 71bd60c5
...@@ -29,7 +29,7 @@ namespace Mall.Repository.Education ...@@ -29,7 +29,7 @@ namespace Mall.Repository.Education
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(@$" SELECT a.*,b.CommentNum,c.Major,c.TeacherLogo,c.`Name` as TeacherName FROM {TableName} as a LEFT JOIN (SELECT ArticleId,COUNT(*) as CommentNum from rb_education_articlecomment where `Status`=0 GROUP BY ArticleId ) builder.Append(@$" SELECT a.*,b.CommentNum,c.Major,c.TeacherLogo,c.`Name` as TeacherName FROM {TableName} as a LEFT JOIN (SELECT ArticleId,COUNT(*) as CommentNum from rb_education_articlecomment where `Status`=0 GROUP BY ArticleId )
as b on a.ID = b.ArticleId as b on a.ID = b.ArticleId
LEFT JOIN rb_education_teacher as c on a.TeacherId=c.ID WHERE a.{nameof(RB_Education_Article_Extend.Status)}=0 and c.{nameof(RB_Education_Teacher.Status)}=0"); LEFT JOIN rb_education_teacher as c on a.TeacherId=c.ID and c.{nameof(RB_Education_Teacher.Status)}=0 WHERE a.{nameof(RB_Education_Article_Extend.Status)}=0 ");
if (query != null) if (query != null)
{ {
if (query.TenantId > 0) if (query.TenantId > 0)
...@@ -85,8 +85,8 @@ LEFT JOIN rb_education_teacher as c on a.TeacherId=c.ID WHERE a.{nameof(RB_Educ ...@@ -85,8 +85,8 @@ LEFT JOIN rb_education_teacher as c on a.TeacherId=c.ID WHERE a.{nameof(RB_Educ
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(@$" SELECT a.*,b.CommentNum,c.Major,c.TeacherLogo,c.`Name` as TeacherName FROM {TableName} as a LEFT JOIN (SELECT ArticleId,COUNT(*) as CommentNum from rb_education_articlecomment where `Status`=0 GROUP BY ArticleId ) builder.Append(@$" SELECT a.*,b.CommentNum,c.Major,c.TeacherLogo,c.`Name` as TeacherName FROM {TableName} as a LEFT JOIN (SELECT ArticleId,COUNT(*) as CommentNum from rb_education_articlecomment where `Status`=0 GROUP BY ArticleId )
as b on a.ID = b.ArticleId as b on a.ID = b.ArticleId
LEFT JOIN rb_education_teacher as c on a.TeacherId = c.ID WHERE a.{nameof(RB_Education_Article_Extend.Status)}=0 and c.{nameof(RB_Education_Teacher.Status)}=0"); LEFT JOIN rb_education_teacher as c on a.TeacherId=c.ID and c.{nameof(RB_Education_Teacher.Status)}=0 WHERE a.{nameof(RB_Education_Article_Extend.Status)}=0 ");
if (query != null) if (query != null)
{ {
if (query.TenantId > 0) if (query.TenantId > 0)
...@@ -124,5 +124,24 @@ LEFT JOIN rb_education_teacher as c on a.TeacherId = c.ID WHERE a.{nameof(RB_Ed ...@@ -124,5 +124,24 @@ LEFT JOIN rb_education_teacher as c on a.TeacherId = c.ID WHERE a.{nameof(RB_Ed
} }
return Get<RB_Education_Article_Extend>(builder.ToString()).ToList(); return Get<RB_Education_Article_Extend>(builder.ToString()).ToList();
} }
/// <summary>
/// 更新浏览数
/// </summary>
/// <param name="ID"></param>
/// <returns></returns>
public bool UpdateBrowseNum(int ID)
{
var obj = ExecuteScalar($"update rb_education_article set BrowseNum=BrowseNum+1 where ID={ID}");
if (obj != null)
{
return true;
}
return false;
}
} }
} }
Mall.WebApi/Controllers/Education/AppletSchoolController.cs
View file @ 71bd60c5
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Mall.Module.Education; using Mall.Module.Education;
using Mall.Common.API;
using Newtonsoft.Json;
using Mall.Model.Extend.Education;
using System;
using System.Linq;
namespace Mall.WebApi.Controllers.Education namespace Mall.WebApi.Controllers.Education
{ {
...@@ -16,6 +21,83 @@ namespace Mall.WebApi.Controllers.Education ...@@ -16,6 +21,83 @@ namespace Mall.WebApi.Controllers.Education
#region 资讯 #region 资讯
/// <summary>
/// 小程序分页列表(赞羊)
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetArticlePageList(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
if (parms.MallBaseId <= 0)
{
return ApiResult.ParamIsNull();
}
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Education_Article_Extend demodel = JsonConvert.DeserializeObject<RB_Education_Article_Extend>(parms.msg.ToString());
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.ArticleStatus = 1;//只查询销售中的
var list = educationModule.GetArticlePageListRepository(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.ID,
x.Name,
CreateDateStr = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
x.ArticleStatus,
x.IsComment,
x.CommentNum,
x.BrowseNum,
x.FictitiousBrowseNum,
x.ArticlePic,
x.TeacherName,
x.TeacherLogo,
x.Major
});
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取详情
/// </summary>
/// <returns></returns>
public ApiResult GetArticleModel(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
if (parms.MallBaseId <= 0)
{
return ApiResult.ParamIsNull();
}
var query = JsonConvert.DeserializeObject<RB_Education_Article_Extend>(parms.msg.ToString());
query.TenantId = parms.TenantId;
query.MallBaseId = parms.MallBaseId;
query.ArticleStatus = 1;
var oldLogisticsModel = educationModule.GetArticleInfo(query);
if (oldLogisticsModel == null)
{
oldLogisticsModel = new RB_Education_Article_Extend();
}
//更新浏览数
try
{
if (oldLogisticsModel.ID > 0)
{
educationModule.UpdateArticleBrowseNum(oldLogisticsModel);
}
}
catch (Exception ex)
{
}
return ApiResult.Success("", oldLogisticsModel);
}
#endregion #endregion
} }
} }
\ No newline at end of file
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