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
919adfe6
Commit
919adfe6
authored
Feb 22, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
4e1065d4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
43 deletions
+46
-43
ClassModule.cs
Edu.Module.Course/ClassModule.cs
+11
-8
AppletIndexController.cs
Edu.WebApi/Controllers/Applet/AppletIndexController.cs
+35
-35
No files found.
Edu.Module.Course/ClassModule.cs
View file @
919adfe6
...
...
@@ -2077,7 +2077,7 @@ namespace Edu.Module.Course
var
sellerInfo
=
UserReidsCache
.
GetUserLoginInfo
(
orderModel
.
EnterID
);
#
region
欠费提醒(销售)
var
queryTargetWorkId
=
accountRepository
.
GetWorkUserIdRepository
(
orderModel
.
EnterID
);
if
(!
string
.
IsNullOrEmpty
(
queryTargetWorkId
))
if
(!
string
.
IsNullOrEmpty
(
queryTargetWorkId
)
&&
sellerInfo
!=
null
)
{
// 学员名称(名称+电话),剩余课时,关联单号,待收金额,班级老师,班级名称
var
path
=
$"/sale/myOrder?OrderId=
{
guestModel
.
OrderId
}
"
;
...
...
@@ -2135,10 +2135,11 @@ namespace Edu.Module.Course
{
var
shengyuMoney
=
orderModel
.
PreferPrice
-
orderModel
.
Income
+
orderModel
.
Refund
-
orderModel
.
PlatformTax
-
orderModel
.
DiscountMoney
-
orderModel
.
LessPrice
;
var
classModel
=
classRepository
.
GetEntity
<
RB_Class_ViewModel
>(
guestModel
.
ClassId
);
var
sellerInfo
=
UserReidsCache
.
GetUserLoginInfo
(
orderModel
.
EnterID
);
var
sellerInfo
=
UserReidsCache
.
GetUserLoginInfo
(
orderModel
.
CreateBy
);
#
region
即将欠费提醒(销售)
var
queryTargetWorkId
=
accountRepository
.
GetWorkUserIdRepository
(
orderModel
.
EnterID
);
if
(!
string
.
IsNullOrEmpty
(
queryTargetWorkId
))
var
queryTargetWorkId
=
accountRepository
.
GetWorkUserIdRepository
(
orderModel
.
CreateBy
);
if
(!
string
.
IsNullOrEmpty
(
queryTargetWorkId
)
&&
sellerInfo
!=
null
)
{
// 学员名称(名称+电话),剩余课时,关联单号,待收金额,班级老师,班级名称
var
path
=
$"/sale/myOrder?OrderId=
{
guestModel
.
OrderId
}
"
;
...
...
@@ -2198,7 +2199,7 @@ namespace Edu.Module.Course
var
sellerInfo
=
UserReidsCache
.
GetUserLoginInfo
(
orderModel
.
EnterID
);
#
region
即将结课提醒
(
销售端
)
var
queryTargetWorkId
=
accountRepository
.
GetWorkUserIdRepository
(
orderModel
.
EnterID
);
if
(!
string
.
IsNullOrEmpty
(
queryTargetWorkId
))
if
(!
string
.
IsNullOrEmpty
(
queryTargetWorkId
)
&&
sellerInfo
!=
null
)
{
// 学员名称(名称+电话),剩余课时,关联单号,待收金额,班级老师,班级名称
var
path
=
$"/sale/myOrder?OrderId=
{
guestModel
.
OrderId
}
"
;
...
...
@@ -2261,7 +2262,7 @@ namespace Edu.Module.Course
var
sellerInfo
=
UserReidsCache
.
GetUserLoginInfo
(
orderModel
.
EnterID
);
#
region
即将结课提醒
(
销售端
)
var
queryTargetWorkId
=
accountRepository
.
GetWorkUserIdRepository
(
orderModel
.
EnterID
);
if
(!
string
.
IsNullOrEmpty
(
queryTargetWorkId
))
if
(!
string
.
IsNullOrEmpty
(
queryTargetWorkId
)
&&
sellerInfo
!=
null
)
{
// 学员名称(名称+电话),剩余课时,关联单号,待收金额,班级老师,班级名称
var
path
=
$"/sale/myOrder?OrderId=
{
guestModel
.
OrderId
}
"
;
...
...
@@ -5289,7 +5290,8 @@ namespace Edu.Module.Course
//约课
planModel
=
class_PlanRepository
.
GetToDayClassPlanForYK
(
stuId
,
courseId
,
groupId
);
}
else
{
else
{
planModel
=
class_PlanRepository
.
GetToDayClassPlan
(
classId
,
groupId
);
}
if
(
planModel
!=
null
)
...
...
@@ -5300,7 +5302,8 @@ namespace Edu.Module.Course
var
ogModel
=
order_GuestRepository
.
GetEntity
(
guestId
);
zj
=
ogModel
.
CourseChapterNo
+
1
;
//这次课的章节
}
else
{
else
{
zj
=
planModel
.
LessonPlanNum
+
1
;
}
if
(
planModel
.
ClassDate
.
ToString
(
"yyyy-MM-dd"
)
==
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
))
...
...
Edu.WebApi/Controllers/Applet/AppletIndexController.cs
View file @
919adfe6
This diff is collapsed.
Click to expand it.
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