Skip to content

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

页面修改

parent 8ec33205
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 19 deletions
Mall.Model/Entity/Product/RB_Goods.cs
View file @ 54856797
......@@ -435,7 +435,6 @@ namespace Mall.Model.Entity.Product
/// </summary>
public string SubName { get; set; }
/// <summary>
/// 营销标识（文字+文字颜色+文字背景/ 图标）
/// </summary>
......@@ -459,5 +458,10 @@ namespace Mall.Model.Entity.Product
/// 发货地
/// </summary>
public string SendArea { get; set; }
/// <summary>
/// 视频填充方式(0默认，1-填充)
/// </summary>
public int VideoType { get; set; }
}
}
Mall.Model/Extend/User/RB_Distributor_Info_Extend.cs
View file @ 54856797
......@@ -105,5 +105,10 @@ namespace Mall.Model.Extend.User
/// 小程序排序
/// </summary>
public int SortNum { get; set; }
/// <summary>
/// 是否直接下级[1-是]
/// </summary>
public int IsDirect { get; set; }
}
}
Mall.Model/Extend/User/RB_Member_User_Extend.cs
View file @ 54856797
......@@ -141,6 +141,11 @@ namespace Mall.Model.Extend.User
/// 是否赞羊使用0-否，1-是
/// </summary>
public int IsZanYangUse { get; set; }
/// <summary>
/// 是否直接下级[1-是]
/// </summary>
public int IsDirect { get; set; }
}
......
Mall.Module.Product/ProductModule.cs
View file @ 54856797
......@@ -2423,11 +2423,13 @@ namespace Mall.Module.Product
fullNumPinkage = model.FreeShippingModel.FullNumPinkage ?? 0,
freeShippingUrl = model.FreeShippingModel.FreeShippingUrl,
marketingLogo = model.MarketingLogo,
//分类
cats = model.CategoryList.Select(x => new
{
x.CategoryId,
x.CategoryName
})//分类
}),
video_type=model.VideoType,
},
delivery = ""
};
......@@ -4506,7 +4508,8 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.IsLiveGoods),demodel.IsLiveGoods},
{ nameof(RB_Goods.ShelvesDate),demodel.ShelvesDate },
{ nameof(RB_Goods.DownDate),demodel.DownDate },
{ nameof(RB_Goods.SendArea),demodel.SendArea },
{ nameof(RB_Goods.SendArea),demodel.SendArea },
{ nameof(RB_Goods.VideoType),demodel.VideoType },
};
if (goodsModel.IsProcurement == 1)
......
Mall.Module.User/UserModule.cs
View file @ 54856797
......@@ -4029,7 +4029,9 @@ namespace Mall.Module.User
Name = demodel.Name,
TenantId = demodel.TenantId,
MallBaseId = demodel.MallBaseId,
SortNum = demodel.SortNum
SortNum = demodel.SortNum,
IsDirect=demodel.IsDirect,
Id=(demodel.UserId ?? 0)
});
List<object> RList = new List<object>();
if (list.Any())
......@@ -6554,5 +6556,19 @@ namespace Mall.Module.User
#endregion
/// <summary>
/// 修改用户等级为VIP
/// </summary>
/// <param name="UserId">用户编号</param>
/// <returns></returns>
public bool SetUserToVipModule(int UserId)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Distributor_Info_Extend.FXGradeId),2 }
};
return distributor_InfoRepository.Update(fileds, new WhereHelper(nameof(RB_Distributor_Info_Extend.UserId), UserId));
}
}
}
Mall.Repository/MarketingCenter/RB_Share_FriendRepository.cs
View file @ 54856797
......@@ -35,7 +35,7 @@ WHERE 1=1 AND A.Status=0
if (IsUse)
{
builder.AppendFormat(" AND A.{0}=1 ", nameof(RB_Share_Friend_Extend.IsUse));
orderBy = " ORDER BY A.IsTop DESC,A.SortNum ASC ";
orderBy = " ORDER BY A.IsTop DESC,A.SortNum ASC,A.CreateDate DESC ";
}
else
{
......
Mall.Repository/Product/RB_GoodsRepository.cs
View file @ 54856797
......@@ -4,6 +4,7 @@ using System.Text;
using Mall.Model.Entity.Product;
using Mall.Model.Extend.Product;
using System.Linq;
using VT.FW.DB.Dapper;
namespace Mall.Repository.Product
{
......@@ -362,6 +363,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
/// <returns></returns>
public List<RB_Goods_Extend> GetAppletGoodsPageList(int pageIndex, int pageSize, out long count, RB_Goods_Extend dmodel)
{
var parameters = new DynamicParameters();
string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0";
if (dmodel.TenantId > 0)
{
......@@ -385,7 +387,8 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
}
if (!string.IsNullOrEmpty(dmodel.Name))
{
where += $@" and g.{nameof(RB_Goods_Extend.Name)} like '%{dmodel.Name}%'";
where += $@" and g.{nameof(RB_Goods_Extend.Name)} like @Name ";
parameters.Add("Name", "%" + dmodel.Name.Trim() + "%");
}
if (dmodel.GoodsStatus > 0)
{
......@@ -481,7 +484,7 @@ FROM RB_Goods g INNER JOIN rb_goods_category c on g.Id=c.GoodsId
WHERE 1=1 and o.`Status`=0 and o.OrderStatus <> 7 group by od.GoodsId
) AS tempOrder ON g.Id=tempOrder.GoodsId
WHERE {where} group by g.Id {orderBy}";
return GetPage<RB_Goods_Extend>(pageIndex, pageSize, out count, sql).ToList();
return GetPage<RB_Goods_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
}
/// <summary>
......
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ 54856797
......@@ -278,10 +278,19 @@ select * from RB_Member_User where {where} order by CreateDate desc
{
where += $@" and u.{nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
}
if (!string.IsNullOrEmpty(dmodel.UserIds))
if (dmodel.IsDirect == 1)
{
where += $@" and u.{nameof(RB_Member_User.Id)} in({dmodel.UserIds})";
//查找直属下级
where += $@" and u.{nameof(RB_Member_User.SuperiorId)}={dmodel.Id}";
}
else
{
if (!string.IsNullOrEmpty(dmodel.UserIds))
{
where += $@" and u.{nameof(RB_Member_User.Id)} in({dmodel.UserIds})";
}
}
if (dmodel.FXGradeId > 0)
{
where += $@" and d.{nameof(RB_Distributor_Info.FXGradeId)}={dmodel.FXGradeId}";
......
Mall.WebApi/Controllers/MarketingCenter/ShareController.cs
View file @ 54856797
......@@ -186,7 +186,21 @@ namespace Mall.WebApi.Controllers.MarketingCenter
public ApiResult SetShareFriend()
{
JObject parm = JObject.Parse(RequestParm.msg.ToString());
var extModel = JsonConvert.DeserializeObject<RB_Share_Friend_Extend>(RequestParm.msg.ToString());
RB_Share_Friend_Extend extModel = new RB_Share_Friend_Extend()
{
Id = parm.GetInt("Id"),
CateId=parm.GetInt("CateId"),
GoodsId=parm.GetInt("GoodsId"),
CoverImg=parm.GetStringValue("CoverImg"),
MaterialImg=parm.GetStringValue("MaterialImg"),
MaterialInfo=parm.GetStringValue("MaterialInfo"),
LinkUrl=parm.GetStringValue("LinkUrl"),
IsTop=parm.GetInt("IsTop"),
SortNum=parm.GetInt("SortNum"),
IsUse=parm.GetInt("IsUse"),
ShareCount=parm.GetInt("ShareCount"),
};
extModel.TenantId = UserInfo.TenantId;
extModel.MallBaseId = RequestParm.MallBaseId;
extModel.CreateDate = DateTime.Now;
......
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @ 54856797
......@@ -348,7 +348,8 @@ namespace Mall.WebApi.Controllers.MallBase
attr = priceList,
goods_stock = model.InventoryNum,
goods_num = model.InventoryNum,
marketingLogo= model.MarketingLogo
marketingLogo= model.MarketingLogo,
video_type=model.VideoType
});
}
}
......
Mall.WebApi/Controllers/Product/ProductController.cs
View file @ 54856797
......@@ -1597,6 +1597,7 @@ namespace Mall.WebApi.Controllers.MallBase
model?.MarketingLogo,
model?.ShelvesDate,
model?.DownDate,
model?.VideoType,
};
}
return ApiResult.Success("", obj);
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ 54856797
......@@ -690,8 +690,6 @@ namespace Mall.WebApi.Controllers.User
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId;
//var list = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel);
int NewUserId = 0;
//HK 2020-08-27新增
......@@ -2171,5 +2169,21 @@ namespace Mall.WebApi.Controllers.User
#endregion
/// <summary>
/// 修改会员等级为VIP
/// </summary>
/// <param name="requestMsg"></param>
/// <returns></returns>
[HttpPost]
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public ApiResult SetUserToVip(object requestMsg)
{
var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
JObject parms = JObject.Parse(requestParm.msg.ToString());
var userId = parms.GetInt("NewUserId");
bool flag = userModule.SetUserToVipModule(userId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
}
}
\ No newline at end of file
Mall.WebApi/appsettings.json
View file @ 54856797
{
"ConnectionStrings": {
"DefaultConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient",
"UserConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"UserConnection": "server=192.168.2.114;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"UserConnectionPName": "MySql.Data.MySqlClient",
"PropertyConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"PropertyConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"PropertyConnectionPName": "MySql.Data.MySqlClient"
},
"Logging": {
......@@ -21,7 +21,7 @@
"ApiExpirTime": 2592000,
"AllowedHosts": "*",
"OpenValidation": "False",
"UploadSiteUrl": "http://192.168.2.214:8120",
"UploadSiteUrl": "http://192.168.1.214:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ImKey": "b612b31e837c79c68f141aeb719d2b20",
"ImSecret": "66000451fb72",
......
Mall.WebApi/appsettings2.json
View file @ 54856797
......@@ -15,7 +15,7 @@
"ApiExpirTime": 2592000,
"AllowedHosts": "*",
"OpenValidation": "False",
"UploadSiteUrl": "http://192.168.2.214:8120",
"UploadSiteUrl": "http://192.168.1.214:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ImKey": "b612b31e837c79c68f141aeb719d2b20",
"ImSecret": "66000451fb72",
......
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