Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents 3afce8cb ac96fab7
Hide whitespace changes
Inline Side-by-side
Showing with 307 additions and 8 deletions
Mall.Model/Entity/AppletWeChat/RB_Live_HouseImg.cs 0 → 100644
View file @ 48d9cabd
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Entity.AppletWeChat
{
/// <summary>
/// 直播推广图片
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Live_HouseImg
{
/// <summary>
/// 房间号
/// </summary>
public int ID { get; set; }
/// <summary>
/// 房间id
/// </summary>
public string roomid { get; set; }
/// <summary>
/// 推广图片
/// </summary>
public string ExtensionImg { get; set; }
public int Status { get; set; }
/// <summary>
/// 商户id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
public DateTime CreateDate { get; set; }
}
}
Mall.Model/Extend/AppletWeChat/RB_Live_House_Extend.cs
View file @ 48d9cabd
......@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Extend.AppletWeChat
{
......@@ -24,6 +25,18 @@ namespace Mall.Model.Extend.AppletWeChat
public string total { get; set; }
}
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Live_HouseExtension_Extend: RB_Live_House
{
/// <summary>
/// 推广图片
/// </summary>
public string ExtensionImg { get; set; }
public int HouseImgID { get; set; }
}
/// <summary>
......
Mall.Module.User/MiniProgramModule.cs
View file @ 48d9cabd
......@@ -14,6 +14,8 @@ using Mall.Repository.User;
using Mall.Model.Extend.Statistics;
using Mall.Model.Query;
using VT.FW.DB;
using Mall.Model.Extend.AppletWeChat;
using Mall.Model.Entity.AppletWeChat;
namespace Mall.Module.User
{
......@@ -50,6 +52,12 @@ namespace Mall.Module.User
/// </summary>
private Repository.AppletWeChat.RB_Live_HouseRepository liveHouseRepository = new Repository.AppletWeChat.RB_Live_HouseRepository();
/// <summary>
/// 直播房间仓储层对象
/// </summary>
private Repository.AppletWeChat.RB_Live_HouseImgRepository liveHouseImgRepository = new Repository.AppletWeChat.RB_Live_HouseImgRepository();
/// <summary>
/// 轮播图表仓储层对象
/// </summary>
......@@ -1816,7 +1824,7 @@ namespace Mall.Module.User
//int errcode = Convert.ToInt32(jo["errcode"].ToString());
if (newLiveHouse.errcode == "0")
{
return newLiveHouse;
}
else
......@@ -1849,6 +1857,19 @@ namespace Mall.Module.User
return liveHouseRepository.GetLiveHousePageList(pageIndex, pageSize, out rowCount, query);
}
/// <summary>
/// 获取直播房间
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Live_HouseExtension_Extend> GetLiveHouseExtensionPageList(int pageIndex, int pageSize, out long rowCount, RB_Live_HouseExtension_Extend query)
{
return liveHouseRepository.GetLiveHouseExtensionPageList(pageIndex, pageSize, out rowCount, query);
}
/// <summary>
/// 获取直播房间信息
/// </summary>
......@@ -1877,6 +1898,83 @@ namespace Mall.Module.User
return false;
}
}
/// <summary>
/// 新增/修改基础信息
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool AddOrUpdateHouseImg(RB_Live_HouseImg model)
{
if (model.ID == 0)
{
return liveHouseImgRepository.Insert(model) > 0;
}
else
{
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Live_HouseImg.ExtensionImg),model.ExtensionImg},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Live_HouseImg.ID),
FiledValue=model.ID,
OperatorEnum=OperatorEnum.Equal
}, new WhereHelper(){
FiledName=nameof(RB_Live_HouseImg.TenantId),
FiledValue=model.TenantId,
OperatorEnum=OperatorEnum.Equal
}, new WhereHelper(){
FiledName=nameof(RB_Live_HouseImg.MallBaseId),
FiledValue=model.MallBaseId,
OperatorEnum=OperatorEnum.Equal
}
};
return liveHouseImgRepository.Update(keyValues, wheres);
}
}
/// <summary>
/// 删除物流规则
/// </summary>
/// <param name="gradeId"></param>
/// <param name="uid"></param>
/// <returns></returns>
public bool DelLiveHouseImg(int id, int uid, int mallBaseId)
{
bool flag = false;
Dictionary<string, object> cols = new Dictionary<string, object>()
{
{ nameof(RB_Live_HouseImg.Status),1},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Live_HouseImg.ID),
FiledValue=id,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Live_HouseImg.TenantId),
FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Live_HouseImg.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal
}
};
flag = liveHouseImgRepository.Update(cols, wheres1);
return flag;
}
#endregion
#region 首页统计
......
Mall.Repository/AppletWeChat/RB_Live_HouseImgRepository.cs 0 → 100644
View file @ 48d9cabd
using Mall.Model.Entity.AppletWeChat;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Mall.Repository.AppletWeChat
{
public class RB_Live_HouseImgRepository : BaseRepository<RB_Live_HouseImg>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_Live_HouseImg); } }
/// <summary>
/// 获取直播房间
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Live_HouseImg> GetLiveHouseListRepository(RB_Live_HouseImg query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE 1=1");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Live_HouseImg.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Live_HouseImg.MallBaseId)}={query.MallBaseId}");
}
if (!string.IsNullOrWhiteSpace(query.roomid))
{
builder.Append($" AND {nameof(RB_Live_HouseImg.roomid)}='{query.roomid}'");
}
}
return Get<RB_Live_HouseImg>(builder.ToString()).ToList();
}
}
}
Mall.Repository/AppletWeChat/RB_Live_HouseRepository.cs
View file @ 48d9cabd
using Mall.Model.Entity.AppletWeChat;
using Mall.Model.Extend.AppletWeChat;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -64,5 +65,30 @@ namespace Mall.Repository.AppletWeChat
}
return GetPage<RB_Live_House>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
/// <summary>
/// 获取直播房间
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Live_HouseExtension_Extend> GetLiveHouseExtensionPageList(int pageIndex, int pageSize, out long rowCount, RB_Live_HouseExtension_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT a.*,b.ExtensionImg,b.ID as HouseImgID FROM {TableName} as a INNER JOIN rb_live_houseimg as b on a.roomid=b.roomid WHERE 1=1");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.MallBaseId)}={query.MallBaseId}");
}
}
return GetPage<RB_Live_HouseExtension_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
}
}
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
View file @ 48d9cabd
......@@ -6,6 +6,7 @@ using Google.Protobuf.WellKnownTypes;
using Mall.Common;
using Mall.Common.API;
using Mall.Common.Plugin;
using Mall.Model.Extend.AppletWeChat;
using Mall.Model.Extend.Product;
using Mall.Model.Extend.User;
using Mall.Model.Query;
......@@ -40,11 +41,11 @@ namespace Mall.WebApi.Controllers.AppletWeChat
{
var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
Model.Entity.AppletWeChat.RB_Live_House demodel = JsonConvert.DeserializeObject<Model.Entity.AppletWeChat.RB_Live_House>(requestParm.msg.ToString());
RB_Live_HouseExtension_Extend demodel = JsonConvert.DeserializeObject<RB_Live_HouseExtension_Extend>(requestParm.msg.ToString());
demodel.TenantId = requestParm.TenantId;
demodel.MallBaseId = requestParm.MallBaseId;
var list = appletWeChatModule.GetLiveHousePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
// var list = appletWeChatModule.GetLiveHousePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
var list = appletWeChatModule.GetLiveHouseExtensionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
......@@ -55,6 +56,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
x.anchor_name,
x.cover_img,
x.live_status,
x.HouseImgID,
x.ExtensionImg,
start_time = GetTime(x.start_time),
end_time = GetTime(x.end_time),
});
......
Mall.WebApi/Controllers/AppletWeChat/PublishController.cs
View file @ 48d9cabd
......@@ -497,10 +497,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
Model.Entity.AppletWeChat.RB_Live_House demodel = JsonConvert.DeserializeObject<Model.Entity.AppletWeChat.RB_Live_House>(RequestParm.msg.ToString());
Model.Extend.AppletWeChat.RB_Live_HouseExtension_Extend demodel = JsonConvert.DeserializeObject<Model.Extend.AppletWeChat.RB_Live_HouseExtension_Extend>(RequestParm.msg.ToString());
demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId;
var list = appletWeChatModule.GetLiveHousePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
var list = appletWeChatModule.GetLiveHouseExtensionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
......@@ -511,6 +511,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
x.anchor_name,
x.cover_img,
x.live_status,
x.ExtensionImg,
x.HouseImgID,
start_time = GetTime(x.start_time),
end_time = GetTime(x.end_time),
});
......@@ -519,6 +521,73 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <summary>
/// 保存直播推广图片
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult AddOrUpdateHouseImg()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<Model.Entity.AppletWeChat.RB_Live_HouseImg>(RequestParm.msg.ToString());
if (query == null)
{
return ApiResult.Failed("请传入推广图片信息");
}
else
{
if (string.IsNullOrWhiteSpace(query.ExtensionImg))
{
return ApiResult.Failed("请传入推广图片信息");
}
if (string.IsNullOrWhiteSpace(query.roomid))
{
return ApiResult.Failed("请传入直播房间id");
}
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
bool result = appletWeChatModule.AddOrUpdateHouseImg(query);
if (result)
{
return ApiResult.Success("推广图片保存成功");
}
else
{
return ApiResult.Failed("推广图片保存失败");
}
}
}
/// <summary>
/// 删除图片
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelHouseImg()
{
var parms = RequestParm;
JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
int Id = parmsJob.GetInt("Id", 0);
if (Id <= 0)
{
return ApiResult.Failed("请传递参数");
}
bool flag = appletWeChatModule.DelLiveHouseImg(Id, UserInfo.TenantId, parms.MallBaseId);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
/// <summary>
/// 时间戳转为C#格式时间
/// </summary>
......
Mall.WebApi/Controllers/User/AppletLoginController.cs
View file @ 48d9cabd
......@@ -224,7 +224,7 @@ namespace Mall.WebApi.Controllers.User
#endregion
var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = umodel.MallBaseId });
//2020-08-12 Add By:W
var smallShopsInfoModle = userModule.GetSmallShopsInfoList(new RB_SmallShops_Info_Extend { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UserId = umodel.Id }).OrderByDescending(x => x.CreateDate).FirstOrDefault();
// var smallShopsInfoModle = userModule.GetSmallShopsInfoList(new RB_SmallShops_Info_Extend { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UserId = umodel.Id }).OrderByDescending(x => x.CreateDate).FirstOrDefault();
AppletUserInfo appletUserInfo = new AppletUserInfo()
{
......@@ -240,7 +240,7 @@ namespace Mall.WebApi.Controllers.User
SecretKey = umodel.SecretKey,
SuperiorId = umodel.SuperiorId ?? 0,
Token = token,
SmallShopId =(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0
SmallShopId =0//(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0
};
UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
return ApiResult.CouponSuccess(ResultCode.Fail, "", "", appletUserInfo);
......
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