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
878a12e1
Commit
878a12e1
authored
Jul 22, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
9cd2b564
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
539 additions
and
1 deletion
+539
-1
RB_Activity_Config.cs
Mall.Model/Entity/Education/RB_Activity_Config.cs
+60
-0
RB_Activity_Periods.cs
Mall.Model/Entity/Education/RB_Activity_Periods.cs
+61
-0
RB_Activity_PeriodsDetail.cs
Mall.Model/Entity/Education/RB_Activity_PeriodsDetail.cs
+100
-0
RB_Activity_Config_ViewModel.cs
Mall.Model/Extend/Education/RB_Activity_Config_ViewModel.cs
+15
-0
RB_Activity_PeriodsDetail_ViewModel.cs
...l/Extend/Education/RB_Activity_PeriodsDetail_ViewModel.cs
+23
-0
RB_Activity_Periods_ViewModel.cs
Mall.Model/Extend/Education/RB_Activity_Periods_ViewModel.cs
+15
-0
ActivityModule.cs
Mall.Module.Education/ActivityModule.cs
+41
-1
RB_Activity_ConfigRepository.cs
Mall.Repository/Education/RB_Activity_ConfigRepository.cs
+42
-0
RB_Activity_PeriodsDetailRepository.cs
...pository/Education/RB_Activity_PeriodsDetailRepository.cs
+60
-0
RB_Activity_PeriodsRepository.cs
Mall.Repository/Education/RB_Activity_PeriodsRepository.cs
+68
-0
RB_Education_ConsultRepository.cs
Mall.Repository/Education/RB_Education_ConsultRepository.cs
+15
-0
EducationController.cs
Mall.WebApi/Controllers/Education/EducationController.cs
+39
-0
No files found.
Mall.Model/Entity/Education/RB_Activity_Config.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
VT.FW.DB
;
namespace
Mall.Model.Entity.Education
{
/// <summary>
/// 活动配置实体类
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"EduConnection"
)]
public
class
RB_Activity_Config
{
/// <summary>
/// id
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 类型 1按人头 2百分比
/// </summary>
public
int
Type
{
get
;
set
;
}
/// <summary>
/// 提成金额/比例
/// </summary>
public
decimal
CommissionMoney
{
get
;
set
;
}
/// <summary>
/// 删除状态
/// </summary>
public
int
Status
{
get
;
set
;
}
/// <summary>
/// 集团id
/// </summary>
public
int
Group_Id
{
get
;
set
;
}
/// <summary>
/// 创建人
/// </summary>
public
int
CreateBy
{
get
;
set
;
}
/// <summary>
/// 创建时间
/// </summary>
public
DateTime
CreateTime
{
get
;
set
;
}
/// <summary>
/// 修改人
/// </summary>
public
int
UpdateBy
{
get
;
set
;
}
/// <summary>
/// 修改时间
/// </summary>
public
DateTime
UpdateTime
{
get
;
set
;
}
}
}
Mall.Model/Entity/Education/RB_Activity_Periods.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
VT.FW.DB
;
namespace
Mall.Model.Entity.Education
{
/// <summary>
/// 活动期数实体类
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"EduConnection"
)]
public
class
RB_Activity_Periods
{
/// <summary>
/// 编号
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 名称
/// </summary>
public
string
Name
{
get
;
set
;
}
/// <summary>
/// 期数
/// </summary>
public
string
Periods
{
get
;
set
;
}
/// <summary>
/// 创建人
/// </summary>
public
int
CreateBy
{
get
;
set
;
}
/// <summary>
/// 创建日期
/// </summary>
public
DateTime
CreateTime
{
get
;
set
;
}
/// <summary>
/// 累计金额
/// </summary>
public
decimal
SumPrice
{
get
;
set
;
}
/// <summary>
/// 集团编号
/// </summary>
public
int
Group_Id
{
get
;
set
;
}
/// <summary>
/// 关联财务单据ids
/// </summary>
public
string
Financials
{
get
;
set
;
}
/// <summary>
/// 已发放人员列表
/// </summary>
public
string
EmpIds
{
get
;
set
;
}
}
}
Mall.Model/Entity/Education/RB_Activity_PeriodsDetail.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
VT.FW.DB
;
namespace
Mall.Model.Entity.Education
{
/// <summary>
/// 活动期数明细实体类
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"EduConnection"
)]
public
class
RB_Activity_PeriodsDetail
{
/// <summary>
/// 编号
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 关联用户
/// </summary>
public
int
UserId
{
get
;
set
;
}
/// <summary>
/// 活动id
/// </summary>
public
int
ActivityId
{
get
;
set
;
}
/// <summary>
/// 订单ID
/// </summary>
public
int
OrderId
{
get
;
set
;
}
/// <summary>
/// 提成金额
/// </summary>
public
decimal
CommissionMoney
{
get
;
set
;
}
/// <summary>
/// 期数id
/// </summary>
public
int
PeriodId
{
get
;
set
;
}
/// <summary>
/// 期号
/// </summary>
public
string
Periods
{
get
;
set
;
}
/// <summary>
/// 部门id
/// </summary>
public
int
Depart_Id
{
get
;
set
;
}
/// <summary>
/// 校区id
/// </summary>
public
int
School_Id
{
get
;
set
;
}
/// <summary>
/// 集团id
/// </summary>
public
int
Group_Id
{
get
;
set
;
}
/// <summary>
/// 备注
/// </summary>
public
string
Remark
{
get
;
set
;
}
/// <summary>
/// 电商报名用户Id
/// </summary>
public
int
DSUserId
{
get
;
set
;
}
/// <summary>
/// 电商报名用户名称
/// </summary>
public
string
DSUserName
{
get
;
set
;
}
/// <summary>
/// 活动名称
/// </summary>
public
string
ActivityName
{
get
;
set
;
}
/// <summary>
/// 提成类型 1人头 2比例
/// </summary>
public
int
CType
{
get
;
set
;
}
/// <summary>
/// 提成金额/比例
/// </summary>
public
decimal
CMoney
{
get
;
set
;
}
/// <summary>
/// 活动时间
/// </summary>
public
DateTime
ActivityTime
{
get
;
set
;
}
}
}
Mall.Model/Extend/Education/RB_Activity_Config_ViewModel.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
Mall.Model.Entity.Education
;
namespace
Mall.Model.Extend.Education
{
/// <summary>
/// 活动配置视图实体类
/// </summary>
public
class
RB_Activity_Config_ViewModel
:
RB_Activity_Config
{
}
}
Mall.Model/Extend/Education/RB_Activity_PeriodsDetail_ViewModel.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
Mall.Model.Entity.Education
;
namespace
Mall.Model.Extend.Education
{
/// <summary>
/// 活动期数明细视图实体类
/// </summary>
public
class
RB_Activity_PeriodsDetail_ViewModel
:
RB_Activity_PeriodsDetail
{
/// <summary>
/// 用户ids
/// </summary>
public
string
UserIds
{
get
;
set
;
}
/// <summary>
/// 订单ids
/// </summary>
public
string
OrderIds
{
get
;
set
;
}
}
}
Mall.Model/Extend/Education/RB_Activity_Periods_ViewModel.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
Mall.Model.Entity.Education
;
namespace
Mall.Model.Extend.Education
{
/// <summary>
/// 活动期数视图实体类
/// </summary>
public
class
RB_Activity_Periods_ViewModel
:
RB_Activity_Periods
{
}
}
Mall.Module.Education/ActivityModule.cs
View file @
878a12e1
...
...
@@ -121,7 +121,18 @@ namespace Mall.Module.Education
/// </summary>
private
readonly
RB_VoucherRepository
voucherRepository
=
new
RB_VoucherRepository
();
/// <summary>
/// 活动配置
/// </summary>
private
readonly
RB_Activity_ConfigRepository
activity_ConfigRepository
=
new
RB_Activity_ConfigRepository
();
/// <summary>
/// 活动期数
/// </summary>
private
readonly
RB_Activity_PeriodsRepository
activity_PeriodsRepository
=
new
RB_Activity_PeriodsRepository
();
/// <summary>
/// 活动期数明细
/// </summary>
private
readonly
RB_Activity_PeriodsDetailRepository
activity_PeriodsDetailRepository
=
new
RB_Activity_PeriodsDetailRepository
();
/// <summary>
/// 活动大标题
...
...
@@ -2198,6 +2209,35 @@ namespace Mall.Module.Education
}
#
endregion
#
region
活动提成
/// <summary>
/// 创建活动提成
/// </summary>
/// <param name="month"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public
string
SetActivityCommissionInfo
(
string
month
,
UserInfo
userInfo
)
{
int
GroupId
=
100000
;
// 暂时固定 并没有授权相关的表;
//首先查询该月是否已创建
var
plist
=
activity_PeriodsRepository
.
GetList
(
new
RB_Activity_Periods_ViewModel
()
{
Group_Id
=
GroupId
,
Periods
=
month
});
if
(
plist
.
Any
())
{
return
"当月提成已创建"
;
}
string
EDate
=
Convert
.
ToDateTime
(
month
+
"-01"
).
AddMonths
(
1
).
AddDays
(-
1
).
ToString
(
"yyyy-MM-dd"
);
//查询小于等于 当前月的所有 款已平 有销售 小程序来的 未发放的订单
var
orderList
=
education_ConsultRepository
.
GetActivityCanSendCommissionList
(
EDate
,
userInfo
.
MallBaseId
);
if
(
orderList
.
Any
())
{
}
return
""
;
}
#
endregion
}
}
Mall.Repository/Education/RB_Activity_ConfigRepository.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
Mall.Model.Entity.Education
;
using
Mall.Model.Extend.Education
;
using
VT.FW.DB.Dapper
;
namespace
Mall.Repository.Education
{
/// <summary>
/// 活动配置仓储层
/// </summary>
public
class
RB_Activity_ConfigRepository
:
BaseRepository
<
RB_Activity_Config
>
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns>
public
List
<
RB_Activity_Config_ViewModel
>
GetList
(
RB_Activity_Config_ViewModel
demodel
)
{
string
where
=
$@" 1=1 and r.Status =0"
;
if
(
demodel
.
Group_Id
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_Config
.
Group_Id
)}
=
{
demodel
.
Group_Id
}
"
;
}
if
(
demodel
.
Type
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_Config
.
Type
)}
=
{
demodel
.
Type
}
"
;
}
string
sql
=
$@"
SELECT * From RB_Activity_Config r
WHERE
{
where
}
ORDER BY r.Id DESC "
;
return
Get
<
RB_Activity_Config_ViewModel
>(
sql
).
ToList
();
}
}
}
Mall.Repository/Education/RB_Activity_PeriodsDetailRepository.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
Mall.Model.Entity.Education
;
using
Mall.Model.Extend.Education
;
using
VT.FW.DB.Dapper
;
namespace
Mall.Repository.Education
{
/// <summary>
/// 活动周期明细仓储层
/// </summary>
public
class
RB_Activity_PeriodsDetailRepository
:
BaseRepository
<
RB_Activity_PeriodsDetail
>
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public
List
<
RB_Activity_PeriodsDetail_ViewModel
>
GetList
(
RB_Activity_PeriodsDetail_ViewModel
demodel
)
{
string
where
=
$@" 1=1"
;
if
(
demodel
.
Group_Id
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
Group_Id
)}
=
{
demodel
.
Group_Id
}
"
;
}
if
(
demodel
.
PeriodId
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
PeriodId
)}
=
{
demodel
.
PeriodId
}
"
;
}
if
(
demodel
.
UserId
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
UserId
)}
=
{
demodel
.
UserId
}
"
;
}
if
(!
string
.
IsNullOrEmpty
(
demodel
.
UserIds
))
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
UserId
)}
in(
{
demodel
.
UserIds
}
)"
;
}
if
(
demodel
.
ActivityId
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
ActivityId
)}
=
{
demodel
.
ActivityId
}
"
;
}
if
(
demodel
.
OrderId
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
OrderId
)}
=
{
demodel
.
OrderId
}
"
;
}
if
(!
string
.
IsNullOrEmpty
(
demodel
.
OrderIds
))
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
OrderId
)}
in(
{
demodel
.
OrderIds
}
)"
;
}
string
sql
=
$@" select r.* from RB_Activity_PeriodsDetail r where
{
where
}
order by r.Id asc"
;
return
Get
<
RB_Activity_PeriodsDetail_ViewModel
>(
sql
).
ToList
();
}
}
}
Mall.Repository/Education/RB_Activity_PeriodsRepository.cs
0 → 100644
View file @
878a12e1
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
Mall.Model.Entity.Education
;
using
Mall.Model.Extend.Education
;
using
VT.FW.DB.Dapper
;
namespace
Mall.Repository.Education
{
/// <summary>
/// 活动周期仓储层
/// </summary>
public
class
RB_Activity_PeriodsRepository
:
BaseRepository
<
RB_Activity_Periods
>
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public
List
<
RB_Activity_Periods_ViewModel
>
GetList
(
RB_Activity_Periods_ViewModel
demodel
)
{
string
where
=
$@" 1=1"
;
if
(
demodel
.
Group_Id
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_Periods_ViewModel
.
Group_Id
)}
=
{
demodel
.
Group_Id
}
"
;
}
if
(!
string
.
IsNullOrEmpty
(
demodel
.
Name
))
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_Periods_ViewModel
.
Name
)}
like '%
{
demodel
.
Name
}
%'"
;
}
if
(!
string
.
IsNullOrEmpty
(
demodel
.
Periods
))
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_Periods_ViewModel
.
Periods
)}
='
{
demodel
.
Periods
}
'"
;
}
string
sql
=
$@" select r.* from RB_Activity_Periods r where
{
where
}
order by r.Id desc"
;
return
Get
<
RB_Activity_Periods_ViewModel
>(
sql
).
ToList
();
}
/// <summary>
/// 获取分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public
List
<
RB_Activity_Periods_ViewModel
>
GetPageList
(
int
pageIndex
,
int
pageSize
,
out
long
count
,
RB_Activity_Periods_ViewModel
demodel
)
{
string
where
=
$@" 1=1"
;
if
(
demodel
.
Group_Id
>
0
)
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_Periods_ViewModel
.
Group_Id
)}
=
{
demodel
.
Group_Id
}
"
;
}
if
(!
string
.
IsNullOrEmpty
(
demodel
.
Name
))
{
where
+=
$@" and r.
{
nameof
(
RB_Activity_Periods_ViewModel
.
Name
)}
like '%
{
demodel
.
Name
}
%'"
;
}
string
sql
=
$@" select r.* from RB_Activity_Periods r where
{
where
}
order by r.Id desc"
;
return
GetPage
<
RB_Activity_Periods_ViewModel
>(
pageIndex
,
pageSize
,
out
count
,
sql
).
ToList
();
}
}
}
Mall.Repository/Education/RB_Education_ConsultRepository.cs
View file @
878a12e1
...
...
@@ -658,5 +658,20 @@ WHERE 1=1
return
obj
==
null
?
0
:
Convert
.
ToInt32
(
obj
);
}
/// <summary>
/// 获取可发提成的订单列表
/// </summary>
/// <param name="month"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public
List
<
RB_Education_Consult_Extend
>
GetActivityCanSendCommissionList
(
string
month
,
int
mallBaseId
)
{
string
sql
=
$@"SELECT c.*,a.ActivityName,a.StartTime,a.EndTime FROM rb_education_consult c
INNER JOIN rb_education_activity a on c.ActivityId = a.Id
WHERE c.`Status`=0 and a.`Status`=0 and c.MallBaseId =
{
mallBaseId
}
and a.EndTime <='
{
month
}
23:59:59' and c.OrderStatus =1 and c.UserId >0
and c.IsRollCall =2 and c.IsCommission <>2 and (c.Income + c.PlatformTax - c.RefundPrice) =c.Money"
;
return
Get
<
RB_Education_Consult_Extend
>(
sql
).
ToList
();
}
}
}
Mall.WebApi/Controllers/Education/EducationController.cs
View file @
878a12e1
...
...
@@ -3602,5 +3602,44 @@ namespace Mall.WebApi.Controllers.Education
}
}
#
endregion
#
region
活动提成
/// <summary>
/// 创建活动提成
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
SetActivityCommissionInfo
()
{
var
userInfo
=
base
.
UserInfo
;
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
string
Month
=
parms
.
GetStringValue
(
"Month"
);
//月份
if
(
string
.
IsNullOrEmpty
(
Month
))
{
return
ApiResult
.
ParamIsNull
();
}
try
{
Month
=
Convert
.
ToDateTime
(
Month
+
"-01"
).
ToString
(
"yyyy-MM"
);
}
catch
(
Exception
)
{
return
ApiResult
.
Failed
(
"日期格式有误"
);
}
string
msg
=
activityModule
.
SetActivityCommissionInfo
(
Month
,
userInfo
);
if
(
msg
==
""
)
{
return
ApiResult
.
Success
();
}
else
{
return
ApiResult
.
Failed
(
msg
);
}
}
#
endregion
}
}
\ No newline at end of file
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