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
751c37db
Commit
751c37db
authored
Feb 10, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
c01fe8c6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
RB_Order_ReturnComissionRepository.cs
Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs
+1
-0
B2BCustomerController.cs
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
+1
-0
CustomerCommissionController.cs
...bApi/Controllers/Customer/CustomerCommissionController.cs
+1
-1
No files found.
Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs
View file @
751c37db
...
...
@@ -137,6 +137,7 @@ namespace Edu.Repository.Sell
{
where
+=
$@" and r.
{
nameof
(
RB_Order_ReturnComission_ViewModel
.
Status
)}
in(1,2)"
;
}
string
sql
=
$@" select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName from RB_Order_ReturnComission r
left join rb_returnmoney_batch b on r.BatchId = b.Id
...
...
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
View file @
751c37db
...
...
@@ -541,6 +541,7 @@ namespace Edu.WebApi.Controllers.Customer
QCustomerState
=
base
.
ParmJObj
.
GetInt
(
"QCustomerState"
),
CreateBy
=
base
.
ParmJObj
.
GetInt
(
"CreateBy"
),
CategoryName
=
base
.
ParmJObj
.
GetStringValue
(
"CategoryName"
),
CategoryId
=
base
.
ParmJObj
.
GetInt
(
"CategoryId"
),
};
var
list
=
customerModule
.
GetCustomerPageModule_V2
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
rowsCount
,
query
);
foreach
(
var
item
in
list
)
...
...
Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs
View file @
751c37db
...
...
@@ -271,7 +271,7 @@ namespace Edu.WebApi.Controllers.Course
int
OrderSourceId
=
parms
.
GetInt
(
"OrderSourceId"
,
0
);
//来源对应ID (内部 同行联系人 学生)
int
CategoryId
=
parms
.
GetInt
(
"CategoryId"
,
0
);
//同行编号
int
CommissionType
=
parms
.
GetInt
(
"CommissionType"
,
0
);
//类型
if
(
OrderSourceType
<=
0
||
OrderSourceId
<=
0
||
CommissionType
<=
0
)
if
(
OrderSourceType
<=
0
||
(
OrderSourceId
<=
0
&&
CategoryId
<=
0
)
||
CommissionType
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
...
...
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