Skip to content

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

页面修改

parent 3d2ca414
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 160 deletions
Mall.Module.Education/ActivityModule.cs
View file @ 388a9382
......@@ -334,32 +334,31 @@ namespace Mall.Module.Education
if (model.Id > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Activity_Extend.ActivityName),model.ActivityName },
{nameof(RB_Education_Activity_Extend.StartTime),model.StartTime },
{nameof(RB_Education_Activity_Extend.EndTime),model.EndTime },
{nameof(RB_Education_Activity_Extend.CoverImg),model.CoverImg },
{nameof(RB_Education_Activity_Extend.ActivityType),model.ActivityType },
{nameof(RB_Education_Activity_Extend.ActivityInfo),model.ActivityInfo },
{nameof(RB_Education_Activity_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Education_Activity_Extend.UpdateDate),model.UpdateDate },
{nameof(RB_Education_Activity_Extend.SignStartTime),model.SignStartTime },
{nameof(RB_Education_Activity_Extend.SignEndTime),model.SignEndTime },
{nameof(RB_Education_Activity_Extend.IsFree),model.IsFree },
{nameof(RB_Education_Activity_Extend.Price),model.Price },
{nameof(RB_Education_Activity_Extend.IsCancelConfirm),model.IsCancelConfirm },
{nameof(RB_Education_Activity_Extend.PointNum),model.PointNum },
{nameof(RB_Education_Activity_Extend.AgeLimit),model.AgeLimit },
{nameof(RB_Education_Activity_Extend.StartAge),model.StartAge },
{nameof(RB_Education_Activity_Extend.EndAge),model.EndAge },
{nameof(RB_Education_Activity_Extend.WoManNum),model.WoManNum },
{nameof(RB_Education_Activity_Extend.ManNum),model.ManNum },
{nameof(RB_Education_Activity_Extend.Distinguish),model.Distinguish },
{nameof(RB_Education_Activity_Extend.LonLat),model.LonLat },
{nameof(RB_Education_Activity_Extend.LocationName),model.LocationName },
{nameof(RB_Education_Activity_Extend.LnsideLimit),model.LnsideLimit },
};
{
{nameof(RB_Education_Activity_Extend.ActivityName),model.ActivityName },
{nameof(RB_Education_Activity_Extend.StartTime),model.StartTime },
{nameof(RB_Education_Activity_Extend.EndTime),model.EndTime },
{nameof(RB_Education_Activity_Extend.CoverImg),model.CoverImg },
{nameof(RB_Education_Activity_Extend.ActivityType),model.ActivityType },
{nameof(RB_Education_Activity_Extend.ActivityInfo),model.ActivityInfo },
{nameof(RB_Education_Activity_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Education_Activity_Extend.UpdateDate),model.UpdateDate },
{nameof(RB_Education_Activity_Extend.SignStartTime),model.SignStartTime },
{nameof(RB_Education_Activity_Extend.SignEndTime),model.SignEndTime },
{nameof(RB_Education_Activity_Extend.IsFree),model.IsFree },
{nameof(RB_Education_Activity_Extend.Price),model.Price },
{nameof(RB_Education_Activity_Extend.IsCancelConfirm),model.IsCancelConfirm },
{nameof(RB_Education_Activity_Extend.PointNum),model.PointNum },
{nameof(RB_Education_Activity_Extend.AgeLimit),model.AgeLimit },
{nameof(RB_Education_Activity_Extend.StartAge),model.StartAge },
{nameof(RB_Education_Activity_Extend.EndAge),model.EndAge },
{nameof(RB_Education_Activity_Extend.WoManNum),model.WoManNum },
{nameof(RB_Education_Activity_Extend.ManNum),model.ManNum },
{nameof(RB_Education_Activity_Extend.Distinguish),model.Distinguish },
{nameof(RB_Education_Activity_Extend.LonLat),model.LonLat },
{nameof(RB_Education_Activity_Extend.LocationName),model.LocationName },
{nameof(RB_Education_Activity_Extend.LnsideLimit),model.LnsideLimit },
};
flag = education_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Activity_Extend.Id), model.Id), trans);
if (flag)
{
......@@ -412,6 +411,7 @@ namespace Mall.Module.Education
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, string.Format("SetActivityModule_Msg:{0}",Common.Plugin.JsonHelper.Serialize(model)));
education_ActivityRepository.DBSession.Rollback("SetActivityModule");
return false;
}
......@@ -469,7 +469,7 @@ namespace Mall.Module.Education
education_ActivityTitleRepository.DBSession.Commit();
return flag;
}
catch (Exception ex)
catch
{
education_ActivityTitleRepository.DBSession.Rollback("SetActivityPlanModule");
return false;
......@@ -585,7 +585,7 @@ namespace Mall.Module.Education
/// <returns></returns>
public bool SetEduSellBaseInfo(RB_Education_EduSell_Extend model)
{
bool flag = false;
bool flag;
if (model.Id == 0)
{
flag = education_EduSellRepository.Insert(model) > 0;
......@@ -646,7 +646,7 @@ namespace Mall.Module.Education
/// <returns></returns>
public bool SetEduBaseInfo(RB_Education_BaseInfo_Extend model)
{
bool flag = false;
bool flag;
if (model.Id == 0)
{
flag = education_BaseInfoRepository.Insert(model) > 0;
......@@ -685,7 +685,7 @@ namespace Mall.Module.Education
/// <returns></returns>
public bool UpdateEduBaseInfoSex(RB_Education_BaseInfo_Extend model)
{
bool flag = false;
bool flag;
if (model.Id == 0)
{
flag = education_BaseInfoRepository.Insert(model) > 0;
......@@ -1469,7 +1469,7 @@ namespace Mall.Module.Education
ClientType = 0,
ClientID = 0,
IsPublic = 8,
CurrencyId = financeConfig.CurrencyId,
financeConfig.CurrencyId,
BType = 1,
WBMoney = Convert.ToDecimal(model.Money),
PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
......@@ -1685,7 +1685,7 @@ namespace Mall.Module.Education
ClientType = 0,
ClientID = 0,
IsPublic = 8,
CurrencyId = financeConfig.CurrencyId,
financeConfig.CurrencyId,
BType = 1,
WBMoney = Convert.ToDecimal(cmodel.Money),
PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
......
Mall.Module.Product/ProductModule.cs
View file @ 388a9382
......@@ -134,7 +134,7 @@ namespace Mall.Module.Product
/// <summary>
/// 商户仓储层对象
/// </summary>
private Mall.Repository.User.RB_MiniProgramRepository programRepository = new Repository.User.RB_MiniProgramRepository();
private readonly RB_MiniProgramRepository programRepository = new RB_MiniProgramRepository();
/// <summary>
/// 商品收藏
/// </summary>
......@@ -178,16 +178,18 @@ namespace Mall.Module.Product
/// </summary>
private readonly RB_Distributor_FXCommissionRepository distributor_FXCommissionRepository = new RB_Distributor_FXCommissionRepository();
private RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository();
private readonly RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository();
/// <summary>
/// 微店
/// </summary>
private RB_SmallShops_InfoRepository smallShops_InfoRepository = new RB_SmallShops_InfoRepository();
private readonly RB_SmallShops_InfoRepository smallShops_InfoRepository = new RB_SmallShops_InfoRepository();
/// <summary>
/// 微店商品价格
/// </summary>
private RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository();
private readonly RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository();
/// <summary>
/// 课程
/// </summary>
......@@ -1141,10 +1143,12 @@ namespace Mall.Module.Product
{
string priceIds = string.Join(",", priceList.Select(x => x.ID));
var regionList = logistics_RulesRegionRepository.GetListRepository(new Model.Extend.BaseSetUp.RB_Logistics_RulesRegion_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, PriceIds = priceIds });
List<int> disList = new List<int>();
disList.Add(samodel.Province ?? 0);
disList.Add(samodel.City ?? 0);
disList.Add(samodel.District ?? 0);
List<int> disList = new List<int>
{
samodel.Province ?? 0,
samodel.City ?? 0,
samodel.District ?? 0
};
var regionModel = regionList.Where(x => disList.Contains(x.RegionId)).FirstOrDefault();
if (regionModel != null)
{
......@@ -1848,10 +1852,12 @@ namespace Mall.Module.Product
{
string priceIds = string.Join(",", priceList1.Select(x => x.ID));
var regionList = logistics_RulesRegionRepository.GetListRepository(new Model.Extend.BaseSetUp.RB_Logistics_RulesRegion_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, PriceIds = priceIds });
List<int> disList = new List<int>();
disList.Add(samodel.Province ?? 0);
disList.Add(samodel.City ?? 0);
disList.Add(samodel.District ?? 0);
List<int> disList = new List<int>
{
samodel.Province ?? 0,
samodel.City ?? 0,
samodel.District ?? 0
};
var regionModel = regionList.Where(x => disList.Contains(x.RegionId)).FirstOrDefault();
if (regionModel != null)
{
......@@ -2613,7 +2619,7 @@ namespace Mall.Module.Product
goods_country = model.GoodsCountry,
fatcode = model.FatCode,
goodsurl = model.GoodsUrl,
goodsLogo = model.goodsLogo,
model.goodsLogo,
goodsPreferentialList = goodsPreferentialList?.Select(x => new
{
x.Id,
......@@ -3025,10 +3031,12 @@ namespace Mall.Module.Product
{
string priceIds = string.Join(",", priceList1.Select(x => x.ID));
var regionList = logistics_RulesRegionRepository.GetListRepository(new Model.Extend.BaseSetUp.RB_Logistics_RulesRegion_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, PriceIds = priceIds });
List<int> disList = new List<int>();
disList.Add(samodel.Province ?? 0);
disList.Add(samodel.City ?? 0);
disList.Add(samodel.District ?? 0);
List<int> disList = new List<int>
{
samodel.Province ?? 0,
samodel.City ?? 0,
samodel.District ?? 0
};
var regionModel = regionList.Where(x => disList.Contains(x.RegionId)).FirstOrDefault();
if (regionModel != null)
{
......@@ -6843,8 +6851,10 @@ namespace Mall.Module.Product
var cmodel = product_CategoryRepository.GetEntity(demodel.CategoryIds);
if (cmodel != null)
{
List<int> AllClist = new List<int>();
AllClist.Add(cmodel.Id);
List<int> AllClist = new List<int>
{
cmodel.Id
};
var clist = product_CategoryRepository.GetList(new RB_Product_Category_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, RootId = cmodel.RootId });
var OneList = clist.Where(x => x.ParentId == cmodel.Id).ToList();
foreach (var item in OneList)
......
Mall.Module.TradePavilion/CustomFormModule.cs
View file @ 388a9382
......@@ -95,7 +95,7 @@ namespace Mall.Module.TradePavilion
[TransactionCallHandler]
public virtual bool SetCustomFormModule(RB_Custom_Form_Extend model)
{
bool flag = false;
bool flag;
if (model.Id > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
......
Mall.Module.TradePavilion/FirstShopListModule.cs
View file @ 388a9382
......@@ -973,9 +973,6 @@ namespace Mall.Module.TradePavilion
var listModel = firstShop_ListRepository.GetEntity(enrollModel.ListId);
if (listModel == null) { errorMsg = "榜单不存在"; return ""; }
//创建一个临时文件夹
string tempFoldr = "";
#region 解析表单内容
if (string.IsNullOrEmpty(enrollModel.Content))
......@@ -1077,7 +1074,7 @@ namespace Mall.Module.TradePavilion
return "";
}
List<FormDataItem> elist = JsonHelper.DeserializeObject<List<FormDataItem>>(item.Content);
elist = elist.Where(x => x.CompKey == "ImageUploadComp" || x.CompKey == "VideoUploadComp"||x.CompKey== "CommonUploadComp").ToList();
elist = elist.Where(x => x.CompKey == "ImageUploadComp" || x.CompKey == "VideoUploadComp" || x.CompKey == "CommonUploadComp").ToList();
var templistnowPath = Path.Combine(templistPath + enrollModel.ListName + "\\");//路径
if (!Directory.Exists(templistnowPath))
{
......@@ -1106,7 +1103,7 @@ namespace Mall.Module.TradePavilion
bitmap.Save(templistnowPath + Path.GetFileName(qitem), System.Drawing.Imaging.ImageFormat.Jpeg);
}
}
catch (Exception ex)
catch
{
}
......@@ -1145,7 +1142,7 @@ namespace Mall.Module.TradePavilion
fs.Close();
}
}
catch (Exception ex)
catch
{
}
......@@ -1179,7 +1176,6 @@ namespace Mall.Module.TradePavilion
item.Delete(true);
}
}
}
catch
{
......@@ -1191,9 +1187,6 @@ namespace Mall.Module.TradePavilion
{
return "";
}
}
......@@ -1212,7 +1205,6 @@ namespace Mall.Module.TradePavilion
{
string tempPath = Path.Combine(rootBook + Url.TrimStart('/'));
#region 解析表单内容
string timeStr = Url.TrimStart('/').Split("/")[4];
if (!File.Exists(tempPath))
{
......@@ -1220,7 +1212,6 @@ namespace Mall.Module.TradePavilion
}
else
{
DirectoryInfo dir = new DirectoryInfo(Path.Combine(rootBook + "upfile\\temporary\\firstshopenrollzip\\" + "zip\\"));
DirectoryInfo[] dirArr = dir.GetDirectories();
foreach (DirectoryInfo item in dirArr)
......@@ -1235,18 +1226,13 @@ namespace Mall.Module.TradePavilion
}
}
return true;
}
}
catch (Exception ex)
catch
{
return false;
}
#endregion
}
}
}
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @ 388a9382
......@@ -2128,13 +2128,15 @@ namespace Mall.WebApi.Controllers.Education
{
return ApiResult.Failed("订单已全部提成/暂无报入订单");
}
var query = new RB_Education_Consult_Extend();
query.EnrollState = 0;
query.ActivityId = newList.FirstOrDefault()?.ActivityId ?? 0;
query.MallBaseId = userInfo.MallBaseId;
query.TenantId = userInfo.TenantId;
query.OrderStatus = 1;
// query.IsCommission = 1;
var query = new RB_Education_Consult_Extend
{
EnrollState = 0,
ActivityId = newList.FirstOrDefault()?.ActivityId ?? 0,
MallBaseId = userInfo.MallBaseId,
TenantId = userInfo.TenantId,
OrderStatus = 1
};
// query.IsCommission = 1;
var list = new List<RB_Education_Consult_Extend>();
if (query.ActivityId > 0)
{
......@@ -2172,7 +2174,6 @@ namespace Mall.WebApi.Controllers.Education
public ApiResult SendCodeByStudentInfo()
{
var req = RequestParm;
var userInfo = AppletUserInfo;
JObject jobj = JObject.Parse(req.msg.ToString());
string stuTel = jobj.GetStringValue("StuTel");
var model = activityModule.GetStudentList(new RB_Student()
......@@ -2204,15 +2205,12 @@ namespace Mall.WebApi.Controllers.Education
UserReidsCache.AddUserSendCodeHistory(stuTel);
return ApiResult.Success("验证码已发送，请注意查收", data: null);
}
catch (Exception ex)
catch
{
return ApiResult.Failed("发送短信失败，请稍后再试");
}
}
/// <summary>
/// 判断输入的验证码是否正确
/// </summary>
......@@ -2265,14 +2263,16 @@ namespace Mall.WebApi.Controllers.Education
var eduModel = activityModule.GetEducationBaseInfo(new RB_Education_BaseInfo_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
if (eduModel == null || eduModel.Id == 0)
{
eduModel = new RB_Education_BaseInfo_Extend();
eduModel.Id = 0;
eduModel.TenantId = userInfo.TenantId;
eduModel.MallBaseId = userInfo.MallBaseId;
eduModel.Sex = 0;
eduModel.CreateDate = System.DateTime.Now;
eduModel.Status = 0;
eduModel.UserId = userInfo.UserId;
eduModel = new RB_Education_BaseInfo_Extend
{
Id = 0,
TenantId = userInfo.TenantId,
MallBaseId = userInfo.MallBaseId,
Sex = 0,
CreateDate = System.DateTime.Now,
Status = 0,
UserId = userInfo.UserId
};
}
eduModel.Birthday = model.StuBirth.HasValue ? model.StuBirth.Value.ToString("yyyy-MM-dd") : "";
eduModel.StudentId = model.StuId;
......@@ -2305,10 +2305,12 @@ namespace Mall.WebApi.Controllers.Education
public ApiResult GetEduSchool()
{
var userInfo = AppletUserInfo;
Rb_Education_School_Extend demodel = new Rb_Education_School_Extend();
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId;
Rb_Education_School_Extend demodel = new Rb_Education_School_Extend
{
TenantId = userInfo.TenantId,
MallBaseId = userInfo.MallBaseId,
UserId = userInfo.UserId
};
var list = educationModule.GetEducationSchoolList(demodel);
return ApiResult.Success("", list.Select(x => new { x.Id, x.CoverPhoto, x.ShoolName }));
}
......@@ -2362,13 +2364,15 @@ namespace Mall.WebApi.Controllers.Education
// var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
if (eduModel == null || eduModel.Id == 0)
{
eduModel = new RB_Education_EduSell_Extend();
eduModel.Id = 0;
eduModel.TenantId = userInfo.TenantId;
eduModel.MallBaseId = userInfo.MallBaseId;
eduModel.CreateDate = System.DateTime.Now;
eduModel.Status = 0;
eduModel.UserId = userInfo.UserId;
eduModel = new RB_Education_EduSell_Extend
{
Id = 0,
TenantId = userInfo.TenantId,
MallBaseId = userInfo.MallBaseId,
CreateDate = System.DateTime.Now,
Status = 0,
UserId = userInfo.UserId
};
}
eduModel.EduSellId = model.Id;
bool result = activityModule.SetEduSellBaseInfo(eduModel);
......@@ -2386,15 +2390,12 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost]
public ApiResult GetBindEduSellInfo()
{
var req = RequestParm;
var userInfo = AppletUserInfo;
var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
if (eduModel == null || eduModel.Id == 0)
{
eduModel = new RB_Education_EduSell_Extend();
}
return ApiResult.Success("", new
{
eduModel.Id,
......@@ -2414,9 +2415,7 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost]
public ApiResult GetEduRollCallAction()
{
var req = RequestParm;
var userInfo = AppletUserInfo;
var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
if (eduModel == null || eduModel.Id == 0)
{
......@@ -2431,6 +2430,7 @@ namespace Mall.WebApi.Controllers.Education
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, string.Format("GetEduRollCallAction_Msg:{0}", Common.Plugin.JsonHelper.Serialize(userInfo)));
return ApiResult.Failed("", new { IsEduRollCallAction = 0 });
}
}
......
Mall.WebApi/Controllers/Education/EducationController.cs
View file @ 388a9382
......@@ -33,7 +33,7 @@ namespace Mall.WebApi.Controllers.Education
{
private readonly IHttpContextAccessor _accessor;
private readonly EducationModule educationModule = new EducationModule();
private Module.User.UserModule UserModule = new Module.User.UserModule();
private readonly Module.User.UserModule UserModule = new Module.User.UserModule();
private readonly DynamicModule dynamicModule = new DynamicModule();
private readonly ActivityModule activityModule = new ActivityModule();
......@@ -1873,7 +1873,6 @@ namespace Mall.WebApi.Controllers.Education
{
var qequest = RequestParm;
JObject parms = JObject.Parse(RequestParm.msg.ToString());
Int32.TryParse(RequestParm.uid, out int Uid);
var model = new Rb_Education_Talk_Extend()
{
Id = parms.GetInt("Id", 0),
......@@ -2148,7 +2147,7 @@ namespace Mall.WebApi.Controllers.Education
{
extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
}
catch (Exception ex)
catch
{
extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
}
......@@ -2204,7 +2203,7 @@ namespace Mall.WebApi.Controllers.Education
{
extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
}
catch (Exception ex)
catch
{
extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
}
......@@ -2644,7 +2643,6 @@ namespace Mall.WebApi.Controllers.Education
decimal dPaid = Convert.ToDecimal(dic["dPrice"]) / 100;
string refundid = dic["refundid"];//微信退款单号
string outRefundNo = dic["outRefundNo"];//商户退款单号
flag = activityModule.SetCommerceConsultApplyCancel(Id, ApplyForCancelStatus, RejectRemark, refundid, dPaid);
}
else
......
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ 388a9382
......@@ -1508,10 +1508,9 @@ namespace Mall.WebApi.Controllers.MallBase
Status = 0,
CreateDate = System.DateTime.Now
};
var queryResult = miaiModule.SetMiAiBaseInfoQuery(queryModel);
}
catch (Exception ex)
catch
{
}
......@@ -1557,7 +1556,6 @@ namespace Mall.WebApi.Controllers.MallBase
public ApiResult GetBaseInfoQueryList()
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
RB_MiAi_BaseInfoQuery demodel = JsonConvert.DeserializeObject<RB_MiAi_BaseInfoQuery>(RequestParm.msg.ToString());
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
......@@ -1643,9 +1641,6 @@ namespace Mall.WebApi.Controllers.MallBase
}));
}
/// <summary>
/// 获取每日随机信息
/// </summary>
......@@ -1662,8 +1657,6 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.UserId = parms.UserId;
var dayQueryModel = new RB_MiAi_BaseInfoDayQuery();
//if (demodel.UserId > 0)//说明用户登录了的
//{
try
{
if (demodel.Sex == 0 && demodel.UserId > 0)
......@@ -1710,9 +1703,8 @@ namespace Mall.WebApi.Controllers.MallBase
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, string.Format("GetDailyRandomList_Msg:{0}", Common.Plugin.JsonHelper.Serialize(parms)));
}
// }
var list = miaiModule.GetFirstBaseInfoPageList_V2(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
List<Model.Extend.MarketingCenter.miaiUserDetail> newGoodsList = new List<Model.Extend.MarketingCenter.miaiUserDetail>();
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 388a9382
......@@ -1082,17 +1082,18 @@ namespace Mall.WebApi.Controllers.MallBase
{
oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
}
}
else
{
oldBaseInfo = new RB_MiAi_BaseInfo_Extend();
oldBaseInfo.Sex = 1;
oldBaseInfo.EducationType = Common.Enum.MiAi.EducationTypeEnum.HighSchool;
oldBaseInfo.Marriage = Common.Enum.MiAi.MarriageEnum.Unmarried;
oldBaseInfo.CarInfo = Common.Enum.MiAi.CarInfoEnum.Yes;
oldBaseInfo.HouseInfo = Common.Enum.MiAi.HouseInfoEnum.Yes;
oldBaseInfo.AlbumList = new List<string>();
oldBaseInfo = new RB_MiAi_BaseInfo_Extend
{
Sex = 1,
EducationType = Common.Enum.MiAi.EducationTypeEnum.HighSchool,
Marriage = Common.Enum.MiAi.MarriageEnum.Unmarried,
CarInfo = Common.Enum.MiAi.CarInfoEnum.Yes,
HouseInfo = Common.Enum.MiAi.HouseInfoEnum.Yes,
AlbumList = new List<string>()
};
}
return ApiResult.Success("", new
{
......
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @ 388a9382
......@@ -506,7 +506,6 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.ParamIsNull(message: "请选择门店");
}
int UserId = req.UserId;
object Robj = productModule.GetServerpersionListInfoModule(GoodsId, req.TenantId, req.MallBaseId, storeId: StoreId, servicePersionId: servicePersionId, chooseDate: chooseDate);
return ApiResult.Success("", Robj);
}
......
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @ 388a9382
......@@ -647,7 +647,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = consultModule.GetCommerceConsultPageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
var list = consultModule.GetCommerceConsultPageModule(pageModel.pageIndex, pageModel.pageSize, out _, query);
string ExcelName = "活动用户导出" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
List<ExcelDataSource> slist = new List<ExcelDataSource>();
ExcelDataSource header = new ExcelDataSource()
......@@ -1189,8 +1189,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
var umodel = userModule.GetMemberUserInfo(model.CreateBy);
if (umodel != null && !string.IsNullOrWhiteSpace(umodel.OpenId))
{
List<string> openidList = new List<string>();
openidList.Add(umodel.OpenId);
List<string> openidList = new List<string>
{
umodel.OpenId
};
new Module.User.MiniProgramMsgModule().SendHatchExamineMsg(model.TenantId, model.MallBaseId, openidList, AuditState == 2 ? "认证通过" : "认证失败", "首店认证结果通知", System.DateTime.Now.ToString("yyyy年MM月dd日 HH:mm"));
}
return ApiResult.Success();
......@@ -1391,13 +1393,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
[HttpPost]
public ApiResult GetSetCarrier()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_Carrier_Extend query = JsonConvert.DeserializeObject<RB_Carrier_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(query.CarrierName))
{
return ApiResult.Failed("请输入载体名称");
}
if (string.IsNullOrWhiteSpace(query.Developers))
{
return ApiResult.Failed("请输入开发商");
......@@ -1496,16 +1496,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
}
}
}
catch (Exception ex)
catch
{
demodel.ExcelEnumIds = new List<int>();
for (int i = 1; i <= 15; i++)
{
demodel.ExcelEnumIds.Add(i);
}
}
string ExcelName = "载体列表" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
List<ExcelDataSource> slist = new List<ExcelDataSource>();
if (demodel.ExcelEnumIds == null || !demodel.ExcelEnumIds.Any())
......@@ -1662,10 +1660,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
[HttpPost]
public ApiResult GetBrandClassList()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_BrandClass_Extend();
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var query = new RB_BrandClass_Extend
{
MallBaseId = RequestParm.MallBaseId,
TenantId = RequestParm.TenantId
};
var list = carrierModule.GetBrandClassList(query);
return ApiResult.Success(data: list);
}
......@@ -1696,16 +1695,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
[HttpPost]
public ApiResult GetSetBrandClass()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_BrandClass_Extend query = JsonConvert.DeserializeObject<RB_BrandClass_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(query.ClassName))
{
return ApiResult.Failed("请输入分类名称");
}
//if (string.IsNullOrWhiteSpace(query.Logo))
//{
// return ApiResult.Failed("请上传Logo");
//}
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
......@@ -1821,7 +1815,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
[HttpPost]
public ApiResult GetSetBrand()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_Brand_Extend query = JsonConvert.DeserializeObject<RB_Brand_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(query.BrandName))
{
......@@ -1908,10 +1901,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
}
}
}
catch (Exception ex)
catch
{
demodel.ExcelEnumIds = new List<int>();
for (int i = 1; i <= 23; i++)
{
demodel.ExcelEnumIds.Add(i);
......@@ -2595,7 +2587,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
return ApiResult.ParamIsNull("请传递文件路径");
}
bool result = firstShopListModule.DelFirstShopEnrollZipExport(ListIds);
firstShopListModule.DelFirstShopEnrollZipExport(ListIds);
return ApiResult.Success("");
}
......@@ -2726,20 +2718,18 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetPrizeList()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Prize_Extend();
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var query = new RB_Prize_Extend
{
MallBaseId = RequestParm.MallBaseId,
TenantId = RequestParm.TenantId
};
var extList = carrierModule.GetPrizeList(query);
return ApiResult.Success(data: extList);
}
/// <summary>
/// 新增/修改奖项信息
/// </summary>
......@@ -2747,7 +2737,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
[HttpPost]
public ApiResult GetSetPrize()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_Prize_Extend query = JsonConvert.DeserializeObject<RB_Prize_Extend>(RequestParm.msg.ToString());
if (string.IsNullOrWhiteSpace(query.Name))
{
......
Mall.WebApi/Controllers/User/TenantController.cs
View file @ 388a9382
......@@ -133,7 +133,7 @@ namespace Mall.WebApi.Controllers.User
RoleAuth = 1;
}
}
catch (Exception ex)
catch
{
}
......
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