Skip to content

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

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

parents 06492ced f62d4a53
Show whitespace changes
Inline Side-by-side
Showing with 367 additions and 38 deletions
Mall.Model/Extend/TradePavilion/RB_Authentication_Extend.cs
View file @ 675b3c19
......@@ -47,5 +47,10 @@ namespace Mall.Model.Extend.TradePavilion
/// 奖项
/// </summary>
public int PrizeId { get; set; }
/// <summary>
/// 查询用户编号
/// </summary>
public string QCreateBy { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs
View file @ 675b3c19
......@@ -23,13 +23,13 @@ namespace Mall.Model.Extend.TradePavilion
/// <summary>
/// 开始时间字符串
/// </summary>
public string StartTimeStr { get { return Common.ConvertHelper.FormatDate(this.StartTime); } }
public string StartTimeStr { get { return Common.ConvertHelper.FormatTime(this.StartTime); } }
/// <summary>
/// 结束时间字符串
/// </summary>
public string EndTimeStr { get { return Common.ConvertHelper.FormatDate(this.EndTime); } }
public string EndTimeStr { get { return Common.ConvertHelper.FormatTime(this.EndTime); } }
/// <summary>
......
Mall.Model/Extend/TradePavilion/RB_Commerce_Consult_Extend.cs
View file @ 675b3c19
using Mall.Common.Enum.TradePavilion;
using Mall.Common.Plugin;
using Mall.Model.Entity.TradePavilion;
using System;
using System.Collections.Generic;
......@@ -53,9 +54,17 @@ namespace Mall.Model.Extend.TradePavilion
/// 类型名称
/// </summary>
public string TypeName { get; set; }
}
/// <summary>
/// 性质名称
/// </summary>
public string NatureName { get { return this.Nature.GetEnumName(); } }
/// <summary>
/// 用户数量
/// </summary>
public int UserCount { get; set; }
}
/// <summary>
/// 首店活动报名
......@@ -97,8 +106,6 @@ namespace Mall.Model.Extend.TradePavilion
public class FirstShopLinkManModel
{
/// <summary>
/// 联系人
/// </summary>
......@@ -120,4 +127,96 @@ namespace Mall.Model.Extend.TradePavilion
/// </summary>
public string CountryInfo { get; set; }
}
/// <summary>
/// 报名信息
/// </summary>
public class ActivityUserItem
{
/// <summary>
/// 小程序用户编号
/// </summary>
public int UserId { get; set; }
/// <summary>
/// 小程序用户名称
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 认证状态
/// </summary>
public string CompanyStatusStr { get; set; }
/// <summary>
/// 认证公司名称
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// 认证品牌/认证载体
/// </summary>
public string FirstShopTypeName { get; set; }
/// <summary>
/// 认证名称
/// </summary>
public string AuthName { get; set; }
/// <summary>
/// 跨行
/// </summary>
public int RowSpan { get; set; }
/// <summary>
/// 报名用户列表
/// </summary>
public List<SignUserItem> SignUserList { get; set; }
}
/// <summary>
/// 报名详情
/// </summary>
public class SignUserItem
{
/// <summary>
/// 报名编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 活动编号
/// </summary>
public int ActivityId { get; set; }
/// <summary>
/// 联系人
/// </summary>
public string LinkMan { get; set; }
/// <summary>
/// 联系电话
/// </summary>
public string LinkTel { get; set; }
/// <summary>
/// 岗位
/// </summary>
public string Post { get; set; }
/// <summary>
/// 地址信息
/// </summary>
public string CountryInfo { get; set; }
/// <summary>
/// 公司名称
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// 性质
/// </summary>
public string Nature { get; set; }
}
}
Mall.Module.TradePavilion/CommerceActivityModule.cs
View file @ 675b3c19
......@@ -72,7 +72,6 @@ namespace Mall.Module.TradePavilion
public List<RB_Commerce_Activity_Extend> GetUserCommerceActivityPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Activity_Extend query)
{
var list = commerce_ActivityRepository.GetUserCommerceActivityPageRepository(pageIndex, pageSize, out rowsCount, query);
return list;
}
......
Mall.Module.TradePavilion/CommerceConsultModule.cs
View file @ 675b3c19
......@@ -10,6 +10,7 @@ using System.Linq;
using VT.FW.DB;
using Mall.Repository.Miai;
using Mall.Common.Enum;
using Mall.Common.Plugin;
namespace Mall.Module.TradePavilion
{
......@@ -39,11 +40,121 @@ namespace Mall.Module.TradePavilion
/// </summary>
private readonly RB_Miai_MessageRepository miai_MessageRepository = new RB_Miai_MessageRepository();
/// <summary>
/// 公司认证
/// </summary>
private readonly RB_CompanyRepository companyRepository = new RB_CompanyRepository();
/// <summary>
/// 品牌申请
/// </summary>
private readonly RB_BrandApplyForRepository brandApplyForRepository = new RB_BrandApplyForRepository();
/// <summary>
/// 载体申请
/// </summary>
private readonly RB_CarrierApplyForRepository carrierApplyForRepository = new RB_CarrierApplyForRepository();
/// <summary>
/// 获取商会活动报名分页列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<ActivityUserItem> GetCommerceConsultPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Consult_Extend query)
{
List<ActivityUserItem> result = new List<ActivityUserItem>();
var list = consultRepository.GetCommerceConsultStatisticsPageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
string userids = string.Join(",", list.Select(qitem => qitem.UserId));
string activityIds = string.Join(",", list.Select(qitem => qitem.ActivityId));
var authList = companyRepository.GetCompanyListRepository(new RB_Company_Extend() { UserIds = userids });
var memberList = member_UserRepository.GetList(new RB_Member_User_Extend()
{
UserIds = userids
});
var userList = list.GroupBy(qitem => new { qitem.UserId, qitem.ActivityId }).Select(qitem => new { qitem.Key.UserId, qitem.Key.ActivityId });
var subList = consultRepository.GetCommerceConsultListRepository(new RB_Commerce_Consult_Extend()
{
QActivityIds = activityIds,
QUserIds = userids,
});
foreach (var item in userList)
{
var userModel = memberList?.Where(qitem => qitem.Id == item.UserId)?.FirstOrDefault();
var authModel = authList?.Where(qitem => qitem.CreateBy == item.UserId)?.FirstOrDefault();
string CompanyStatus = "未认证";
string FirstShopTypeName = "";
string AuthName = "";
if (authModel!=null)
{
if (authModel.CompanyStatus == 0)
{
CompanyStatus = "待审核";
}
else if (authModel.CompanyStatus == 1)
{
CompanyStatus = "审核通过";
}
else if (authModel.CompanyStatus == 2)
{
CompanyStatus = "审核拒绝";
}
//品牌
if (authModel.FirstShopType == 1)
{
var brandList = brandApplyForRepository.GetBrandListByWhere(new RB_BrandApplyFor_Extend { CompanyId = authModel.CompanyId });
FirstShopTypeName = "认证品牌";
AuthName = brandList?.FirstOrDefault()?.BrandName ?? "";
}
//载体
else if (authModel.FirstShopType == 2)
{
var carrierList = carrierApplyForRepository.GetCarrierList(new RB_CarrierApplyFor_Extend() { CompanyId = authModel.CompanyId });
FirstShopTypeName = "认证载体";
AuthName = carrierList?.FirstOrDefault()?.CarrierName ?? "";
}
}
ActivityUserItem activity = new ActivityUserItem()
{
UserId = item.UserId,
UserName = userModel?.Name ?? "",
CompanyStatusStr = CompanyStatus,
CompanyName = authModel?.CompanyName ?? "",
FirstShopTypeName = FirstShopTypeName,
AuthName = AuthName,
RowSpan=1,
SignUserList = new List<SignUserItem>(),
};
var tempList = subList?.Where(qitem => qitem.UserId == item.UserId && qitem.ActivityId == item.ActivityId)?.ToList();
if (tempList != null && tempList.Count > 0)
{
foreach (var sItem in tempList)
{
SignUserItem signUser = new SignUserItem()
{
Id = sItem.Id,
ActivityId = sItem.ActivityId,
LinkMan = sItem.LinkMan,
LinkTel = sItem.LinkTel,
Post = sItem.Post,
CountryInfo = sItem.CountryInfo,
CompanyName = sItem.CompanyName,
Nature = sItem.Nature.GetEnumName()
};
activity.SignUserList.Add(signUser);
}
activity.RowSpan = tempList.Count;
}
result.Add(activity);
}
};
return result;
}
/// <summary>
/// 获取商会活动报名列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
......@@ -88,11 +199,14 @@ namespace Mall.Module.TradePavilion
{
if (oldModel.Money != model.Money)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Member_User_Extend.PointNum),umodel.PointNum + oldModel.Money - model.Money}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_Member_User_Extend.Id),
FiledValue=umodel.Id,
OperatorEnum=OperatorEnum.Equal
......@@ -146,11 +260,14 @@ namespace Mall.Module.TradePavilion
{
if (model.Money > 0)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Member_User_Extend.PointNum),umodel.PointNum - model.Money}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_Member_User_Extend.Id),
FiledValue=umodel.Id,
OperatorEnum=OperatorEnum.Equal
......@@ -177,9 +294,6 @@ namespace Mall.Module.TradePavilion
return flag ? "" : "出错了，请联系管理员";
}
/// <summary>
/// 活动报名
/// </summary>
......@@ -193,12 +307,9 @@ namespace Mall.Module.TradePavilion
var trans = consultRepository.DbTransaction;
foreach (var demodel in list)
{
flag = consultRepository.Insert(demodel, trans) > 0;
}
consultRepository.DBSession.Commit();
}
catch (Exception ex)
{
......@@ -225,11 +336,12 @@ namespace Mall.Module.TradePavilion
/// <returns></returns>
public bool RemoveTrdceConsultModule(int Id)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Commerce_Consult_Extend.Status),(int)DateStateEnum.Delete },
};
bool flag = consultRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), Id));
//Dictionary<string, object> fileds = new Dictionary<string, object>()
//{
// {nameof(RB_Commerce_Consult_Extend.Status),(int)DateStateEnum.Delete },
//};
bool flag = consultRepository.DeleteOne(new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), Id));
// consultRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), Id));
return flag;
}
......@@ -337,11 +449,14 @@ namespace Mall.Module.TradePavilion
{
//取消退回使用点数
var umodel = member_UserRepository.GetEntity(cmodel.UserId);
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Member_User_Extend.PointNum),umodel.PointNum + cmodel.Money}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_Member_User_Extend.Id),
FiledValue=umodel.Id,
OperatorEnum=OperatorEnum.Equal
......
Mall.Repository/TradePavilion/RB_AuthenticationRepository.cs
View file @ 675b3c19
......@@ -132,6 +132,10 @@ namespace Mall.Repository.TradePavilion
{
builder.Append($" AND {nameof(RB_Authentication_Extend.CreateBy)}={(int)query.CreateBy}");
}
if (!string.IsNullOrEmpty(query.QCreateBy))
{
builder.Append($" AND {nameof(RB_Authentication_Extend.CreateBy)} IN({query.QCreateBy}) ");
}
if (query.AuditState > 0)
{
builder.Append($" AND {nameof(RB_Authentication_Extend.AuditState)}={query.AuditState}");
......
Mall.Repository/TradePavilion/RB_Commerce_ConsultRepository.cs
View file @ 675b3c19
......@@ -15,7 +15,82 @@ namespace Mall.Repository.TradePavilion
public class RB_Commerce_ConsultRepository : BaseRepository<RB_Commerce_Consult>
{
/// <summary>
/// 获取商会活动报名分页列表
/// 获取商会活动报名统计分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Commerce_Consult_Extend> GetCommerceConsultStatisticsPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Consult_Extend query)
{
rowsCount = 0;
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT ActivityId,UserId,Count(1) AS UserCount
FROM RB_Commerce_Consult
WHERE 1=1
");
if (query == null)
{
return new List<RB_Commerce_Consult_Extend>();
}
else
{
if (query.EnrollState > 0)
{
if (query.EnrollState == 1)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.Status), (int)DateStateEnum.Normal);
}
else if (query.EnrollState == 2)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.Status), (int)DateStateEnum.Delete);
}
}
else
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.Status), (int)DateStateEnum.Normal);
}
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.LinkMan))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Consult_Extend.LinkMan));
parameters.Add("Name", "%" + query.LinkMan.Trim() + "%");
}
if (query.ActivityId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.ActivityId), query.ActivityId);
}
if (!string.IsNullOrEmpty(query.QActivityIds))
{
builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Commerce_Consult_Extend.ActivityId), query.QActivityIds);
}
if (!string.IsNullOrEmpty(query.QUserIds))
{
builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Commerce_Consult_Extend.UserId), query.QUserIds);
}
if (query.UserId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.UserId), query.UserId);
}
}
builder.Append(" GROUP BY ActivityId,UserId ");
return GetPage<RB_Commerce_Consult_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 获取商会活动报名列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
......
Mall.Repository/TradePavilion/RB_PrizeRepository.cs
View file @ 675b3c19
......@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
using VT.FW.DB.Dapper;
namespace Mall.Repository.TradePavilion
{
......@@ -25,6 +26,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();
DynamicParameters parameters = new DynamicParameters();
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)
{
......@@ -37,9 +39,15 @@ namespace Mall.Repository.TradePavilion
{
builder.Append($" AND a.{nameof(RB_Prize_Extend.MallBaseId)}={query.MallBaseId}");
}
if (!string.IsNullOrWhiteSpace(query.Name))
{
builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_Prize_Extend.Name));
parameters.Add("Name", "%" + query.Name.Trim() + "%");
// builder.Append($" AND a.{nameof(RB_Prize_Extend.Name)}like '%{query.Name}%'");
}
}
builder.Append($" order by Id desc");
return GetPage<RB_Prize_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
return GetPage<RB_Prize_Extend>(pageIndex, pageSize, out rowCount, builder.ToString(), parameters).ToList();
}
/// <summary>
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ 675b3c19
......@@ -264,6 +264,7 @@ namespace Mall.WebApi.Controllers
MallBaseId = MallBaseId,
GoodsIds = Ids,
GoodsStatus = 1,
CreateBy = -1,
GoodsClassify = 1,//查询非司导
GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
}, SmallShopsId: SmallShopsId);
......@@ -299,6 +300,7 @@ namespace Mall.WebApi.Controllers
GoodsStatus = 1,
GoodsClassify = 1,//查询非司导
OrderBy=2,
CreateBy = -1,
GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
}, SmallShopsId: SmallShopsId);
if (catGoodsList != null && catGoodsList.Count > 0)
......@@ -334,6 +336,7 @@ namespace Mall.WebApi.Controllers
GoodsStatus = 1,
GoodsClassify = 1,//查询非司导
OrderBy=2,
CreateBy=-1,
GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
});
#region 微店价格
......@@ -457,6 +460,7 @@ namespace Mall.WebApi.Controllers
GoodsIds = Ids,
GoodsStatus = 1,
GoodsClassify = 1,//查询非司导
CreateBy = -1,
GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
});
#region 微店价格
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 675b3c19
......@@ -1610,7 +1610,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.CarrierMetroList,
extModel.BannerList,
extModel.CollectId,
extModel.Discount,
Discount= extModel.Discount??"",
extModel.HonorList,
extModel.YeJi,
extModel.ShopNum,
......@@ -1619,7 +1619,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.BuiltUpArea,
extModel.EndBuiltUpArea,
extModel.FirstShopNumList,
extModel.StartingInfo,
StartingInfo= extModel.StartingInfo??"",
listEnroll,
extModel.OpeningStatus,
extModel.FirstStoreTest
......
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @ 675b3c19
......@@ -609,6 +609,26 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: list);
}
/// <summary>
/// 获取商会活动报名分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetCommerceConsultStaticPage()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Commerce_Consult_Extend()
{
LinkMan = parms.GetStringValue("LinkMan")
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var list = consultModule.GetCommerceConsultPageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
......
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