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
983ae040
Commit
983ae040
authored
Jun 30, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
7dc53d9f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+4
-4
UserModule.cs
Mall.Module.User/UserModule.cs
+2
-2
SupplierController.cs
Mall.WebApi/Controllers/User/SupplierController.cs
+2
-2
No files found.
Mall.Module.Product/OrderModule.cs
View file @
983ae040
...
...
@@ -5029,14 +5029,14 @@ namespace Mall.Module.Product
item
.
IsPublic
=
8
;
//默认原路退款
var
financeObj
=
new
{
CreateBy
=
Config
.
Network
Director
,
CreateBy
=
Config
.
Expend
Director
,
item
.
IsPublic
,
ClientType
=
0
,
ClientID
=
0
,
item
.
CurrencyId
,
WBMoney
=
Money
,
PayDate
=
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
),
Config
.
RB_Branch_
Id
,
RB_Branch_Id
=
Config
.
ExpendBranch
Id
,
TemplateId
=
item
.
WorkFlowId
,
OrderSource
=
16
,
OtherType
=
12
,
...
...
@@ -5975,14 +5975,14 @@ namespace Mall.Module.Product
}
var
financeObj
=
new
{
CreateBy
=
Config
.
Network
Director
,
CreateBy
=
Config
.
Expend
Director
,
item
.
IsPublic
,
ClientType
=
0
,
ClientID
=
0
,
item
.
CurrencyId
,
WBMoney
=
Money
,
PayDate
=
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
),
Config
.
RB_Branch_
Id
,
RB_Branch_Id
=
Config
.
ExpendBranch
Id
,
TemplateId
=
item
.
WorkFlowId
,
OrderSource
=
16
,
OtherType
=
14
,
...
...
Mall.Module.User/UserModule.cs
View file @
983ae040
...
...
@@ -2085,14 +2085,14 @@ namespace Mall.Module.User
item
.
IsPublic
=
5
;
//默认平台虚拟账户
var
financeObj
=
new
{
CreateBy
=
Config
.
Network
Director
,
CreateBy
=
Config
.
Expend
Director
,
item
.
IsPublic
,
ClientType
=
Convert
.
ToInt32
(
new
ConfigurationBuilder
().
Add
(
new
JsonConfigurationSource
{
Path
=
"appsettings.json"
}).
Build
().
GetSection
(
"FinanceSetting"
)[
"RemitTypeId"
]),
ClientID
=
Convert
.
ToInt32
(
new
ConfigurationBuilder
().
Add
(
new
JsonConfigurationSource
{
Path
=
"appsettings.json"
}).
Build
().
GetSection
(
"FinanceSetting"
)[
"RemitAccountId"
]),
item
.
CurrencyId
,
WBMoney
=
Money
,
PayDate
=
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
),
Config
.
RB_Branch_
Id
,
RB_Branch_Id
=
Config
.
ExpendBranch
Id
,
TemplateId
=
item
.
WorkFlowId
,
OrderSource
=
16
,
OtherType
=
11
,
...
...
Mall.WebApi/Controllers/User/SupplierController.cs
View file @
983ae040
...
...
@@ -319,13 +319,13 @@ namespace Mall.WebApi.Controllers.User
});
var
financeObj
=
new
{
CreateBy
=
Config
.
Network
Director
,
CreateBy
=
Config
.
Expend
Director
,
IsPublic
=
demodel
.
IsPublic
,
// supplierModel.ClientBankAccount.AccountType, //financeConfigurineModel.AccountType,
ClientType
=
supplierModel
.
ClientBankAccount
.
Type
,
ClientID
=
supplierModel
.
BankAccountId
,
CurrencyId
=
financeConfigurineModel
.
CurrencyId
,
WBMoney
=
result
.
Sum
(
x
=>
((
x
.
CostMoney
??
0
)
*
(
x
.
Number
??
0
))
+
(
x
.
FreightCostMoney
??
0
)),
RB_Branch_Id
=
Config
.
RB_Branch_
Id
,
RB_Branch_Id
=
Config
.
ExpendBranch
Id
,
PayDate
=
System
.
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
),
TemplateId
=
financeConfigurineModel
.
WorkFlowId
,
OrderSource
=
16
,
...
...
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