Skip to content

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

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

parents 197a809d 1dc5d9b2
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 13 deletions
Mall.Model/Entity/User/RB_Distributor_Custom.cs
View file @ bb972274
......@@ -312,5 +312,27 @@ namespace Mall.Model.Entity.User
set;
}
/// <summary>
/// 是否显示vip购买图标0-否，1-是
/// </summary>
public int IsShowVIPBuyPic { get; set; }
/// <summary>
/// vip购买链接图标
/// </summary>
public string VipBuyICO
{
get;
set;
} /// <summary>
/// vip购买链接
/// </summary>
public string VipBuyUrl
{
get;
set;
}
}
}
Mall.Model/Entity/User/RB_Distributor_FXGradeCustom.cs
View file @ bb972274
......@@ -41,8 +41,7 @@ namespace Mall.Model.Entity.User
set;
}
/// <summary>
/// 背景颜色
......
Mall.Module.User/UserCommonModule.cs
View file @ bb972274
......@@ -454,7 +454,8 @@ namespace Mall.Module.User
//2020-07-20 Add By:W
Dictionary<string, object> keyValuesDistributor = new Dictionary<string, object>() {
{ nameof(RB_Distributor_Info.VipExpiryDate),distributorModel.VipExpiryDate}
{ nameof(RB_Distributor_Info.VipExpiryDate),distributorModel.VipExpiryDate},
{ nameof(RB_Distributor_Info.FXGradeId),model.GradeId}
};
List<WhereHelper> wheresDistributor = new List<WhereHelper>() {
new WhereHelper{
......
Mall.Module.User/UserModule.cs
View file @ bb972274
......@@ -1017,8 +1017,11 @@ namespace Mall.Module.User
{ nameof(RB_Distributor_Custom.OneDistributionName),demodel.OneDistributionName},
{ nameof(RB_Distributor_Custom.TwoDistributionName),demodel.TwoDistributionName},
{ nameof(RB_Distributor_Custom.ThreeDistributionName),demodel.ThreeDistributionName},
{ nameof(RB_Distributor_Custom.UpdateDate),demodel.UpdateDate}
};
{ nameof(RB_Distributor_Custom.UpdateDate),demodel.UpdateDate},
{ nameof(RB_Distributor_Custom.IsShowVIPBuyPic),demodel.IsShowVIPBuyPic},
{ nameof(RB_Distributor_Custom.VipBuyICO),demodel.VipBuyICO},
{ nameof(RB_Distributor_Custom.VipBuyUrl),demodel.VipBuyUrl}
};
List<WhereHelper> whereHelpers = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Distributor_Custom.Id),
......
Mall.Repository/User/RB_Vip_BuyRepository.cs
View file @ bb972274
......@@ -7,7 +7,7 @@ using System.Text;
namespace Mall.Repository.User
{
public class RB_Vip_BuyRepository:RepositoryBase<RB_Vip_Buy>
public class RB_Vip_BuyRepository : RepositoryBase<RB_Vip_Buy>
{
/// <summary>
/// 表名称
......@@ -31,7 +31,7 @@ namespace Mall.Repository.User
{
builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.MallBaseId > 0)
{
builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.MallBaseId)}={query.MallBaseId}");
}
......@@ -39,6 +39,14 @@ namespace Mall.Repository.User
{
builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.Id)}={query.Id}");
}
if (query.UserId > 0)
{
builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.UserId)}={query.UserId}");
}
if (query.PayState > -1)
{
builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.PayState)}={query.PayState}");
}
}
return GetPage<RB_Vip_Buy_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
......@@ -113,7 +121,7 @@ WHERE a.{nameof(RB_Vip_Buy_Extend.Status)}=0 group by a.Id");
{
builder.Append($" AND c.{nameof(RB_VipBuy_Commission.UserId)}={query.DistributionUserId}");
}
if (!string.IsNullOrEmpty(query.OrderNo))
if (!string.IsNullOrEmpty(query.OrderNo))
{
builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.OrderNo)} like '%{query.OrderNo}%'");
}
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ bb972274
......@@ -1912,6 +1912,9 @@ namespace Mall.WebApi.Controllers
one_share = new { name = distributorCustom?.OneDistributionName, defaultStr = "一级分销名称" },
second_share = new { name = distributorCustom?.TwoDistributionName, defaultStr = "二级分销名称" },
three_share = new { name = distributorCustom?.ThreeDistributionName, defaultStr = "三级分销名称" },
isshowvipbuypic = new { name = distributorCustom?.IsShowVIPBuyPic, defaultStr = "0" },
vipbuyico = distributorCustom?.VipBuyICO,
vipbuyurl = distributorCustom?.VipBuyUrl,
},
apply = new
{
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ bb972274
......@@ -1267,6 +1267,41 @@ namespace Mall.WebApi.Controllers.User
var fxGrade = userModule.GetFXDistributorGradeList(new RB_Distributor_FXGrade_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, IsCanBuy = 1, IsGuest = 3 });
return ApiResult.Success("", new { fxGradeCustom, fxGrade });
}
/// <summary>
/// 个人中心- vip购买记录
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetVipBuyPageList()
{
var parms = RequestParm;
var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(parms.msg.ToString());
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.UserId = AppletUserInfo.UserId;
demodel.PayState =1;
var list = userVipModule.GetVipBuyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.Id,
x.OrderNo,
x.UserName,
x.Money,
ExpiryDateStr = x.ExpiryDate.HasValue ? x.ExpiryDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
x.GradeName,
x.PayState,
x.PayWay,
PayTimeStr = x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
x.Remark
});
return ApiResult.Success("", pagelist);
}
#endregion
}
}
\ No newline at end of file
Mall.WebApi/Controllers/User/UserController.cs
View file @ bb972274
......@@ -942,7 +942,7 @@ namespace Mall.WebApi.Controllers.User
{
return ApiResult.ParamIsNull("请传递分销申请下文本颜色");
}
//
if (string.IsNullOrEmpty(demodel.DistributionCommissionName))
{
return ApiResult.ParamIsNull("请传递分销中心下分销佣金");
......@@ -1043,7 +1043,14 @@ namespace Mall.WebApi.Controllers.User
{
return ApiResult.ParamIsNull("请传递分销商下三级分销名称");
}
if (string.IsNullOrWhiteSpace(demodel.VipBuyUrl))
{
return ApiResult.Failed("VIP购买链接不能为空");
}
if (string.IsNullOrWhiteSpace(demodel.VipBuyICO))
{
return ApiResult.Failed("VIP购买链接图标不能为空");
}
demodel.TenantId = Convert.ToInt32(requestParm.uid);
demodel.MallBaseId = requestParm.MallBaseId;
......
Mall.WebApi/Controllers/User/UserVipController.cs
View file @ bb972274
......@@ -81,6 +81,8 @@ namespace Mall.WebApi.Controllers.User
{
return ApiResult.Failed("背景颜色不能为空");
}
if (demodel.Id == 0)
{
demodel.TenantId = Convert.ToInt32(req.uid);
......@@ -118,6 +120,7 @@ namespace Mall.WebApi.Controllers.User
RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(parms.msg.ToString());
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.PayState = -1;
var list = userVipModule.GetVipBuyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
......@@ -131,7 +134,8 @@ namespace Mall.WebApi.Controllers.User
x.GradeName,
x.PayState,
x.PayWay,
PayTimeStr= x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
PayTimeStr = x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
x.Remark
});
return ApiResult.Success("", pagelist);
}
......@@ -165,7 +169,8 @@ namespace Mall.WebApi.Controllers.User
x.Money,
x.GradeName,
PayTimeStr = x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
CommissionList = x.CommissionList.Select(z => new {
CommissionList = x.CommissionList.Select(z => new
{
z.Id,
z.Grade,
z.GradeDescription,
......@@ -257,7 +262,8 @@ namespace Mall.WebApi.Controllers.User
IsOCFirst = false;
}
}
else {
else
{
datarow.ExcelRows.Add(new ExcelColumn(value: "") { });
datarow.ExcelRows.Add(new ExcelColumn(value: "") { });
datarow.ExcelRows.Add(new ExcelColumn(value: "") { });
......
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