Skip to content

M
mall.oytour.com
Commit 00451709 authored by 黄奎's avatar 黄奎
Browse files
Options

接口调整

parent 759298d3
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 163 deletions
Mall.Module.Education/EducationModule.cs
View file @ 00451709
using Mall.Common;
using Mall.AOP.CustomerAttribute;
using Mall.Common;
using Mall.Common.API;
using Mall.Common.Models;
using Mall.Common.Plugin;
......@@ -45,8 +46,6 @@ namespace Mall.Module.Education
private readonly RB_Education_CouponRepository discountCouponRepository = new RB_Education_CouponRepository();
private readonly RB_Education_CouponProductRepository productRepository = new RB_Education_CouponProductRepository();
private readonly RB_Education_MemberUseCouponRepository memberUseCouponRepository = new RB_Education_MemberUseCouponRepository();
private readonly RB_Education_MemberCouponRepository memberCouponRepository = new RB_Education_MemberCouponRepository();
private readonly RB_Education_CouponSelfMotionMemberRepository selfMotionMemberRepository = new RB_Education_CouponSelfMotionMemberRepository();
......@@ -68,10 +67,7 @@ namespace Mall.Module.Education
/// 商品
/// </summary>
private readonly RB_GoodsRepository goodsRepository = new RB_GoodsRepository();
/// <summary>
/// 商品日志
/// </summary>
private readonly RB_Goods_LogRepository goods_LogRepository = new RB_Goods_LogRepository();
/// <summary>
/// 商品区域
/// </summary>
......@@ -1772,35 +1768,37 @@ namespace Mall.Module.Education
/// <returns></returns>
public bool AddOrUpdateTeacher(RB_Education_Teacher_Extend model)
{
bool flag = false;
bool flag;
try
{
if (model.ID == 0)
{
flag = educationTeacherRepository.Insert(model) > 0;
}
else
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Education_Teacher_Extend.TeacherLogo),model.TeacherLogo},
{ nameof(RB_Education_Teacher_Extend.Name),model.Name},
{ nameof(RB_Education_Teacher_Extend.Telephone),model.Telephone},
{ nameof(RB_Education_Teacher_Extend.Introduction),model.Introduction},
{ nameof(RB_Education_Teacher_Extend.LableName),model.LableName},
{ nameof(RB_Education_Teacher_Extend.TeacherStatus),model.TeacherStatus},
{ nameof(RB_Education_Teacher_Extend.Major),model.Major},
{ nameof(RB_Education_Teacher_Extend.WorkYears),model.WorkYears},
{ nameof(RB_Education_Teacher_Extend.Nationality),model.Nationality},
{ nameof(RB_Education_Teacher_Extend.ForeignersUrl),model.ForeignersUrl},
{ nameof(RB_Education_Teacher_Extend.UserId),model.UserId},
{ nameof(RB_Education_Teacher_Extend.GoodCourse),model.GoodCourse},
{ nameof(RB_Education_Teacher_Extend.LableName),model.LableName},
{ nameof(RB_Education_Teacher_Extend.TeacherStatus),model.TeacherStatus},
{ nameof(RB_Education_Teacher_Extend.Major),model.Major},
{ nameof(RB_Education_Teacher_Extend.WorkYears),model.WorkYears},
{ nameof(RB_Education_Teacher_Extend.Nationality),model.Nationality},
{ nameof(RB_Education_Teacher_Extend.ForeignersUrl),model.ForeignersUrl},
{ nameof(RB_Education_Teacher_Extend.UserId),model.UserId},
{ nameof(RB_Education_Teacher_Extend.GoodCourse),model.GoodCourse},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_Education_Teacher_Extend.ID),
FiledValue=model.ID,
OperatorEnum=OperatorEnum.Equal
FiledValue=model.ID,
OperatorEnum=OperatorEnum.Equal
}
};
flag = educationTeacherRepository.Update(keyValues, wheres);
......@@ -1992,67 +1990,41 @@ namespace Mall.Module.Education
/// <param name="gradeId"></param>
/// <param name="uid"></param>
/// <returns></returns>
public bool DelDiscountCoupon(int id, int uid, int mallBaseId)
[TransactionCallHandler]
public virtual bool DelDiscountCoupon(int id, int uid, int mallBaseId)
{
var trans = discountCouponRepository.DbTransaction;
bool flag;
try
{
Dictionary<string, object> cols1 = new Dictionary<string, object>()
{
{ nameof(RB_Education_Coupon.Status),1},
{ nameof(RB_Education_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_Coupon.ID),
FiledValue=id,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Education_Coupon.TenantId),
FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Education_Coupon.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal
}
{
{ nameof(RB_Education_Coupon.Status),1},
{ nameof(RB_Education_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>()
{
new WhereHelper(nameof(RB_Education_Coupon.ID),id),
new WhereHelper(nameof(RB_Education_Coupon.TenantId),Convert.ToInt32(uid)),
new WhereHelper(nameof(RB_Education_Coupon.MallBaseId),Convert.ToInt32(mallBaseId)),
};
flag = discountCouponRepository.Update(cols1, wheres1);
Dictionary<string, object> cols = new Dictionary<string, object>()
{
{ nameof(RB_Education_Coupon.Status),1},
{ nameof(RB_Education_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_CouponProduct.CouponId),
FiledValue=id,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Education_CouponProduct.TenantId),
FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Education_CouponProduct.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal
}
{
{ nameof(RB_Education_Coupon.Status),1},
{ nameof(RB_Education_Coupon.UpdateDate),DateTime.Now},
};
productRepository.Update(cols, wheres);
discountCouponRepository.DBSession.Commit();
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper(nameof(RB_Education_CouponProduct.CouponId),id),
new WhereHelper(nameof(RB_Education_CouponProduct.TenantId),Convert.ToInt32(uid)),
new WhereHelper(nameof(RB_Education_CouponProduct.MallBaseId),Convert.ToInt32(mallBaseId))
};
flag= productRepository.Update(cols, wheres);
}
catch (Exception ex)
{
LogHelper.Write(ex, "DelDiscountCoupon");
discountCouponRepository.DBSession.Rollback("DelDiscountCoupon");
return false;
}
return flag;
......@@ -2373,67 +2345,41 @@ namespace Mall.Module.Education
/// <param name="gradeId"></param>
/// <param name="uid"></param>
/// <returns></returns>
public bool DelDiscountSelfMotion(int id, int uid, int mallBaseId)
[TransactionCallHandler]
public virtual bool DelDiscountSelfMotion(int id, int uid, int mallBaseId)
{
var trans = selfMotionRepository.DbTransaction;
bool flag;
try
{
Dictionary<string, object> cols1 = new Dictionary<string, object>()
{
{ nameof(RB_Education_CouponSelfMotion.Status),1},
{ nameof(RB_Education_CouponSelfMotion.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_CouponSelfMotion.ID),
FiledValue=id,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Education_CouponSelfMotion.TenantId),
FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Education_CouponSelfMotion.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal
}
{
{ nameof(RB_Education_CouponSelfMotion.Status),1},
{ nameof(RB_Education_CouponSelfMotion.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>()
{
new WhereHelper(nameof(RB_Education_CouponSelfMotion.ID),id) ,
new WhereHelper(nameof(RB_Education_CouponSelfMotion.TenantId),Convert.ToInt32(uid)),
new WhereHelper(nameof(RB_Education_CouponSelfMotion.MallBaseId),Convert.ToInt32(mallBaseId)),
};
flag = selfMotionRepository.Update(cols1, wheres1);
Dictionary<string, object> cols = new Dictionary<string, object>()
{
{ nameof(RB_Education_CouponSelfMotionMember.Status),1},
{ nameof(RB_Education_CouponSelfMotionMember.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_CouponSelfMotionMember.SelfMotionId),
FiledValue=id,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Education_CouponSelfMotionMember.TenantId),
FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Education_CouponSelfMotionMember.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal
}
{
{ nameof(RB_Education_CouponSelfMotionMember.Status),1},
{ nameof(RB_Education_CouponSelfMotionMember.UpdateDate),DateTime.Now},
};
selfMotionMemberRepository.Update(cols, wheres);
selfMotionRepository.DBSession.Commit();
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper(nameof(RB_Education_CouponSelfMotionMember.SelfMotionId),id),
new WhereHelper(nameof(RB_Education_CouponSelfMotionMember.TenantId),Convert.ToInt32(uid)),
new WhereHelper(nameof(RB_Education_CouponSelfMotionMember.MallBaseId),Convert.ToInt32(mallBaseId)),
};
flag= selfMotionMemberRepository.Update(cols, wheres);
}
catch (Exception ex)
{
LogHelper.Write(ex, "DelDiscountSelfMotion");
selfMotionRepository.DBSession.Rollback("DelDiscountSelfMotion");
return false;
}
return flag;
......@@ -2554,17 +2500,17 @@ namespace Mall.Module.Education
/// <returns></returns>
public bool AddOrUpdateArticle(RB_Education_Article_Extend model)
{
bool flag = false;
bool flag;
try
{
if (model.ID == 0)
{
flag = educationArticleRepository.Insert(model) > 0;
}
else
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Education_Article_Extend.LableName),model.LableName},
{ nameof(RB_Education_Article_Extend.Name),model.Name},
{ nameof(RB_Education_Article_Extend.IsComment),model.IsComment},
......@@ -2577,12 +2523,9 @@ namespace Mall.Module.Education
{ nameof(RB_Education_Article_Extend.ArticlePic),model.ArticlePic},
{ nameof(RB_Education_Article_Extend.TeacherId),model.TeacherId},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_Article_Extend.ID),
FiledValue=model.ID,
OperatorEnum=OperatorEnum.Equal
}
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper(nameof(RB_Education_Article_Extend.ID),model.ID)
};
flag = educationArticleRepository.Update(keyValues, wheres);
}
......@@ -2590,7 +2533,7 @@ namespace Mall.Module.Education
catch (Exception ex)
{
LogHelper.Write(ex, "AddOrUpdateArticle");
return false;
flag=false;
}
return flag;
}
......@@ -2603,7 +2546,7 @@ namespace Mall.Module.Education
/// <returns></returns>
public bool UpdateArticleBrowseNum(RB_Education_Article_Extend model)
{
bool flag = false;
bool flag;
try
{
flag = educationArticleRepository.UpdateBrowseNum(model.ID);
......@@ -2611,7 +2554,7 @@ namespace Mall.Module.Education
catch (Exception ex)
{
LogHelper.Write(ex, "UpdateArticleBrowseNum");
return false;
flag=false;
}
return flag;
}
......@@ -3199,26 +3142,23 @@ namespace Mall.Module.Education
/// <returns></returns>
public bool AddOrUpdateFollowTeacher(RB_Education_FollowTeacher model)
{
bool flag = false;
bool flag;
try
{
if (model.ID == 0)
{
flag = followTeacherRepository.Insert(model) > 0;
}
else
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Education_FollowTeacher.UpdateDate),System.DateTime.Now},
{ nameof(RB_Education_FollowTeacher.Status),model.Status}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Education_FollowTeacher.ID),
FiledValue=model.ID,
OperatorEnum=OperatorEnum.Equal
}
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper(nameof(RB_Education_FollowTeacher.ID),model.ID),
};
flag = followTeacherRepository.Update(keyValues, wheres);
}
......@@ -3226,7 +3166,7 @@ namespace Mall.Module.Education
catch (Exception ex)
{
LogHelper.Write(ex, "AddOrUpdateFollowTeacher");
return false;
flag=false;
}
return flag;
}
......
Mall.Repository/Education/RB_Education_CouponProductRepository.cs
View file @ 00451709
......@@ -80,21 +80,23 @@ namespace Mall.Repository.Education
{
builder.Append($" AND a.{nameof(RB_Education_CouponProduct.CouponId)} in ({DiscountCouponIds})");
}
string sql = "";
string builderStr = builder.ToString();
string sql;
if (IsSelectDel)
{
sql = $"SELECT a.* from {TableName} as a WHERE 1=1 ";
}
else {
sql = $"SELECT a.* from {TableName} as a WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builder.ToString()} ";
else
{
sql = $"SELECT a.* from {TableName} as a WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builderStr} ";
}
if (query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Category)
{
sql = $" SELECT a.*,b.`Name` as Relevance from {TableName} as a LEFT JOIN {PCategoryTableName} as b on a.ProductId=b.Id WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builder.ToString()} ";
sql = $" SELECT a.*,b.`Name` as Relevance from {TableName} as a LEFT JOIN {PCategoryTableName} as b on a.ProductId=b.Id WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builderStr} ";
}
else if (query.UseType == Common.Enum.MarketingCenter.UseTypeEnum.Product)
{
sql = $" SELECT a.*,b.`Name` as Relevance from {TableName} as a LEFT JOIN {GoodsTableName} as b on a.ProductId=b.Id WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builder.ToString()} ";
sql = $" SELECT a.*,b.`Name` as Relevance from {TableName} as a LEFT JOIN {GoodsTableName} as b on a.ProductId=b.Id WHERE a.{nameof(RB_Education_CouponProduct.Status)}=0 {builderStr} ";
}
return Get<RB_Education_CouponProduct_Extend>(sql).ToList();
}
......
Mall.Repository/Product/RB_GoodsRepository.cs
View file @ 00451709
......@@ -1649,7 +1649,7 @@ where {where} group by g.Id order by col.Id desc";
{
DynamicParameters parameters = new DynamicParameters();
string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0 and g.RetailStore=1";
string sourceWhere = "";
if (dmodel.GoodsClassify == 3)
{//查询非司导商品
where += $@" and g.GoodsClassify =3";
......@@ -1694,7 +1694,7 @@ where {where} group by g.Id order by col.Id desc";
where += $@" and IFNULL(synchro.{nameof(RB_Goods_Extend.Isynchro)},0)=0";
}
}
sourceWhere = $@"and TenantId={dmodel.SourceTenantId} and MallBaseId={dmodel.SourceMallBaseId}";
string sourceWhere = $@"and TenantId={dmodel.SourceTenantId} and MallBaseId={dmodel.SourceMallBaseId}";
if (!string.IsNullOrEmpty(dmodel.GoodsIds))
{
where += $@" and g.{nameof(RB_Goods_Extend.Id)} in({dmodel.GoodsIds})";
......
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ 00451709
......@@ -760,18 +760,6 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid
return 0;
}
/// <summary>
/// 获取七天后自动释放
/// </summary>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public List<RB_Member_User_Extend> AutoReleaseTheOffline(int tenantId, int mallBaseId)
{
string sql = $@"SELECT * FROM rb_member_user WHERE DownlineCondition=4 and IsDistributor = 0 and SuperiorId >0 AND DATE_ADD(CreateDate,INTERVAL 7 DAY) < '{Common.ConvertHelper.FormatTime(DateTime.Now)}'";
return Get<RB_Member_User_Extend>(sql).ToList();
}
/// <summary>
/// 获取用户上级所有的id
/// </summary>
......
Mall.WebApi/Controllers/Education/AppletSchoolController.cs
View file @ 00451709
......@@ -677,10 +677,12 @@ namespace Mall.WebApi.Controllers.Education
public ApiResult GetEducationTalkList(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
Rb_Education_Talk_Extend demodel = new Rb_Education_Talk_Extend();
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.IsOpen = 1;
Rb_Education_Talk_Extend demodel = new Rb_Education_Talk_Extend
{
TenantId = parms.TenantId,
MallBaseId = parms.MallBaseId,
IsOpen = 1
};
List<Rb_Education_Talk_Extend> talkList = dynamicModule.GetEducationTalkList(demodel);
return ApiResult.Success("", talkList.Select(x => new { x.IsOpen, x.Id, x.Content, x.CoverPhoto }));
}
......
Mall.WebApi/Controllers/Education/EducationController.cs
View file @ 00451709
......@@ -33,7 +33,7 @@ namespace Mall.WebApi.Controllers.Education
public class EducationController : BaseController
{
private readonly IHttpContextAccessor _accessor;
private readonly EducationModule educationModule = new EducationModule();
private readonly EducationModule educationModule = AOP.AOPHelper.CreateAOPObject<EducationModule>();
private readonly Module.User.UserModule UserModule = new Module.User.UserModule();
private readonly DynamicModule dynamicModule = new DynamicModule();
private readonly ActivityModule activityModule = new ActivityModule();
......
Mall.WebApi/Controllers/User/MemberUserController.cs
View file @ 00451709
......@@ -23,7 +23,7 @@ namespace Mall.WebApi.Controllers.User
[EnableCors("AllowCors")]
public class MemberUserController : BaseController
{
private MemberUserModule MemberUserModule = new MemberUserModule();
private readonly MemberUserModule MemberUserModule = new MemberUserModule();
/// <summary>
/// 根据用户Id更新用户头像和名称
......
Mall.sln
View file @ 00451709
......@@ -59,6 +59,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.TradePavilion",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.Miai", "Mall.Module.Miai\Mall.Module.Miai.csproj", "{2EEB81FD-7176-4407-871E-AC41343BC601}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7E74ADDD-09BE-4C5B-8FA4-EE384282D553}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......
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