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
a4bb6608
Commit
a4bb6608
authored
Aug 05, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp调用推荐返佣打款
parent
4a84c35d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
UserModule.cs
Mall.Module.User/UserModule.cs
+4
-1
ERPOrderCommissionController.cs
...ebApi/Controllers/Finance/ERPOrderCommissionController.cs
+3
-3
No files found.
Mall.Module.User/UserModule.cs
View file @
a4bb6608
...
...
@@ -5815,7 +5815,7 @@ namespace Mall.Module.User
/// <param name="mallBaseId"></param>
/// <param name="empId"></param>
/// <returns></returns>
public
string
SetRecommendOrdersBillRemit
(
int
billId
,
int
tenantId
,
int
mallBaseId
,
int
empId
)
public
string
SetRecommendOrdersBillRemit
(
int
billId
,
int
tenantId
,
int
mallBaseId
,
int
empId
,
string
Remark
=
""
)
{
var
model
=
distributor_BillRepository
.
GetEntity
(
billId
);
if
(
model
==
null
)
{
return
"账单不存在"
;
}
...
...
@@ -5827,6 +5827,9 @@ namespace Mall.Module.User
if
(
empId
>
0
)
{
keyValues
.
Add
(
nameof
(
RB_Distributor_Bill
.
EmpId
),
empId
);
}
if
(!
string
.
IsNullOrEmpty
(
Remark
))
{
keyValues
.
Add
(
nameof
(
RB_Distributor_Bill
.
Remark
),
(
model
.
Remark
??
""
)
+
" "
+
Remark
);
}
List
<
WhereHelper
>
wheres
=
new
List
<
WhereHelper
>()
{
new
WhereHelper
(){
FiledName
=
nameof
(
RB_Distributor_Bill
.
Id
),
...
...
Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs
View file @
a4bb6608
...
...
@@ -209,7 +209,7 @@ namespace Mall.WebApi.Controllers.Finance
int
TenantId
=
Convert
.
ToInt32
(
new
ConfigurationBuilder
().
Add
(
new
JsonConfigurationSource
{
Path
=
"appsettings.json"
}).
Build
().
GetSection
(
"FinanceSetting"
)[
"TenantId"
]);
int
MallBaseId
=
Convert
.
ToInt32
(
new
ConfigurationBuilder
().
Add
(
new
JsonConfigurationSource
{
Path
=
"appsettings.json"
}).
Build
().
GetSection
(
"FinanceSetting"
)[
"MallBaseId"
]);
var
parms
=
JObject
.
Parse
(
rmsg
.
ToString
());
int
BillId
=
parms
.
GetInt
(
"BillId"
,
0
);
int
BillId
=
parms
.
GetInt
(
"BillId"
,
0
);
if
(
BillId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
...
...
@@ -227,7 +227,7 @@ namespace Mall.WebApi.Controllers.Finance
var
flag
=
App_Code
.
PayUtil
.
GetTransfersOrder
((
bmodel
.
Periods
??
""
)
+
bmodel
.
Id
,
bmodel
.
Money
??
0
,
(
bmodel
.
UserId
??
0
).
ToString
(),
umodel
.
OpenId
,
mallModel
,
_accessor
);
if
(
flag
)
{
string
msg
=
userModule
.
SetRecommendOrdersBillRemit
(
BillId
,
TenantId
,
MallBaseId
,
0
);
string
msg
=
userModule
.
SetRecommendOrdersBillRemit
(
BillId
,
TenantId
,
MallBaseId
,
0
,
"单据审核通过,已自动打款"
);
if
(
msg
!=
""
)
{
LogHelper
.
Write
(
"企业付款失败 账单BillId:"
+
BillId
);
...
...
@@ -244,7 +244,7 @@ namespace Mall.WebApi.Controllers.Finance
}
else
{
string
msg
=
userModule
.
SetRecommendOrdersBillRemit
(
BillId
,
TenantId
,
MallBaseId
,
0
);
string
msg
=
userModule
.
SetRecommendOrdersBillRemit
(
BillId
,
TenantId
,
MallBaseId
,
0
,,
"单据审核通过,已自动打款"
);
if
(
msg
==
""
)
{
return
ApiResult
.
Success
();
...
...
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