Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
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
黄奎
mall.oytour.com
Commits
04e057a2
Commit
04e057a2
authored
Aug 18, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交获取付款账户列表
parent
9a50cc3c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
59 additions
and
3 deletions
+59
-3
OrderStatistics_Query.cs
Mall.Model/Query/OrderStatistics_Query.cs
+10
-0
SupplierModule.cs
Mall.Module.User/SupplierModule.cs
+15
-1
RB_ClientBankAccountRepository.cs
Mall.Repository/Finance/RB_ClientBankAccountRepository.cs
+1
-1
SupplierController.cs
Mall.WebApi/Controllers/User/SupplierController.cs
+33
-1
No files found.
Mall.Model/Query/OrderStatistics_Query.cs
View file @
04e057a2
...
@@ -248,5 +248,15 @@ namespace Mall.Model.Query
...
@@ -248,5 +248,15 @@ namespace Mall.Model.Query
/// </summary>
/// </summary>
public
decimal
RemitFXCommission
{
get
;
set
;
}
public
decimal
RemitFXCommission
{
get
;
set
;
}
/// <summary>
/// 主播佣金
/// </summary>
public
decimal
LiveCommission
{
get
;
set
;
}
/// <summary>
/// 主播佣金生成的财务单据 逗号分隔
/// </summary>
public
string
LiveFinanceIds
{
get
;
set
;
}
}
}
}
}
Mall.Module.User/SupplierModule.cs
View file @
04e057a2
...
@@ -305,5 +305,19 @@ namespace Mall.Module.User
...
@@ -305,5 +305,19 @@ namespace Mall.Module.User
}
}
return
clientBankAccountRepository
.
Exists
(
where
);
return
clientBankAccountRepository
.
Exists
(
where
);
}
}
}
#
region
获取财务单据付款人信息
/// <summary>
/// 根据查询条件获取客户账户列表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public
List
<
RB_ClientBankAccount
>
GetClientBankAccountList
(
Model
.
Extend
.
Finance
.
RB_ClientBankAccount_Extend
model
)
{
return
clientBankAccountRepository
.
GetList
(
model
);
}
#
endregion
}
}
}
Mall.Repository/Finance/RB_ClientBankAccountRepository.cs
View file @
04e057a2
...
@@ -157,7 +157,7 @@ namespace Mall.Repository.Finance
...
@@ -157,7 +157,7 @@ namespace Mall.Repository.Finance
{
{
where
+=
string
.
Format
(
" AND a."
+
nameof
(
RB_ClientBankAccount
.
CardNum
)
+
" like '%{0}%' "
,
model
.
CardNum
);
where
+=
string
.
Format
(
" AND a."
+
nameof
(
RB_ClientBankAccount
.
CardNum
)
+
" like '%{0}%' "
,
model
.
CardNum
);
}
}
string
sql
=
$@"select a.* from
{
TableName
}
as a
{
TableNam
e
}
"
;
string
sql
=
$@"select a.* from
{
TableName
}
as a
{
wher
e
}
"
;
return
Get
<
RB_ClientBankAccount
>(
sql
).
ToList
();
return
Get
<
RB_ClientBankAccount
>(
sql
).
ToList
();
}
}
...
...
Mall.WebApi/Controllers/User/SupplierController.cs
View file @
04e057a2
...
@@ -332,7 +332,7 @@ namespace Mall.WebApi.Controllers.User
...
@@ -332,7 +332,7 @@ namespace Mall.WebApi.Controllers.User
result
.
Add
(
newOrderGoods
);
result
.
Add
(
newOrderGoods
);
}
}
}
}
if
(
demodel
.
IsSelectAll
==
0
||
demodel
.
IsSelectAll
==
2
)
if
(
demodel
.
IsSelectAll
==
0
||
demodel
.
IsSelectAll
==
2
)
{
{
if
(
orderGoodsItem
.
FreightCostMoney
.
HasValue
&&
orderGoodsItem
.
FreightCostMoney
.
Value
>
0
&&
orderGoodsItem
.
FreightFinanceId
<=
0
)
if
(
orderGoodsItem
.
FreightCostMoney
.
HasValue
&&
orderGoodsItem
.
FreightCostMoney
.
Value
>
0
&&
orderGoodsItem
.
FreightFinanceId
<=
0
)
{
{
...
@@ -450,5 +450,37 @@ namespace Mall.WebApi.Controllers.User
...
@@ -450,5 +450,37 @@ namespace Mall.WebApi.Controllers.User
}
}
#
endregion
#
endregion
#
region
获取付款对象的列表
[
HttpPost
]
public
ApiResult
GetClientBankAccountList
()
{
var
parms
=
RequestParm
;
Model
.
Extend
.
Finance
.
RB_ClientBankAccount_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
Model
.
Extend
.
Finance
.
RB_ClientBankAccount_Extend
>(
RequestParm
.
msg
.
ToString
());
demodel
.
RB_Group_Id
=
2
;
demodel
.
RB_Branch_Id
=
-
1
;
demodel
.
Type
=
Common
.
Enum
.
Finance
.
ClientTypeEnum
.
Other
;
var
list
=
supplierModule
.
GetClientBankAccountList
(
demodel
);
var
result
=
list
.
Select
(
x
=>
new
{
x
.
ID
,
x
.
OpenBankName
,
x
.
AccountAlias
,
x
.
AccountClassify
,
x
.
AccountHolder
,
x
.
AccountType
,
x
.
BankId
,
x
.
CardNum
,
x
.
RB_Branch_Id
,
x
.
RB_Group_Id
});
return
ApiResult
.
Success
(
""
,
result
);
}
#
endregion
}
}
}
}
\ No newline at end of file
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