Skip to content

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

提交代码

parent 6a1c71ce
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 48 deletions
Mall.Model/Entity/TradePavilion/RB_CarrierApplyFor.cs
View file @ e4ff3f89
......@@ -221,15 +221,15 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary>
public string StartingInfo { get; set; }
/// <summary>
/// 首秀政策
/// </summary>
public string FirstShow { get; set; }
/// <summary>
/// 首展政策
/// </summary>
public string FirstExhibition { get; set; }
///// <summary>
///// 首秀政策
///// </summary>
//public string FirstShow { get; set; }
///// <summary>
///// 首展政策
///// </summary>
//public string FirstExhibition { get; set; }
}
}
Mall.Module.TradePavilion/CarrierModule.cs
View file @ e4ff3f89
......@@ -336,9 +336,7 @@ namespace Mall.Module.TradePavilion
{nameof(RB_CarrierApplyFor_Extend.BuiltUpArea),model.BuiltUpArea },
{nameof(RB_CarrierApplyFor_Extend.EndBuiltUpArea),model.EndBuiltUpArea },
{nameof(RB_CarrierApplyFor_Extend.FirstShopNum),model.FirstShopNum },
{nameof(RB_CarrierApplyFor_Extend.StartingInfo),model.StartingInfo },
{nameof(RB_CarrierApplyFor_Extend.FirstShow),model.FirstShow },
{nameof(RB_CarrierApplyFor_Extend.FirstExhibition),model.FirstExhibition },
{nameof(RB_CarrierApplyFor_Extend.StartingInfo),model.StartingInfo }
};
flag = carrierApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_CarrierApplyFor_Extend.ID), model.ID));
if (flag)
......
Mall.Module.TradePavilion/CompanyModule.cs
View file @ e4ff3f89
......@@ -617,7 +617,7 @@ namespace Mall.Module.TradePavilion
#endregion
#region 修改载体
int FirstStoreTest = 0;
if (!string.IsNullOrWhiteSpace(CarrierModel.FirstShow) && !string.IsNullOrWhiteSpace(CarrierModel.Discount))
if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo) && !string.IsNullOrWhiteSpace(CarrierModel.Discount))
{
FirstStoreTest = 1;
}
......
Mall.Repository/TradePavilion/RB_PrizeRepository.cs
View file @ e4ff3f89
......@@ -25,7 +25,7 @@ namespace Mall.Repository.TradePavilion
public List<RB_Prize_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Prize_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT a.*,(SELECT COUNT(*) from rb_brand where `Status`=0 and FIND_IN_SET(a.Id,SourceIds)) FROM rb_prize as a WHERE `Status`=0 ");
builder.Append($" SELECT a.*,(SELECT COUNT(*) from rb_brand where `Status`=0 and FIND_IN_SET(a.Id,SourceIds)) as TotalCount FROM rb_prize as a WHERE `Status`=0 ");
if (query != null)
{
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ e4ff3f89
......@@ -1024,6 +1024,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 根据活动ids获取活动列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetActivityList()
{
var userInfo = AppletUserInfo;
......@@ -1102,6 +1103,31 @@ namespace Mall.WebApi.Controllers.TradePavilion
return flag ? ApiResult.Success("报名成功") : ApiResult.Failed("出错了，请联系管理员");
}
/// <summary>
/// 根据活动ids获取活动列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCommerceConsult()
{
var userInfo = AppletUserInfo;
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var extModel = new RB_Commerce_Consult_Extend()
{
ActivityId = jObj.GetInt("ActivityId"),
MallBaseId = userInfo.MallBaseId,
TenantId = userInfo.TenantId ,
UserId=userInfo.UserId
};
var list = consultModule.GetCommerceConsultListModule(extModel);
return ApiResult.Success("", list);
}
#endregion
/// <summary>
......@@ -1271,7 +1297,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
x.AuditState,
x.AuditRemark,
AuditDate = x.AuditDate.HasValue ? x.AuditDate.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm")
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
x.ExistBrandId,
});
return ApiResult.Success("", pagelist);
}
......@@ -1293,6 +1320,31 @@ namespace Mall.WebApi.Controllers.TradePavilion
var model = authenticationModule.GetAuthenticationInfo(AuthenticationId);
if (model == null) { return ApiResult.Failed("认证不存在"); }
if (userInfo.UserId != model.CreateBy) { return ApiResult.Failed("无法查看"); }
//获取品牌名称
string brandName = "";
if (model.ExistBrandId > 0)
{
var query = new RB_Brand_Extend()
{
ID = model.ExistBrandId,
};
query.MallBaseId = userInfo.MallBaseId;
query.TenantId = userInfo.TenantId;
query.RanQi = -1;
query.KongTiao = -1;
query.XinFeng = -1;
query.Plumbing = -1;
query.Caliber = -1;
query.PaiYan = -1;
query.Sewage = -1;
var extModel = carrierModule.GetBrand(query);
if (extModel != null && extModel.ID > 0)
{
brandName = extModel.BrandName;
}
}
return ApiResult.Success("", new
{
model.Id,
......@@ -1319,7 +1371,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
model.AuditState,
model.AuditRemark,
AuditDate = model.AuditDate.HasValue ? model.AuditDate.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm")
CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm"),
model.ExistBrandId,
BrandName = brandName
});
}
......
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @ e4ff3f89
......@@ -812,6 +812,47 @@ namespace Mall.WebApi.Controllers.TradePavilion
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
var list = authenticationModule.GetAuthenticationPageList_V2(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
List<RB_Brand_Extend> brandList = new List<RB_Brand_Extend>();
if (list != null && list.Any())
{
string brandIds = string.Join(",", list.Where(x => x.ExistBrandId > 0).Select(x => x.ExistBrandId));
if (!string.IsNullOrEmpty(brandIds))
{
var query = new RB_Brand_Extend()
{
BrandIds = brandIds,
};
query.MallBaseId = userInfo.MallBaseId;
query.TenantId = userInfo.TenantId;
query.RanQi = -1;
query.KongTiao = -1;
query.XinFeng = -1;
query.Plumbing = -1;
query.Caliber = -1;
query.PaiYan = -1;
query.Sewage = -1;
brandList = carrierModule.GetBrandListByWhere(query);
if (brandList != null && brandList.Any())
{
foreach (var item in list)
{
var nowBrand = brandList.Where(x => x.ID == item.ExistBrandId).FirstOrDefault();
if (item.AuditState == 2)
{
if (nowBrand != null && nowBrand.ID > 0 && !string.IsNullOrWhiteSpace(nowBrand.SourceIds))
{
item.ExistBrandId = 0;
}
}
}
}
}
}
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
......@@ -841,7 +882,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
AuditDate = x.AuditDate.HasValue ? x.AuditDate.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
x.CreateName,
x.CreatePhoto
x.CreatePhoto,
x.ExistBrandId
});
return ApiResult.Success("", pagelist);
}
......@@ -953,7 +995,35 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.ParamIsNull("请传递认证id");
}
var model = authenticationModule.GetAuthenticationInfo(AuthenticationId);
if (model == null) { return ApiResult.Failed("认证不存在"); }
//获取品牌名称
string brandName = "";
if (model.ExistBrandId > 0)
{
var query = new RB_Brand_Extend()
{
ID = model.ExistBrandId,
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
query.RanQi = -1;
query.KongTiao = -1;
query.XinFeng = -1;
query.Plumbing = -1;
query.Caliber = -1;
query.PaiYan = -1;
query.Sewage = -1;
var extModel = carrierModule.GetBrand(query);
if (extModel != null && extModel.ID > 0)
{
brandName = extModel.BrandName;
}
}
return ApiResult.Success("", new
{
model.Id,
......@@ -980,7 +1050,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
model.AuditState,
model.AuditRemark,
AuditDate = model.AuditDate.HasValue ? model.AuditDate.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm")
CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm"),
model.ExistBrandId,
BrandName = brandName
});
}
......@@ -1118,7 +1190,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
flag = authenticationModule.SetAuthenticationPrize(brandIds, SourceIds);
}
if (flag)
{
return ApiResult.Success();
......@@ -1259,6 +1331,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
}
if (!string.IsNullOrWhiteSpace(query.StartingInfo) && !string.IsNullOrWhiteSpace(query.Discount))
{
query.FirstStoreTest = 1;
}
query.UpdateDate = System.DateTime.Now;
bool flag = carrierModule.SetCarrier(query);
return flag ? ApiResult.Success() : ApiResult.Failed();
......@@ -1902,11 +1979,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetFistShopPrizeListInfo() {
public ApiResult GetFistShopPrizeListInfo()
{
var req = base.RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int ListId = parms.GetInt("ListId", 0);//榜单id
if (ListId <= 0) {
if (ListId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -1916,7 +1995,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
model.Id,
model.ListType,
model.ObjectTypeIds,
model.ObjectTypeIds,
model.Sponsor,
model.ListName,
model.CoverImage,
......@@ -1935,25 +2014,32 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetFistShopPrizeListInfo() {
public ApiResult SetFistShopPrizeListInfo()
{
var req = base.RequestParm;
RB_FirstShop_List_Extend demodel = JsonHelper.DeserializeObject<RB_FirstShop_List_Extend>(req.msg.ToString());
if (string.IsNullOrEmpty(demodel.Sponsor)) {
if (string.IsNullOrEmpty(demodel.Sponsor))
{
return ApiResult.ParamIsNull("请输入主办方名称");
}
if (string.IsNullOrEmpty(demodel.ListName)) {
if (string.IsNullOrEmpty(demodel.ListName))
{
return ApiResult.ParamIsNull("请输入榜单名称");
}
if (string.IsNullOrEmpty(demodel.ObjectTypeIds)) {
if (string.IsNullOrEmpty(demodel.ObjectTypeIds))
{
return ApiResult.ParamIsNull("请选择面向群体");
}
if (string.IsNullOrEmpty(demodel.CoverImage)) {
if (string.IsNullOrEmpty(demodel.CoverImage))
{
return ApiResult.ParamIsNull("请上传封面图");
}
if (string.IsNullOrEmpty(demodel.Content)) {
if (string.IsNullOrEmpty(demodel.Content))
{
return ApiResult.ParamIsNull("请输入详情内容");
}
if (demodel.PrizeNum <= 0) {
if (demodel.PrizeNum <= 0)
{
return ApiResult.ParamIsNull("请输入入围名额");
}
......@@ -1972,7 +2058,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -1982,7 +2069,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelFistShopPrizeListInfo() {
public ApiResult DelFistShopPrizeListInfo()
{
var req = base.RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int ListId = parms.GetInt("ListId", 0);//榜单id
......@@ -1996,7 +2084,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -2091,13 +2180,15 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetFirstShopEnrollState() {
public ApiResult SetFirstShopEnrollState()
{
var req = base.RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int EnrollId = parms.GetInt("EnrollId", 0);//报名Id
int Type = parms.GetInt("Type", 1);//类型 1淘汰 2候选 3重置
if (EnrollId <= 0) {
if (EnrollId <= 0)
{
return ApiResult.ParamIsNull("请传递报名ID");
}
......@@ -2106,7 +2197,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -2116,7 +2208,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetFirstShopEnrollCandidateList() {
public ApiResult GetFirstShopEnrollCandidateList()
{
var req = base.RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int ListId = parms.GetInt("ListId", 0);//榜单Id
......@@ -2145,33 +2238,42 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetFirstShopConfirmListInfo() {
public ApiResult SetFirstShopConfirmListInfo()
{
var req = base.RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int Type = parms.GetInt("Type", 1);//类型 1暂存 2放榜
int ListId = parms.GetInt("ListId", 0);
string List = parms.GetStringValue("List");
if (ListId <= 0) {
if (ListId <= 0)
{
return ApiResult.ParamIsNull("请传递榜单id");
}
List<RB_FirstShop_ListEnroll_Extend> deList = JsonHelper.DeserializeObject<List<RB_FirstShop_ListEnroll_Extend>>(List);
if (deList == null || !deList.Any()) {
if (deList == null || !deList.Any())
{
return ApiResult.ParamIsNull("请传递名单列表");
}
if (deList.Count() != deList.Select(x => x.Id).Distinct().Count()) {
if (deList.Count() != deList.Select(x => x.Id).Distinct().Count())
{
return ApiResult.Failed("有重复数据，请核实后再试");
}
foreach (var item in deList) {
if (item.Id <= 0) {
foreach (var item in deList)
{
if (item.Id <= 0)
{
return ApiResult.ParamIsNull("请传递报名ID");
}
if (item.UserId <= 0) {
if (item.UserId <= 0)
{
return ApiResult.ParamIsNull("请传递用户Id");
}
if (string.IsNullOrEmpty(item.Reviews)) {
if (string.IsNullOrEmpty(item.Reviews))
{
return ApiResult.ParamIsNull("请输入评语");
}
if (string.IsNullOrEmpty(item.MedalImage)) {
if (string.IsNullOrEmpty(item.MedalImage))
{
return ApiResult.ParamIsNull("请传递奖章");
}
if (string.IsNullOrEmpty(item.MedalImageBig))
......@@ -2185,7 +2287,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -2195,7 +2298,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetFirstShopConfirmListList() {
public ApiResult GetFirstShopConfirmListList()
{
var req = base.RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int ListId = parms.GetInt("ListId", 0);//榜单Id
......
Mall.WebApi/Mall.WebApi.csproj.user
View file @ e4ff3f89
......@@ -9,7 +9,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>E:\Work\Git_Project\Mall_Api\Mall.WebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<ShowAllFiles>false</ShowAllFiles>
</PropertyGroup>
</Project>
\ 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