Skip to content

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

页面修改

parent 48e05140
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 102 deletions
Mall.Model/Entity/Product/RB_Goods_OrderCommission.cs
View file @ e0ef81e6
...@@ -119,6 +119,9 @@ namespace Mall.Model.Entity.Product ...@@ -119,6 +119,9 @@ namespace Mall.Model.Entity.Product
set; set;
} }
/// <summary>
/// 是否已提现 1是
/// </summary>
public int? IsRemit { get; set; } public int? IsRemit { get; set; }
......
Mall.Model/Entity/Product/RB_SmallShops_Commission.cs
View file @ e0ef81e6
...@@ -114,5 +114,4 @@ namespace Mall.Model.Entity.Product ...@@ -114,5 +114,4 @@ namespace Mall.Model.Entity.Product
/// </summary> /// </summary>
public int SmallShopsId { get; set; } public int SmallShopsId { get; set; }
} }
} }
\ No newline at end of file
Mall.Model/Extend/User/RB_Member_User_Extend.cs
View file @ e0ef81e6
...@@ -124,6 +124,11 @@ namespace Mall.Model.Extend.User ...@@ -124,6 +124,11 @@ namespace Mall.Model.Extend.User
/// 小程序排序 /// 小程序排序
/// </summary> /// </summary>
public int SortNum { get; set; } public int SortNum { get; set; }
/// <summary>
/// 是否已提现 1是 2否
/// </summary>
public int IsRemit { get; set; }
} }
......
Mall.Module.User/MemberUserModule.cs
View file @ e0ef81e6
...@@ -4,6 +4,7 @@ using System; ...@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using VT.FW.DB; using VT.FW.DB;
using System.Linq;
namespace Mall.Module.User namespace Mall.Module.User
{ {
...@@ -38,5 +39,28 @@ namespace Mall.Module.User ...@@ -38,5 +39,28 @@ namespace Mall.Module.User
//}); //});
//return falg; //return falg;
} }
/// <summary>
/// 获取用户佣金
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public RB_Member_User_Extend GetUserCommissionModule(int UserId)
{
RB_Member_User_Extend model = new RB_Member_User_Extend() { Id = UserId };
//总佣金
var totalList = member_UserRepository.GetUserCommissionRepository(new RB_Member_User_Extend() { UserIds=UserId.ToString()});
//本月佣金
var currentMonthList = member_UserRepository.GetUserCommissionRepository(new RB_Member_User_Extend() { UserIds = UserId.ToString() }, IsGetCurrentMonth: true);
if (totalList != null && totalList.Count > 0)
{
model.TotalCommission = totalList.Sum(qitem => qitem.Commission);
}
if (currentMonthList != null && currentMonthList.Count > 0)
{
model.Commission = currentMonthList.Sum(qitem => qitem.Commission);
}
return model;
}
} }
} }
Mall.Module.User/UserModule.cs
View file @ e0ef81e6
...@@ -2471,7 +2471,7 @@ namespace Mall.Module.User ...@@ -2471,7 +2471,7 @@ namespace Mall.Module.User
string apiResult = Mall.Common.Plugin.HttpHelper.HttpPost(Config.PaymentFinanceApi, JsonHelper.Serialize(resultInfo), ""); string apiResult = Mall.Common.Plugin.HttpHelper.HttpPost(Config.PaymentFinanceApi, JsonHelper.Serialize(resultInfo), "");
var apir = JsonConvert.DeserializeObject<ApiResult>(apiResult); var apir = JsonConvert.DeserializeObject<ApiResult>(apiResult);
LogHelper.Write("打款：" + apiResult); LogHelper.WriteInfo("打款：" + apiResult);
if (apir.resultCode == 1) if (apir.resultCode == 1)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
......
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ e0ef81e6
...@@ -26,43 +26,56 @@ namespace Mall.Repository.User ...@@ -26,43 +26,56 @@ namespace Mall.Repository.User
public List<RB_Member_User_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_User_Extend dmodel) public List<RB_Member_User_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_User_Extend dmodel)
{ {
string where = " 1=1 "; string where = " 1=1 ";
if (dmodel.TenantId > 0) { if (dmodel.TenantId > 0)
{
where += $@" and {nameof(RB_Member_User.TenantId)}={dmodel.TenantId}"; where += $@" and {nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
} }
if (dmodel.MallBaseId > 0) { if (dmodel.MallBaseId > 0)
{
where += $@" and {nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}"; where += $@" and {nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
} }
if (dmodel.Id > 0) { if (dmodel.Id > 0)
{
where += $@" and {nameof(RB_Member_User.Id)}={dmodel.Id}"; where += $@" and {nameof(RB_Member_User.Id)}={dmodel.Id}";
} }
if (!string.IsNullOrEmpty(dmodel.Name)) { if (!string.IsNullOrEmpty(dmodel.Name))
{
where += $@" and {nameof(RB_Member_User.Name)} like '%{dmodel.Name}%'"; where += $@" and {nameof(RB_Member_User.Name)} like '%{dmodel.Name}%'";
} }
if (!string.IsNullOrEmpty(dmodel.AliasName)) { if (!string.IsNullOrEmpty(dmodel.AliasName))
{
where += $@" and {nameof(RB_Member_User.AliasName)} like '%{dmodel.AliasName}%'"; where += $@" and {nameof(RB_Member_User.AliasName)} like '%{dmodel.AliasName}%'";
} }
if (dmodel.Source > 0) { if (dmodel.Source > 0)
{
where += $@" and {nameof(RB_Member_User.Source)} ={(int)dmodel.Source}"; where += $@" and {nameof(RB_Member_User.Source)} ={(int)dmodel.Source}";
} }
if (!string.IsNullOrEmpty(dmodel.Moblie)) { if (!string.IsNullOrEmpty(dmodel.Moblie))
{
where += $@" and {nameof(RB_Member_User.Moblie)} like '%{dmodel.Moblie}%'"; where += $@" and {nameof(RB_Member_User.Moblie)} like '%{dmodel.Moblie}%'";
} }
if (dmodel.MemberGrade > 0) { if (dmodel.MemberGrade > 0)
{
where += $@" and {nameof(RB_Member_User.MemberGrade)}={dmodel.MemberGrade}"; where += $@" and {nameof(RB_Member_User.MemberGrade)}={dmodel.MemberGrade}";
} }
if (dmodel.SuperiorId > 0) { if (dmodel.SuperiorId > 0)
{
where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}"; where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
} }
if (dmodel.IsDistributor > 0) { if (dmodel.IsDistributor > 0)
{
where += $@" and {nameof(RB_Member_User.IsDistributor)}={dmodel.IsDistributor}"; where += $@" and {nameof(RB_Member_User.IsDistributor)}={dmodel.IsDistributor}";
} }
if (!string.IsNullOrEmpty(dmodel.StartTime)) { if (!string.IsNullOrEmpty(dmodel.StartTime))
{
where += $@" and {nameof(RB_Member_User.CreateDate)} >='{dmodel.StartTime}'"; where += $@" and {nameof(RB_Member_User.CreateDate)} >='{dmodel.StartTime}'";
} }
if (!string.IsNullOrEmpty(dmodel.EndTime)) { if (!string.IsNullOrEmpty(dmodel.EndTime))
{
where += $@" and {nameof(RB_Member_User.CreateDate)} <='{dmodel.EndTime} 23:59:59'"; where += $@" and {nameof(RB_Member_User.CreateDate)} <='{dmodel.EndTime} 23:59:59'";
} }
if (dmodel.IsEmptyUserPhoto == 1) { if (dmodel.IsEmptyUserPhoto == 1)
{
where += $@" and IFNULL({nameof(RB_Member_User.Photo)},'')=''"; where += $@" and IFNULL({nameof(RB_Member_User.Photo)},'')=''";
} }
//HK06-01新增查询条件 //HK06-01新增查询条件
...@@ -70,7 +83,8 @@ namespace Mall.Repository.User ...@@ -70,7 +83,8 @@ namespace Mall.Repository.User
{ {
where += $@" and {nameof(RB_Member_User.OpenId)} = '%{dmodel.OpenId}%'"; where += $@" and {nameof(RB_Member_User.OpenId)} = '%{dmodel.OpenId}%'";
} }
if (dmodel.IsSelectCommpany == 1) { if (dmodel.IsSelectCommpany == 1)
{
where += $@" and {nameof(RB_Member_User.Id)} between 5 and 100 "; where += $@" and {nameof(RB_Member_User.Id)} between 5 and 100 ";
} }
string orderBy = "CreateDate desc"; string orderBy = "CreateDate desc";
...@@ -130,7 +144,8 @@ select * from RB_Member_User where {where} order by {orderBy} ...@@ -130,7 +144,8 @@ select * from RB_Member_User where {where} order by {orderBy}
{ {
where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}"; where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
} }
if (!string.IsNullOrEmpty(dmodel.UserIds)) { if (!string.IsNullOrEmpty(dmodel.UserIds))
{
where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})"; where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})";
} }
if (!string.IsNullOrEmpty(dmodel.StartTime)) if (!string.IsNullOrEmpty(dmodel.StartTime))
...@@ -299,7 +314,7 @@ WHERE 1=1 {0} ...@@ -299,7 +314,7 @@ WHERE 1=1 {0}
} }
builder.AppendFormat(orderBy); builder.AppendFormat(orderBy);
return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out rowCount,builder.ToString()).ToList(); return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
} }
/// <summary> /// <summary>
...@@ -369,7 +384,8 @@ where {where} ...@@ -369,7 +384,8 @@ where {where}
{ {
return Convert.ToInt32(obj); return Convert.ToInt32(obj);
} }
else { else
{
return 0; return 0;
} }
} }
...@@ -574,7 +590,8 @@ INNER JOIN rb_member_user u1 on u.Id=u1.SuperiorId ...@@ -574,7 +590,8 @@ INNER JOIN rb_member_user u1 on u.Id=u1.SuperiorId
WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId in ({uids}) GROUP BY u.SuperiorId"; WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId in ({uids}) GROUP BY u.SuperiorId";
return Get<RB_Member_User_Extend>(sql).ToList(); return Get<RB_Member_User_Extend>(sql).ToList();
} }
else if (tier == 3) { else if (tier == 3)
{
string sql = $@"SELECT u.SuperiorId,COUNT(0) AS ReferralsNum FROM rb_member_user u string sql = $@"SELECT u.SuperiorId,COUNT(0) AS ReferralsNum FROM rb_member_user u
INNER JOIN rb_member_user u1 on u.Id=u1.SuperiorId INNER JOIN rb_member_user u1 on u.Id=u1.SuperiorId
INNER JOIN rb_member_user u2 on u1.Id=u2.SuperiorId INNER JOIN rb_member_user u2 on u1.Id=u2.SuperiorId
...@@ -664,7 +681,7 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid ...@@ -664,7 +681,7 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid
/// <param name="tenantId"></param> /// <param name="tenantId"></param>
/// <param name="mallBaseId"></param> /// <param name="mallBaseId"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Member_User_Extend> GetDistributorReferralsPageList(int pageIndex,int pageSize,out long count, RB_Distributor_Info_Extend demodel) public List<RB_Member_User_Extend> GetDistributorReferralsPageList(int pageIndex, int pageSize, out long count, RB_Distributor_Info_Extend demodel)
{ {
string sql = ""; string sql = "";
if (demodel.GradeId == 1) if (demodel.GradeId == 1)
...@@ -857,7 +874,7 @@ order by {dmodel.OrderBy} "; ...@@ -857,7 +874,7 @@ order by {dmodel.OrderBy} ";
/// <param name="rowCount">总条数</param> /// <param name="rowCount">总条数</param>
/// <param name="dmodel">查询条件</param> /// <param name="dmodel">查询条件</param>
/// <returns></returns> /// <returns></returns>
public List<RB_Member_User_Extend> GetRankingList( RB_Member_User_Extend dmodel) public List<RB_Member_User_Extend> GetRankingList(RB_Member_User_Extend dmodel)
{ {
string where = " 1=1 "; string where = " 1=1 ";
if (dmodel.TenantId > 0) if (dmodel.TenantId > 0)
...@@ -942,7 +959,8 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use ...@@ -942,7 +959,8 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use
{ {
return Convert.ToInt32(obj.ToString()); return Convert.ToInt32(obj.ToString());
} }
else { else
{
return 0; return 0;
} }
} }
...@@ -950,82 +968,68 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use ...@@ -950,82 +968,68 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use
#endregion #endregion
/// <summary> /// <summary>
/// 新增用户 /// 获取用户佣金
/// </summary> /// </summary>
/// <param name="extModel"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public int SetMemberUserRepository(RB_Member_User_Extend extModel) public List<RB_Member_User_Extend> GetUserCommissionRepository(RB_Member_User_Extend query, bool IsGetCurrentMonth = false)
{
string where = "";
if (query != null)
{
if (query.TenantId > 0)
{
where += string.Format(" AND TenantId={0} ", query.TenantId);
}
if (query.MallBaseId > 0)
{
where += string.Format(" AND MallBaseId={0} ", query.MallBaseId);
}
if (!string.IsNullOrWhiteSpace(query.UserIds))
{
where += string.Format(" AND UserId IN({0}) ", query.UserIds);
}
if (query.Id > 0)
{ {
int result = 0; where += string.Format(" AND UserId IN({0}) ", query.Id);
DynamicParameters dynamicParameters = new DynamicParameters(); }
}
if (IsGetCurrentMonth)
{
where += string.Format(" AND DATE_FORMAT(CreateDate, '%Y/%m')=DATE_FORMAT('{0}','%Y/%m') ", DateTime.Now.ToString("yyyy-MM-dd"));
}
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(" SET NAMES utf8mb4; "); builder.AppendFormat(@"
SELECT UserId,IsRemit,SUM(A.Commission) AS Commission
FROM
(
SELECT UserId,SUM(Commission) AS Commission,IsRemit
FROM rb_goods_ordercommission
WHERE UserId>0 {0}
GROUP BY UserId
UNION ALL
builder.Append(@" SELECT UserId,SUM(Commission) AS Commission,RemitStatus AS IsRemit
INSERT INTO rb_member_user(Name,AliasName,Photo,Source,OpenId,Moblie,MemberGrade,OrderNum,CouponsNum,CardVolumeNum,Balance,Integral,SuperiorId,Blacklist,ContactWay,Remark,TenantId,MallBaseId,CreateDate,UpdateDate,TotalConsumption,IsDistributor,SecretKey,DownlineCondition,IsBeDownline,WaitSuperiorId,BeDownlineDate,SmallShopId,CompanyProfitRate,PostId) FROM rb_goods_orderintroduction
VALUES(@Name,@AliasName,@Photo,@Source,@OpenId,@Moblie,@MemberGrade,@OrderNum,@CouponsNum,@CardVolumeNum,@Balance,@Integral,@SuperiorId,@Blacklist,@ContactWay,@Remark WHERE UserId>0 {0}
,@TenantId,@MallBaseId,@CreateDate,@UpdateDate,@TotalConsumption,@IsDistributor,@SecretKey,@DownlineCondition,@IsBeDownline,@WaitSuperiorId,@BeDownlineDate,@SmallShopId,@CompanyProfitRate,@PostId); GROUP BY UserId,RemitStatus
SELECT LAST_INSERT_ID(); UNION ALL
");
dynamicParameters.Add("Name", extModel.Name);
dynamicParameters.Add("AliasName", extModel.AliasName);
dynamicParameters.Add("Photo", extModel.Photo);
dynamicParameters.Add("Source", extModel.Source);
dynamicParameters.Add("OpenId", extModel.OpenId);
dynamicParameters.Add("Moblie", extModel.Moblie);
dynamicParameters.Add("MemberGrade", extModel.MemberGrade);
dynamicParameters.Add("OrderNum", extModel.OrderNum);
dynamicParameters.Add("CouponsNum", extModel.CouponsNum);
dynamicParameters.Add("CardVolumeNum", extModel.CardVolumeNum);
dynamicParameters.Add("Balance", extModel.Balance);
dynamicParameters.Add("Integral", extModel.Integral);
dynamicParameters.Add("SuperiorId", extModel.SuperiorId);
dynamicParameters.Add("Blacklist", extModel.Blacklist);
dynamicParameters.Add("ContactWay", extModel.ContactWay);
dynamicParameters.Add("Remark", extModel.Remark);
dynamicParameters.Add("TenantId", extModel.TenantId);
dynamicParameters.Add("MallBaseId", extModel.MallBaseId);
dynamicParameters.Add("CreateDate", extModel.CreateDate);
dynamicParameters.Add("UpdateDate", extModel.UpdateDate);
dynamicParameters.Add("TotalConsumption", extModel.TotalConsumption);
dynamicParameters.Add("IsDistributor", extModel.IsDistributor);
dynamicParameters.Add("SecretKey", extModel.SecretKey);
dynamicParameters.Add("IsBeDownline", extModel.IsBeDownline);
dynamicParameters.Add("WaitSuperiorId", extModel.WaitSuperiorId);
dynamicParameters.Add("BeDownlineDate", extModel.BeDownlineDate);
dynamicParameters.Add("SmallShopId", extModel.SmallShopId);
dynamicParameters.Add("CompanyProfitRate", extModel.CompanyProfitRate);
dynamicParameters.Add("PostId", extModel.PostId);
var obj = base.ExecuteScalar(builder.ToString(), dynamicParameters);
if (obj != null && Convert.ToInt32(obj) > 0)
{
result = Convert.ToInt32(obj.ToString());
}
return result;
}
SELECT UserId,SUM(Commission) AS Commission,IsRemit
FROM rb_vipbuy_commission
WHERE UserId>0 {0}
GROUP BY UserId,IsRemit
UNION ALL
/// <summary> SELECT UserId,SUM(Commission) AS Commission,IsRemit
/// 修改用户微信昵称和头像 FROM rb_smallshops_commission
/// </summary> WHERE UserId>0 {0}
/// <param name="extModel"></param> GROUP BY UserId,IsRemit
/// <returns></returns>
public bool UpdateMemberUserRepository(RB_Member_User_Extend extModel) ) AS A GROUP BY UserId,IsRemit
{ ", where);
DynamicParameters dynamicParameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.Append(" SET NAMES utf8mb4; ");
builder.Append(@"
UPDATE rb_member_user SET
Name=@Name,Photo=@Photo
WHERE Id=@Id
");
dynamicParameters.Add("Name", extModel.Name);
dynamicParameters.Add("Photo", extModel.Photo); return Get<RB_Member_User_Extend>(builder.ToString()).ToList();
dynamicParameters.Add("Id", extModel.Id);
var result = base.Execute(builder.ToString(), dynamicParameters);
return result > 0;
} }
} }
} }
Mall.WebApi/App_Code/PayUtil.cs
View file @ e0ef81e6
...@@ -237,7 +237,7 @@ namespace Mall.WebApi.App_Code ...@@ -237,7 +237,7 @@ namespace Mall.WebApi.App_Code
}); });
var xe = XElement.Parse(result, LoadOptions.SetLineInfo); var xe = XElement.Parse(result, LoadOptions.SetLineInfo);
LogHelper.Write(null, "退款申请【" + param.OrderNumber + "】回调接口：" + xe); LogHelper.WriteInfo("退款申请【" + param.OrderNumber + "】回调接口：" + xe);
var returnCode = xe.GetElement("return_code").Value; var returnCode = xe.GetElement("return_code").Value;
//退款成功 //退款成功
if (returnCode.Equals("SUCCESS")) if (returnCode.Equals("SUCCESS"))
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ e0ef81e6
...@@ -847,6 +847,12 @@ namespace Mall.WebApi.Controllers.User ...@@ -847,6 +847,12 @@ namespace Mall.WebApi.Controllers.User
RB_Member_Footmark_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Footmark_Extend>(req.msg.ToString()); RB_Member_Footmark_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Footmark_Extend>(req.msg.ToString());
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
//HK 2020-08-27新增
JObject parms = JObject.Parse(req.msg.ToString());
if (parms.GetInt("NewUserId") > 0)
{
demodel.UserId = parms.GetInt("NewUserId");
}
demodel.TenantId = userInfo.TenantId; demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId; demodel.MallBaseId = userInfo.MallBaseId;
var list = userModule.GetUserFootMarkPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = userModule.GetUserFootMarkPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
...@@ -1665,6 +1671,12 @@ namespace Mall.WebApi.Controllers.User ...@@ -1665,6 +1671,12 @@ namespace Mall.WebApi.Controllers.User
demodel.TenantId = userInfo.TenantId; demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId; demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
//HK 2020-08-27新增
JObject parms = JObject.Parse(req.msg.ToString());
if (parms.GetInt("NewUserId") > 0)
{
demodel.UserId = parms.GetInt("NewUserId");
}
var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count); pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new pagelist.pageData = list.Select(x => new
......
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