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
d6892e63
Commit
d6892e63
authored
3 years ago
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
6e85b35e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
67 additions
and
11 deletions
+67
-11
RB_Customer.cs
Edu.Model/Entity/Customer/RB_Customer.cs
+27
-7
CourseModule.cs
Edu.Module.Course/CourseModule.cs
+40
-2
AppBaseController.cs
Edu.WebApi/Controllers/AppBaseController.cs
+0
-2
No files found.
Edu.Model/Entity/Customer/RB_Customer.cs
View file @
d6892e63
...
@@ -5,13 +5,13 @@ using VT.FW.DB;
...
@@ -5,13 +5,13 @@ using VT.FW.DB;
namespace
Edu.Model.Entity.Customer
namespace
Edu.Model.Entity.Customer
{
{
/// <summary>
/// <summary>
/// 同业客户管理实体类
/// 同业客户管理实体类
/// </summary>
/// </summary>
[
Serializable
]
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Customer
public
class
RB_Customer
{
{
/// <summary>
/// <summary>
/// 客户资料id
/// 客户资料id
/// </summary>
/// </summary>
...
@@ -166,5 +166,25 @@ namespace Edu.Model.Entity.Customer
...
@@ -166,5 +166,25 @@ namespace Edu.Model.Entity.Customer
/// 审核时间
/// 审核时间
/// </summary>
/// </summary>
public
DateTime
ApproveTime
{
get
;
set
;
}
public
DateTime
ApproveTime
{
get
;
set
;
}
/// <summary>
/// 微信用户OpenId
/// </summary>
public
string
OpenId
{
get
;
set
;
}
/// <summary>
/// 微信用户UnionId
/// </summary>
public
string
UnionId
{
get
;
set
;
}
/// <summary>
/// 微信昵称
/// </summary>
public
string
WeChatName
{
get
;
set
;
}
/// <summary>
/// 头像
/// </summary>
public
string
WeChatPhoto
{
get
;
set
;
}
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Edu.Module.Course/CourseModule.cs
View file @
d6892e63
...
@@ -1569,7 +1569,6 @@ namespace Edu.Module.Course
...
@@ -1569,7 +1569,6 @@ namespace Edu.Module.Course
#
endregion
#
endregion
#
region
小程序商品
#
region
小程序商品
public
int
SetMallGoods
(
RB_Course_ViewModel
model
)
public
int
SetMallGoods
(
RB_Course_ViewModel
model
)
{
{
...
@@ -1744,7 +1743,8 @@ namespace Edu.Module.Course
...
@@ -1744,7 +1743,8 @@ namespace Edu.Module.Course
}
}
}
}
else
else
{
//修改
{
//修改
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Goods
.
Name
),
demodel
.
Name
},
{
nameof
(
RB_Goods
.
Name
),
demodel
.
Name
},
{
nameof
(
RB_Goods
.
CarouselImage
),
demodel
.
CarouselImage
},
{
nameof
(
RB_Goods
.
CarouselImage
),
demodel
.
CarouselImage
},
...
@@ -2122,5 +2122,43 @@ namespace Edu.Module.Course
...
@@ -2122,5 +2122,43 @@ namespace Edu.Module.Course
}
}
#
endregion
#
endregion
#
region
甲鹤同业小程序
/// <summary>
/// 小程序获取分类鹤课程列表
/// </summary>
/// <returns></returns>
public
object
App_GetCateAndCourseListModule
(
int
Group_Id
)
{
var
data
=
GetCourseListModule
(
new
RB_Course_ViewModel
()
{
Group_Id
=
Group_Id
});
List
<
object
>
courseSubjects
=
new
List
<
object
>();
List
<
object
>
cateResultList
=
new
List
<
object
>();
if
(
data
!=
null
&&
data
.
Count
>
0
)
{
foreach
(
var
item
in
data
.
GroupBy
(
qitem
=>
qitem
.
CourseSubject
)?.
ToList
())
{
courseSubjects
.
Add
(
new
{
SubjectKey
=
item
.
Key
,
SubjectName
=
item
.
Key
.
ToName
()
});
}
var
cateList
=
data
.
GroupBy
(
qitem
=>
new
{
qitem
.
CateId
,
qitem
.
CateName
}).
Select
(
qitem
=>
new
{
qitem
.
Key
.
CateId
,
qitem
.
Key
.
CateName
});
foreach
(
var
item
in
cateList
)
{
cateResultList
.
Add
(
new
{
item
.
CateId
,
item
.
CateName
,
CourseList
=
data
.
Where
(
qitem
=>
qitem
.
CateId
==
item
.
CateId
)?.
ToList
()
});
}
}
return
new
{
courseSubjects
,
cateList
=
cateResultList
};
}
#
endregion
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Edu.WebApi/Controllers/AppBaseController.cs
View file @
d6892e63
...
@@ -92,7 +92,5 @@ namespace Edu.WebApi.Controllers
...
@@ -92,7 +92,5 @@ namespace Edu.WebApi.Controllers
AppStudentLoginError
userInfo
=
AppStudentReidsCache
.
GetStudentErrorLogin
(
Id
);
AppStudentLoginError
userInfo
=
AppStudentReidsCache
.
GetStudentErrorLogin
(
Id
);
return
userInfo
;
return
userInfo
;
}
}
}
}
}
}
\ No newline at end of file
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