Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
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
黄奎
Education
Commits
2975036b
Commit
2975036b
authored
Jun 08, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增留学订单返佣
parent
c9031daf
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
103 additions
and
6 deletions
+103
-6
RB_Order.cs
Edu.Model/Entity/Sell/RB_Order.cs
+5
-0
OrderModule.cs
Edu.Module.Course/OrderModule.cs
+46
-0
OrderController.cs
Edu.WebApi/Controllers/Course/OrderController.cs
+7
-3
ThirdController.cs
Edu.WebApi/Controllers/Third/ThirdController.cs
+45
-3
No files found.
Edu.Model/Entity/Sell/RB_Order.cs
View file @
2975036b
...
@@ -440,5 +440,10 @@ namespace Edu.Model.Entity.Sell
...
@@ -440,5 +440,10 @@ namespace Edu.Model.Entity.Sell
/// 滚动开班所属校区
/// 滚动开班所属校区
/// </summary>
/// </summary>
public
int
ScrollSchoolId
{
get
;
set
;
}
public
int
ScrollSchoolId
{
get
;
set
;
}
/// <summary>
/// 留学订单返佣金额
/// </summary>
public
decimal
StudyBroadRebateMoney
{
get
;
set
;
}
}
}
}
}
Edu.Module.Course/OrderModule.cs
View file @
2975036b
...
@@ -3805,6 +3805,52 @@ namespace Edu.Module.Course
...
@@ -3805,6 +3805,52 @@ namespace Edu.Module.Course
}
}
return
flag
;
return
flag
;
}
}
/// <summary>
/// 财务 更新留学订单返佣信息
/// </summary>
/// <param name="order"></param>
/// <param name="empModel"></param>
/// <returns></returns>
public
bool
UpdateStudyOrderInfo
(
RB_Order_ViewModel
order
,
Employee_ViewModel
empModel
)
{
var
orderModel
=
orderRepository
.
GetEntity
(
order
.
OrderId
);
if
(
orderModel
==
null
)
{
return
false
;
}
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
};
string
LogContent
=
""
;
if
(
order
.
StudyBroadRebateMoney
>=
0
)
{
keyValues
.
Add
(
nameof
(
RB_Order_ViewModel
.
StudyBroadRebateMoney
),
order
.
StudyBroadRebateMoney
);
LogContent
=
$"更新留学订单返佣【
{
orderModel
.
StudyBroadRebateMoney
}
】=>【
{
order
.
StudyBroadRebateMoney
}
】"
;
}
List
<
WhereHelper
>
wheres
=
new
List
<
WhereHelper
>()
{
new
WhereHelper
()
{
FiledName
=
nameof
(
RB_Order_ViewModel
.
OrderId
),
FiledValue
=
order
.
OrderId
,
OperatorEnum
=
OperatorEnum
.
Equal
}
};
bool
flag
=
orderRepository
.
Update
(
keyValues
,
wheres
);
if
(
flag
)
{
//写入日志
changeLogRepository
.
Insert
(
new
Model
.
Entity
.
Log
.
RB_User_ChangeLog
()
{
Id
=
0
,
Type
=
2
,
CreateBy
=
empModel
.
Id
,
CreateTime
=
DateTime
.
Now
,
Group_Id
=
empModel
.
Group_Id
,
LogContent
=
$"【
{
empModel
.
EmployeeName
}
(
{
empModel
.
Id
}
)】单据审核通过
{
LogContent
}
"
,
School_Id
=
empModel
.
School_Id
,
SourceId
=
order
.
OrderId
});
}
return
flag
;
}
#
endregion
#
endregion
#
region
财务统计
#
region
财务统计
...
...
Edu.WebApi/Controllers/Course/OrderController.cs
View file @
2975036b
...
@@ -1668,7 +1668,8 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -1668,7 +1668,8 @@ namespace Edu.WebApi.Controllers.Course
x
.
CreateType
,
x
.
CreateType
,
CreateTypeName
=
x
.
CreateType
.
ToName
(),
CreateTypeName
=
x
.
CreateType
.
ToName
(),
x
.
StuSourceIdName
,
x
.
StuSourceIdName
,
x
.
BrokerageMoney
x
.
BrokerageMoney
,
x
.
StudyBroadRebateMoney
,
})
})
};
};
pageModel
.
PageData
=
obj
;
pageModel
.
PageData
=
obj
;
...
@@ -1868,7 +1869,8 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -1868,7 +1869,8 @@ namespace Edu.WebApi.Controllers.Course
x
.
CreateType
,
x
.
CreateType
,
CreateTypeName
=
x
.
CreateType
.
ToName
(),
CreateTypeName
=
x
.
CreateType
.
ToName
(),
x
.
StuSourceIdName
,
x
.
StuSourceIdName
,
x
.
BrokerageMoney
x
.
BrokerageMoney
,
x
.
StudyBroadRebateMoney
,
})
})
};
};
pageModel
.
PageData
=
obj
;
pageModel
.
PageData
=
obj
;
...
@@ -2187,6 +2189,7 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -2187,6 +2189,7 @@ namespace Edu.WebApi.Controllers.Course
z
.
GuestName
,
z
.
GuestName
,
z
.
GuestState
z
.
GuestState
}),
}),
x
.
StudyBroadRebateMoney
})
})
};
};
return
ApiResult
.
Success
(
""
,
pageModel
);
return
ApiResult
.
Success
(
""
,
pageModel
);
...
@@ -2317,7 +2320,8 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -2317,7 +2320,8 @@ namespace Edu.WebApi.Controllers.Course
z
.
Id
,
z
.
Id
,
z
.
GuestName
,
z
.
GuestName
,
z
.
GuestState
z
.
GuestState
})
}),
x
.
StudyBroadRebateMoney
,
})
})
};
};
return
ApiResult
.
Success
(
""
,
pageModel
);
return
ApiResult
.
Success
(
""
,
pageModel
);
...
...
Edu.WebApi/Controllers/Third/ThirdController.cs
View file @
2975036b
using
Edu.Common.API
;
using
Edu.Common.API
;
using
Edu.Common.Plugin
;
using
Edu.Common.Plugin
;
using
Edu.Model.ViewModel.Sell
;
using
Edu.Module.Course
;
using
Edu.Module.Course
;
using
Edu.Module.User
;
using
Edu.Module.User
;
using
Edu.WebApi.Filter
;
using
Edu.WebApi.Filter
;
...
@@ -142,7 +143,8 @@ namespace Edu.WebApi.Controllers.Third
...
@@ -142,7 +143,8 @@ namespace Edu.WebApi.Controllers.Third
[
HttpGet
]
[
HttpGet
]
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
public
ApiResult
GetDepartmentManager
()
{
public
ApiResult
GetDepartmentManager
()
{
JObject
jobj
=
JObject
.
Parse
(
RequestParm
.
Msg
.
ToString
());
JObject
jobj
=
JObject
.
Parse
(
RequestParm
.
Msg
.
ToString
());
int
DeptId
=
jobj
.
GetInt
(
"DeptId"
,
0
);
int
DeptId
=
jobj
.
GetInt
(
"DeptId"
,
0
);
if
(
DeptId
<=
0
)
if
(
DeptId
<=
0
)
...
@@ -151,7 +153,8 @@ namespace Edu.WebApi.Controllers.Third
...
@@ -151,7 +153,8 @@ namespace Edu.WebApi.Controllers.Third
}
}
var
dmodel
=
departmentModule
.
GetDepartmentModule
(
DeptId
);
var
dmodel
=
departmentModule
.
GetDepartmentModule
(
DeptId
);
string
ManagerIds
=
""
;
string
ManagerIds
=
""
;
if
(
dmodel
!=
null
)
{
if
(
dmodel
!=
null
)
{
ManagerIds
=
dmodel
.
ManagerIds
??
""
;
ManagerIds
=
dmodel
.
ManagerIds
??
""
;
}
}
var
RList
=
new
object
();
var
RList
=
new
object
();
...
@@ -212,7 +215,8 @@ namespace Edu.WebApi.Controllers.Third
...
@@ -212,7 +215,8 @@ namespace Edu.WebApi.Controllers.Third
bool
flag
=
orderModule
.
UpdateEduOrderIncome
(
OrderId
,
Income
,
PlatformTax
,
Refund
,
empModel
);
bool
flag
=
orderModule
.
UpdateEduOrderIncome
(
OrderId
,
Income
,
PlatformTax
,
Refund
,
empModel
);
if
(
flag
)
if
(
flag
)
{
{
if
(
Refund
>
0
)
{
if
(
Refund
>
0
)
{
//是退款 检验订单是否会影响 业绩提成
//是退款 检验订单是否会影响 业绩提成
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
sellAchievementsModule
.
ValidataAchievements
(
OrderId
));
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
sellAchievementsModule
.
ValidataAchievements
(
OrderId
));
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
employeeBonusModule
.
ChangeEmployeeBonusModule
(
OrderId
));
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
employeeBonusModule
.
ChangeEmployeeBonusModule
(
OrderId
));
...
@@ -224,5 +228,43 @@ namespace Edu.WebApi.Controllers.Third
...
@@ -224,5 +228,43 @@ namespace Edu.WebApi.Controllers.Third
return
ApiResult
.
Failed
();
return
ApiResult
.
Failed
();
}
}
}
}
/// <summary>
/// 更新留学订单返佣金额
/// </summary>
/// <returns></returns>
[
HttpGet
]
[
HttpPost
]
[
AllowAnonymous
]
public
ApiResult
UpdateStudyOrderInfo
()
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
Msg
.
ToString
());
int
EmployeeId
=
parms
.
GetInt
(
"EmployeeId"
,
0
);
int
OrderId
=
parms
.
GetInt
(
"OrderId"
,
0
);
decimal
StudyBroadRebateMoney
=
parms
.
GetDecimal
(
"Income"
);
decimal
Fee
=
parms
.
GetDecimal
(
"PlatformTax"
);
if
(
EmployeeId
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递用户id"
);
}
if
(
OrderId
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递订单id"
);
}
var
empModel
=
employeeModule
.
GetEmployeeListModule
(
new
Model
.
ViewModel
.
User
.
Employee_ViewModel
()
{
Id
=
EmployeeId
})?.
FirstOrDefault
();
if
(
empModel
==
null
)
{
return
ApiResult
.
ParamIsNull
(
message
:
"当前员工编号不存在!"
);
}
var
orderInfo
=
new
RB_Order_ViewModel
()
{
OrderId
=
OrderId
,
StudyBroadRebateMoney
=
StudyBroadRebateMoney
-
Fee
};
bool
flag
=
orderModule
.
UpdateStudyOrderInfo
(
orderInfo
,
empModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
}
}
}
}
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