Skip to content

M
mall.oytour.com
Commit bc95f135 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

parents b7f28ab9 634036a5
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 43 deletions
Mall.Module.Product/GuideCarModule.cs
View file @ bc95f135
...@@ -6,6 +6,8 @@ using System.Text.RegularExpressions; ...@@ -6,6 +6,8 @@ using System.Text.RegularExpressions;
using Mall.AOP.CustomerAttribute; using Mall.AOP.CustomerAttribute;
using Mall.Common.API; using Mall.Common.API;
using Mall.Common.Plugin; using Mall.Common.Plugin;
using Mall.Model.Entity.BaseSetUp;
using Mall.Model.Entity.GuideCar;
using Mall.Model.Entity.Product; using Mall.Model.Entity.Product;
using Mall.Model.Entity.User; using Mall.Model.Entity.User;
using Mall.Model.Extend.BaseSetUp; using Mall.Model.Extend.BaseSetUp;
...@@ -183,9 +185,9 @@ namespace Mall.Module.Product ...@@ -183,9 +185,9 @@ namespace Mall.Module.Product
RB_GuideCar_Site_Extend model = SiteRepository.GetLogisticsRulesList(query).FirstOrDefault(); RB_GuideCar_Site_Extend model = SiteRepository.GetLogisticsRulesList(query).FirstOrDefault();
if (model != null) if (model != null)
{ {
//List<RB_Logistics_RulesRegion_Extend> listLogisticsRulesRegion = logisticsRulesRegionRepository.GetListRepository(new RB_Logistics_RulesRegion_Extend { TenantId = query.TenantId, RulesType = query.RulesType, MallBaseId = query.MallBaseId, RulesPriceId = model.ID }); List<RB_GuideCar_SiteRegion_Extend> listLogisticsRulesRegion = SiteRegionRepository.GetListRepository(new RB_GuideCar_SiteRegion_Extend { TenantId = query.TenantId, RulesType = query.RulesType, MallBaseId = query.MallBaseId, SiteId = model.ID });
//model.List = new List<RB_Logistics_RulesRegion_Extend>(); model.RegionList = new List<RB_GuideCar_SiteRegion_Extend>();
//model.List = listLogisticsRulesRegion; model.RegionList = listLogisticsRulesRegion;
} }
return model; return model;
...@@ -196,57 +198,57 @@ namespace Mall.Module.Product ...@@ -196,57 +198,57 @@ namespace Mall.Module.Product
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public bool AddOrUpdatePinkage(RB_Logistics_Rules_Extend model) public bool AddOrUpdateGuideCarSite(RB_GuideCar_Site_Extend model)
{ {
bool flag = false; bool flag = false;
var trans = logisticsRulesRepository.DbTransaction; var trans = SiteRepository.DbTransaction;
try try
{ {
int rulesId = 0; int rulesId = 0;
if (model.ID == 0) if (model.ID == 0)
{ {
rulesId = logisticsRulesRepository.Insert(model, trans); rulesId = SiteRepository.Insert(model, trans);
flag = rulesId > 0; flag = rulesId > 0;
} }
else else
{ {
rulesId = model.ID; rulesId = model.ID;
flag = logisticsRulesRepository.Update(model, trans); flag = SiteRepository.Update(model, trans);
List<RB_Logistics_RulesRegion_Extend> listLogisticsRulesRegion = logisticsRulesRegionRepository.GetListRepository(new RB_Logistics_RulesRegion_Extend { TenantId = model.TenantId, RulesType = model.RulesType, MallBaseId = model.MallBaseId, RulesPriceId = model.ID }); List<RB_GuideCar_SiteRegion_Extend> listLogisticsRulesRegion = SiteRegionRepository.GetListRepository(new RB_GuideCar_SiteRegion_Extend { TenantId = model.TenantId, RulesType = model.RulesType, MallBaseId = model.MallBaseId, SiteId = model.ID });
//删除之前的区域 //删除之前的区域
foreach (var itemRegion in listLogisticsRulesRegion.Where(x => x.RulesPriceId == model.ID)) foreach (var itemRegion in listLogisticsRulesRegion.Where(x => x.SiteId == model.ID))
{ {
IDictionary<string, object> filedsRegion = new Dictionary<string, object>()//删除价格下面对应的地区 IDictionary<string, object> filedsRegion = new Dictionary<string, object>()//删除价格下面对应的地区
{ {
{ nameof(RB_Logistics_RulesRegion.Status),1}, { nameof(RB_GuideCar_SiteRegion.Status),1},
{ nameof(RB_Logistics_RulesRegion.UpdateDate),System.DateTime.Now}, { nameof(RB_GuideCar_SiteRegion.UpdateDate),System.DateTime.Now},
}; };
IList<WhereHelper> whereHelpersRegion = new List<WhereHelper>() IList<WhereHelper> whereHelpersRegion = new List<WhereHelper>()
{ {
new WhereHelper (){ FiledName=nameof(RB_Logistics_RulesRegion.ID),FiledValue=itemRegion.ID,OperatorEnum=OperatorEnum.Equal} new WhereHelper (){ FiledName=nameof(RB_GuideCar_SiteRegion.ID),FiledValue=itemRegion.ID,OperatorEnum=OperatorEnum.Equal}
}; };
logisticsRulesRegionRepository.Update(filedsRegion, whereHelpersRegion, trans); SiteRegionRepository.Update(filedsRegion, whereHelpersRegion, trans);
} }
} }
if (model.List != null && model.List.Any()) if (model.RegionList != null && model.RegionList.Any())
{ {
model.List.ForEach(x => x.TenantId = model.TenantId); model.RegionList.ForEach(x => x.TenantId = model.TenantId);
model.List.ForEach(x => x.CreateDate = System.DateTime.Now); model.RegionList.ForEach(x => x.CreateDate = System.DateTime.Now);
model.List.ForEach(x => x.ID = 0); model.RegionList.ForEach(x => x.ID = 0);
model.List.ForEach(x => x.RulesPriceId = rulesId); model.RegionList.ForEach(x => x.SiteId = rulesId);
model.List.ForEach(x => x.RulesType = model.RulesType); model.RegionList.ForEach(x => x.RulesType = model.RulesType);
model.List.ForEach(x => x.MallBaseId = model.MallBaseId); model.RegionList.ForEach(x => x.MallBaseId = model.MallBaseId);
logisticsRulesRegionRepository.InsertBatch(model.List, trans); SiteRegionRepository.InsertBatch(model.RegionList, trans);
} }
logisticsRulesRepository.DBSession.Commit(); SiteRepository.DBSession.Commit();
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "AddOrUpdatePinkage"); LogHelper.Write(ex, "AddOrUpdateGuideCarSite");
logisticsRulesRepository.DBSession.Rollback("AddOrUpdatePinkage"); SiteRepository.DBSession.Rollback("AddOrUpdateGuideCarSite");
return false; return false;
} }
return flag; return flag;
...@@ -258,71 +260,71 @@ namespace Mall.Module.Product ...@@ -258,71 +260,71 @@ namespace Mall.Module.Product
/// <param name="gradeId"></param> /// <param name="gradeId"></param>
/// <param name="uid"></param> /// <param name="uid"></param>
/// <returns></returns> /// <returns></returns>
public bool DelPinkageInfo(int id, int uid, int mallBaseId) public bool DelGuideCarSiteInfo(int id, int uid, int mallBaseId)
{ {
var trans = logisticsRulesRepository.DbTransaction; var trans = SiteRepository.DbTransaction;
bool flag; bool flag;
try try
{ {
Dictionary<string, object> cols = new Dictionary<string, object>() Dictionary<string, object> cols = new Dictionary<string, object>()
{ {
{ nameof(RB_Logistics_Rules.Status),1}, { nameof(RB_GuideCar_Site.Status),1},
{ nameof(RB_Logistics_Rules.UpdateDate),DateTime.Now}, { nameof(RB_GuideCar_Site.UpdateDate),DateTime.Now},
}; };
List<WhereHelper> wheres1 = new List<WhereHelper>() { List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Logistics_Rules.ID), FiledName=nameof(RB_GuideCar_Site.ID),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Logistics_Rules.TenantId), FiledName=nameof(RB_GuideCar_Site.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Logistics_Rules.MallBaseId), FiledName=nameof(RB_GuideCar_Site.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Logistics_Rules.RulesType), FiledName=nameof(RB_GuideCar_Site.RulesType),
FiledValue=Convert.ToInt32(Common.Enum.MallBase.RulesTypeEnum.Pinkage), FiledValue=Convert.ToInt32(Common.Enum.MallBase.RulesTypeEnum.Pinkage),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
flag = logisticsRulesRepository.Update(cols, wheres1, trans); flag = SiteRepository.Update(cols, wheres1, trans);
IDictionary<string, object> filedsRegion = new Dictionary<string, object>()//删除价格下面对应的地区 IDictionary<string, object> filedsRegion = new Dictionary<string, object>()//删除价格下面对应的地区
{ {
{ nameof(RB_Logistics_RulesRegion.Status),1}, { nameof(RB_GuideCar_SiteRegion.Status),1},
{ nameof(RB_Logistics_RulesRegion.UpdateDate),System.DateTime.Now}, { nameof(RB_GuideCar_SiteRegion.UpdateDate),System.DateTime.Now},
}; };
IList<WhereHelper> whereHelpersRegion = new List<WhereHelper>() IList<WhereHelper> whereHelpersRegion = new List<WhereHelper>()
{ {
new WhereHelper (){ FiledName=nameof(RB_Logistics_RulesRegion.RulesPriceId),FiledValue=id,OperatorEnum=OperatorEnum.Equal}, new WhereHelper (){ FiledName=nameof(RB_GuideCar_SiteRegion.SiteId),FiledValue=id,OperatorEnum=OperatorEnum.Equal},
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Logistics_RulesRegion.TenantId), FiledName=nameof(RB_GuideCar_SiteRegion.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Logistics_RulesRegion.MallBaseId), FiledName=nameof(RB_GuideCar_SiteRegion.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Logistics_RulesRegion.RulesType), FiledName=nameof(RB_GuideCar_SiteRegion.RulesType),
FiledValue=Convert.ToInt32(Common.Enum.MallBase.RulesTypeEnum.Pinkage), FiledValue=Convert.ToInt32(Common.Enum.MallBase.RulesTypeEnum.Pinkage),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }; } };
flag = logisticsRulesRegionRepository.Update(filedsRegion, whereHelpersRegion, trans); flag = SiteRegionRepository.Update(filedsRegion, whereHelpersRegion, trans);
logisticsRulesRepository.DBSession.Commit(); SiteRepository.DBSession.Commit();
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DelPinkageInfo"); LogHelper.Write(ex, "DelGuideCarSiteInfo");
logisticsRulesRepository.DBSession.Rollback("DelPinkageInfo"); SiteRepository.DBSession.Rollback("DelGuideCarSiteInfo");
return false; return false;
} }
return flag; return flag;
......
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