Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
73f54d9a
Commit
73f54d9a
authored
Aug 12, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
378ccc47
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
358 additions
and
5 deletions
+358
-5
RB_SmallShops_Custom.cs
Mall.Model/Entity/User/RB_SmallShops_Custom.cs
+284
-0
UserModule.cs
Mall.Module.User/UserModule.cs
+69
-0
AppletUserController.cs
Mall.WebApi/Controllers/User/AppletUserController.cs
+5
-5
No files found.
Mall.Model/Entity/User/RB_SmallShops_Custom.cs
0 → 100644
View file @
73f54d9a
using
VT.FW.DB
;
using
Mall.Common.Enum.User
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Model.Entity.User
{
/// <summary>
/// 微店自定义表实体
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_SmallShops_Custom
{
/// <summary>
/// Id
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 头部背景图片
/// </summary>
public
string
HeadBackImage
{
get
;
set
;
}
/// <summary>
/// 提现按钮圆角像素
/// </summary>
public
int
?
WithdrawalFilletPX
{
get
;
set
;
}
/// <summary>
/// 提现按钮文本
/// </summary>
public
string
WithdrawalText
{
get
;
set
;
}
/// <summary>
/// 提现按钮颜色
/// </summary>
public
string
WithdrawalColor
{
get
;
set
;
}
/// <summary>
/// 按钮文字颜色
/// </summary>
public
string
WithdrawalTextColor
{
get
;
set
;
}
/// <summary>
/// 提现图标
/// </summary>
public
string
WithdrawalImage
{
get
;
set
;
}
/// <summary>
/// 店铺订单名称
/// </summary>
public
string
SmallShopOrderName
{
get
;
set
;
}
/// <summary>
/// 店铺订单图片
/// </summary>
public
string
SmallShopOrderImage
{
get
;
set
;
}
/// <summary>
/// 提现明细
/// </summary>
public
string
WithdrawalDetailName
{
get
;
set
;
}
/// <summary>
/// 提现明细图片
/// </summary>
public
string
WithdrawalDetailImage
{
get
;
set
;
}
/// <summary>
/// 我的客户
/// </summary>
public
string
MyCustomerName
{
get
;
set
;
}
/// <summary>
/// 我的客户图片
/// </summary>
public
string
MyCustomerImage
{
get
;
set
;
}
/// <summary>
/// 店铺二维码
/// </summary>
public
string
SmallShopQRCodeName
{
get
;
set
;
}
/// <summary>
/// 店铺二维码图片
/// </summary>
public
string
SmallShopQRCodeImage
{
get
;
set
;
}
/// <summary>
/// 店铺设置
/// </summary>
public
string
SmallShopSetUpName
{
get
;
set
;
}
/// <summary>
/// 店铺设置图片
/// </summary>
public
string
SmallShopSetUpImage
{
get
;
set
;
}
/// <summary>
/// 直播名称
/// </summary>
public
string
LiveName
{
get
;
set
;
}
/// <summary>
/// 直播图标
/// </summary>
public
string
LiveImage
{
get
;
set
;
}
/// <summary>
/// 已提现佣金描述
/// </summary>
public
string
CommissionWithdrawnName
{
get
;
set
;
}
/// <summary>
/// 未结算佣金描述
/// </summary>
public
string
OutstandingCommissionName
{
get
;
set
;
}
/// <summary>
/// 可提现佣金描述
/// </summary>
public
string
WithdrawableName
{
get
;
set
;
}
///// <summary>
///// 分销商描述
///// </summary>
//public string DistributorName
//{
// get;
// set;
//}
///// <summary>
///// 待打款佣金描述
///// </summary>
//public string CommissionTobePaidName
//{
// get;
// set;
//}
///// <summary>
///// 用户须知描述
///// </summary>
//public string UserNotesName
//{
// get;
// set;
//}
///// <summary>
///// 我要提现描述
///// </summary>
//public string IWantToWithdrawName
//{
// get;
// set;
//}
///// <summary>
///// 提现金额描述
///// </summary>
//public string WithdrawalAmountName
//{
// get;
// set;
//}
///// <summary>
///// 提现方式描述
///// </summary>
//public string WithdrawalWayName
//{
// get;
// set;
//}
/// <summary>
/// 商户号
/// </summary>
public
int
TenantId
{
get
;
set
;
}
/// <summary>
/// 小程序id
/// </summary>
public
int
MallBaseId
{
get
;
set
;
}
/// <summary>
/// CreateDate
/// </summary>
public
DateTime
?
CreateDate
{
get
;
set
;
}
/// <summary>
/// UpdateDate
/// </summary>
public
DateTime
?
UpdateDate
{
get
;
set
;
}
}
}
Mall.Module.User/UserModule.cs
View file @
73f54d9a
...
@@ -6118,6 +6118,75 @@ namespace Mall.Module.User
...
@@ -6118,6 +6118,75 @@ namespace Mall.Module.User
return
false
;
return
false
;
}
}
/// <summary>
/// 获取粉象我的团队标题列表
/// </summary>
/// <param name="userInfo"></param>
/// <returns></returns>
public
object
GerSmallShopsMyTeamTitelListForFX
(
AppletUserInfo
userInfo
)
{
string
UserIds
=
member_UserRepository
.
GetSmallShopChildIdStr
(
userInfo
.
SmallShopId
);
//获取下级所有等级
var
disList
=
distributor_InfoRepository
.
GetFXGreadeListForMyTeam
(
new
RB_Distributor_Info_Extend
()
{
UserIds
=
UserIds
,
TenantId
=
userInfo
.
TenantId
,
MallBaseId
=
userInfo
.
MallBaseId
});
var
fxList
=
new
List
<
RB_Distributor_FXGrade_Extend
>();
if
(
disList
.
Where
(
x
=>
x
.
FXGradeId
>
0
).
Any
())
{
string
fxgradeIds
=
string
.
Join
(
","
,
disList
.
Select
(
x
=>
x
.
FXGradeId
));
fxList
=
distributor_FXGradeRepository
.
GetList
(
new
RB_Distributor_FXGrade_Extend
()
{
GradeIds
=
fxgradeIds
,
TenantId
=
userInfo
.
TenantId
,
MallBaseId
=
userInfo
.
MallBaseId
});
fxList
=
fxList
.
OrderByDescending
(
x
=>
x
.
Grade
).
ToList
();
//倒序 最大的拍前面
}
else
{
//增加一个 普通会员等级
fxList
=
distributor_FXGradeRepository
.
GetList
(
new
RB_Distributor_FXGrade_Extend
()
{
IsGuest
=
1
,
TenantId
=
userInfo
.
TenantId
,
MallBaseId
=
userInfo
.
MallBaseId
});
}
return
fxList
.
Select
(
x
=>
new
{
x
.
Id
,
x
.
GradeName
});
}
/// <summary>
/// 获取我的团队 (粉象)
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public
object
GetSmallShopsMyTeamPageListForFX
(
int
pageIndex
,
int
pageSize
,
out
long
count
,
RB_Distributor_Info_Extend
demodel
)
{
string
UserIds
=
member_UserRepository
.
GetSmallShopChildIdStr
(
demodel
.
UserId
??
0
);
var
list
=
member_UserRepository
.
GetPageListForFX
(
pageIndex
,
pageSize
,
out
count
,
new
RB_Member_User_Extend
()
{
UserIds
=
UserIds
,
FXGradeId
=
demodel
.
FXGradeId
,
Name
=
demodel
.
Name
,
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
demodel
.
MallBaseId
});
List
<
object
>
RList
=
new
List
<
object
>();
if
(
list
.
Any
())
{
string
userIds
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
Id
));
//获取推广人数
var
tList
=
member_UserRepository
.
GetDistributorReferralsNum
(
userIds
,
1
,
demodel
.
TenantId
,
demodel
.
MallBaseId
);
//获取消费金额 + 订单数量
var
oList
=
goods_OrderRepository
.
GetUserOrderNumAndMoney
(
userIds
,
demodel
.
TenantId
,
demodel
.
MallBaseId
);
foreach
(
var
item
in
list
)
{
int
tgNum
=
tList
.
Where
(
x
=>
x
.
SuperiorId
==
item
.
Id
).
FirstOrDefault
()?.
ReferralsNum
??
0
;
var
orderModel
=
oList
.
Where
(
x
=>
x
.
UserId
==
item
.
Id
).
FirstOrDefault
();
RList
.
Add
(
new
{
UserId
=
item
.
Id
,
UserName
=
item
.
Name
,
item
.
Photo
,
CreateDate
=
item
.
CreateDate
.
HasValue
?
item
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
GeneralizeNum
=
tgNum
,
OrderNum
=
orderModel
?.
OrderNum
??
0
,
Income
=
orderModel
?.
Income
??
0
});
}
}
return
RList
;
}
#
endregion
#
endregion
}
}
...
...
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @
73f54d9a
...
@@ -1856,7 +1856,7 @@ namespace Mall.WebApi.Controllers.User
...
@@ -1856,7 +1856,7 @@ namespace Mall.WebApi.Controllers.User
/// <summary>
/// <summary>
/// 获取
我的团队里粉象返佣
标题
/// 获取
微店我的客户列表
标题
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
...
@@ -1864,12 +1864,12 @@ namespace Mall.WebApi.Controllers.User
...
@@ -1864,12 +1864,12 @@ namespace Mall.WebApi.Controllers.User
{
{
var
userInfo
=
AppletUserInfo
;
var
userInfo
=
AppletUserInfo
;
var
obj
=
userModule
.
Ger
User
MyTeamTitelListForFX
(
userInfo
);
var
obj
=
userModule
.
Ger
SmallShops
MyTeamTitelListForFX
(
userInfo
);
return
ApiResult
.
Success
(
""
,
obj
);
return
ApiResult
.
Success
(
""
,
obj
);
}
}
/// <summary>
/// <summary>
/// 获取
我的团队 粉象返佣
列表
/// 获取
微店我的客户
列表
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
public
ApiResult
GetSmallShopsMyTeamPageListForFX
()
public
ApiResult
GetSmallShopsMyTeamPageListForFX
()
...
@@ -1881,8 +1881,8 @@ namespace Mall.WebApi.Controllers.User
...
@@ -1881,8 +1881,8 @@ namespace Mall.WebApi.Controllers.User
demodel
.
TenantId
=
userInfo
.
TenantId
;
demodel
.
TenantId
=
userInfo
.
TenantId
;
demodel
.
MallBaseId
=
userInfo
.
MallBaseId
;
demodel
.
MallBaseId
=
userInfo
.
MallBaseId
;
demodel
.
UserId
=
userInfo
.
User
Id
;
demodel
.
UserId
=
userInfo
.
SmallShop
Id
;
pageModel
.
pageData
=
userModule
.
Get
User
MyTeamPageListForFX
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
count
,
demodel
);
pageModel
.
pageData
=
userModule
.
Get
SmallShops
MyTeamPageListForFX
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
count
,
demodel
);
pageModel
.
count
=
Convert
.
ToInt32
(
count
);
pageModel
.
count
=
Convert
.
ToInt32
(
count
);
return
ApiResult
.
Success
(
""
,
pageModel
);
return
ApiResult
.
Success
(
""
,
pageModel
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment