Skip to content

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

提交代码

parent 9814d904
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 50 deletions
Mall.Module.Education/ActivityModule.cs
View file @ cdb7e1cd
......@@ -299,7 +299,7 @@ namespace Mall.Module.Education
public bool SetActivityModule(RB_Education_Activity_Extend model)
{
bool flag;
//var trans = education_ActivityRepository.DbTransaction;
var trans = education_ActivityRepository.DbTransaction;
try
{
if (model.Id > 0)
......@@ -331,59 +331,59 @@ namespace Mall.Module.Education
{nameof(RB_Education_Activity_Extend.LnsideLimit),model.LnsideLimit },
};
flag = education_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Activity_Extend.Id), model.Id));
//if (flag)
//{
// var titleList = education_ActivityTitleRepository.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
// if (titleList != null && titleList.Any())
// {
// education_ActivityTitleRepository.DeleteBatch(titleList, trans);
// }
// var planList = education_ActivityPlanRepository.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
// if (planList != null && planList.Any())
// {
// education_ActivityPlanRepository.DeleteBatch(planList, trans);
// }
//}
flag = education_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Activity_Extend.Id), model.Id), trans);
if (flag)
{
var titleList = education_ActivityTitleRepository.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
if (titleList != null && titleList.Any())
{
education_ActivityTitleRepository.DeleteBatch(titleList, trans);
}
var planList = education_ActivityPlanRepository.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
if (planList != null && planList.Any())
{
education_ActivityPlanRepository.DeleteBatch(planList, trans);
}
}
}
else
{
var newId = education_ActivityRepository.Insert(model);
var newId = education_ActivityRepository.Insert(model, trans);
model.Id = newId;
flag = newId > 0;
}
//if (flag && model.ActivityTitleList != null && model.ActivityTitleList.Any())
//{
// model.ActivityTitleList.ForEach(x => x.TenantId = model.TenantId);
// model.ActivityTitleList.ForEach(x => x.MallBaseId = model.MallBaseId);
// model.ActivityTitleList.ForEach(x => x.ActivityId = model.Id);
// model.ActivityTitleList.ForEach(x => x.Id = 0);
// model.ActivityTitleList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
// foreach (var item in model.ActivityTitleList)
// {
// var titleId = education_ActivityTitleRepository.Insert(item, trans);
// if (item.ActivityPlanList != null && item.ActivityPlanList.Any())
// {
// item.ActivityPlanList.ForEach(x => x.Id = 0);
// item.ActivityPlanList.ForEach(x => x.TenantId = model.TenantId);
// item.ActivityPlanList.ForEach(x => x.MallBaseId = model.MallBaseId);
// item.ActivityPlanList.ForEach(x => x.ActivityId = model.Id);
// item.ActivityPlanList.ForEach(x => x.TitleId = titleId);
// item.ActivityPlanList.ForEach(x => x.TripPic = (x.TripPicList != null && x.TripPicList.Any()) ? JsonConvert.SerializeObject(x.TripPicList) : "");
// item.ActivityPlanList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
// education_ActivityPlanRepository.InsertBatch(item.ActivityPlanList, trans);
// }
// }
//}
// education_ActivityRepository.DBSession.Commit();
if (flag && model.ActivityTitleList != null && model.ActivityTitleList.Any())
{
model.ActivityTitleList.ForEach(x => x.TenantId = model.TenantId);
model.ActivityTitleList.ForEach(x => x.MallBaseId = model.MallBaseId);
model.ActivityTitleList.ForEach(x => x.ActivityId = model.Id);
model.ActivityTitleList.ForEach(x => x.Id = 0);
model.ActivityTitleList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
foreach (var item in model.ActivityTitleList)
{
var titleId = education_ActivityTitleRepository.Insert(item, trans);
if (item.ActivityPlanList != null && item.ActivityPlanList.Any())
{
item.ActivityPlanList.ForEach(x => x.Id = 0);
item.ActivityPlanList.ForEach(x => x.TenantId = model.TenantId);
item.ActivityPlanList.ForEach(x => x.MallBaseId = model.MallBaseId);
item.ActivityPlanList.ForEach(x => x.ActivityId = model.Id);
item.ActivityPlanList.ForEach(x => x.TitleId = titleId);
item.ActivityPlanList.ForEach(x => x.TripPic = (x.TripPicList != null && x.TripPicList.Any()) ? JsonConvert.SerializeObject(x.TripPicList) : "");
item.ActivityPlanList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
education_ActivityPlanRepository.InsertBatch(item.ActivityPlanList, trans);
}
}
}
education_ActivityRepository.DBSession.Commit();
return flag;
}
catch (Exception ex)
{
// education_ActivityRepository.DBSession.Rollback("SetActivityModule");
education_ActivityRepository.DBSession.Rollback("SetActivityModule");
return false;
}
}
......
Mall.WebApi/Controllers/Education/EducationController.cs
View file @ cdb7e1cd
......@@ -2082,14 +2082,14 @@ namespace Mall.WebApi.Controllers.Education
LocationName = jObj.GetStringValue("LocationName"),
LnsideLimit = jObj.GetInt("LnsideLimit", 0),
};
//try
//{
// extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
//}
//catch (Exception ex)
//{
// extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
//}
try
{
extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
}
catch (Exception ex)
{
extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
}
extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = RequestParm.MallBaseId;
extModel.TenantId = RequestParm.TenantId;
......
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