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
6bd40f2f
Commit
6bd40f2f
authored
Dec 02, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
6d994ccf
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
RB_Task.cs
Edu.Model/Entity/Customer/RB_Task.cs
+5
-0
RB_TaskDetails.cs
Edu.Model/Entity/Customer/RB_TaskDetails.cs
+1
-4
CustomerTaskModule.cs
Edu.Module.Customer/CustomerTaskModule.cs
+1
-1
B2BCustomerController.cs
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
+2
-1
No files found.
Edu.Model/Entity/Customer/RB_Task.cs
View file @
6bd40f2f
...
...
@@ -85,5 +85,10 @@ namespace Edu.Model.Entity.Customer
/// 兑换截止日期
/// </summary>
public
DateTime
ExchangeEndTime
{
get
;
set
;
}
/// <summary>
/// 任务值类型(1-人数,2-成交金额)
/// </summary>
public
int
TaskFinishType
{
get
;
set
;
}
}
}
Edu.Model/Entity/Customer/RB_TaskDetails.cs
View file @
6bd40f2f
...
...
@@ -38,10 +38,7 @@ namespace Edu.Model.Entity.Customer
/// </summary>
public
string
TargetId
{
get
;
set
;
}
/// <summary>
/// 任务值类型(1-人数,2-成交金额)
/// </summary>
public
int
TaskFinishType
{
get
;
set
;
}
/// <summary>
/// 任务完成值
...
...
Edu.Module.Customer/CustomerTaskModule.cs
View file @
6bd40f2f
...
...
@@ -179,6 +179,7 @@ namespace Edu.Module.Customer
{
nameof
(
RB_Task_Extend
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_Task_Extend
.
UpdateTime
),
model
.
UpdateTime
},
{
nameof
(
RB_Task_Extend
.
ExchangeEndTime
),
model
.
ExchangeEndTime
},
{
nameof
(
RB_Task_Extend
.
TaskFinishType
),
model
.
TaskFinishType
},
};
flag
=
customer_TaskRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Task_Extend
.
Id
),
model
.
Id
));
}
...
...
@@ -238,7 +239,6 @@ namespace Edu.Module.Customer
{
nameof
(
RB_TaskDetails_Extend
.
DetailsName
),
item
.
DetailsName
},
{
nameof
(
RB_TaskDetails_Extend
.
TaskType
),
item
.
TaskType
},
{
nameof
(
RB_TaskDetails_Extend
.
TargetId
),
item
.
TargetId
},
{
nameof
(
RB_TaskDetails_Extend
.
TaskFinishType
),
item
.
TaskFinishType
},
{
nameof
(
RB_TaskDetails_Extend
.
TaskFinishValue
),
item
.
TaskFinishValue
},
{
nameof
(
RB_TaskDetails_Extend
.
TaskKudo
),
item
.
TaskKudo
},
{
nameof
(
RB_TaskDetails_Extend
.
TaskKudoImg
),
item
.
TaskKudoImg
},
...
...
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
View file @
6bd40f2f
...
...
@@ -206,6 +206,7 @@ namespace Edu.WebApi.Controllers.Customer
TaskEndTime
=
base
.
ParmJObj
.
GetDateTime
(
"TaskEndTime"
),
TaskDesc
=
base
.
ParmJObj
.
GetStringValue
(
"TaskDesc"
),
ExchangeEndTime
=
base
.
ParmJObj
.
GetDateTime
(
"ExchangeEndTime"
),
TaskFinishType
=
base
.
ParmJObj
.
GetInt
(
"TaskFinishType"
),
};
string
taskImageList
=
base
.
ParmJObj
.
GetStringValue
(
"TaskImageList"
);
List
<
string
>
imgList
=
new
List
<
string
>();
...
...
@@ -250,7 +251,7 @@ namespace Edu.WebApi.Controllers.Customer
DetailsName
=
jobj
.
GetStringValue
(
"DetailsName"
),
TaskType
=
(
TaskTypeEnum
)
jobj
.
GetInt
(
"TaskType"
),
TargetId
=
string
.
Join
(
","
,
targetIds
),
TaskFinishType
=
jobj
.
GetInt
(
"TaskFinishType"
),
TaskFinishValue
=
jobj
.
GetDecimal
(
"TaskFinishValue"
),
TaskKudo
=
jobj
.
GetStringValue
(
"TaskKudo"
),
TaskKudoImg
=
JsonHelper
.
Serialize
(
imgKudoList
),
...
...
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