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
58a7ec53
Commit
58a7ec53
authored
Aug 19, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
7eff8193
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+5
-1
RB_FinanceRepository.cs
Mall.Repository/Finance/RB_FinanceRepository.cs
+2
-3
OrderController.cs
Mall.WebApi/Controllers/Product/OrderController.cs
+8
-2
No files found.
Mall.Module.Product/OrderModule.cs
View file @
58a7ec53
...
...
@@ -5071,7 +5071,11 @@ namespace Mall.Module.Product
PaidCostMoney
=
0
,
LiveCommission
=
item
.
LiveCommission
,
LiveFinanceIds
=
""
,
LivePeopleNum
=
1
LivePeopleNum
=
1
,
PayMoney
=
0
,
YFMoney
=
0
,
RealMoney
=
0
,
YSMoney
=
0
},
trans
);
item
.
Id
=
detailId
;
if
(
detailId
>
0
&&
SatisfiedGoodsList
.
Any
())
...
...
Mall.Repository/Finance/RB_FinanceRepository.cs
View file @
58a7ec53
...
...
@@ -6,14 +6,13 @@ using System.Collections.Generic;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
using
VT.FW.DB
;
namespace
Mall.Repository.Finance
{
/// <summary>
/// 财务单据仓储
/// </summary>
public
partial
class
RB_FinanceRepository
:
RepositoryBase
<
RB_Finance
>
public
partial
class
RB_FinanceRepository
:
BaseRepository
<
RB_Finance
>
{
/// <summary>
...
...
@@ -69,7 +68,7 @@ namespace Mall.Repository.Finance
}
string
sql
=
$@"
select A.FrID,A.Status,A.Type,E.ECOrderId,E.ECOrderDetailId from RB_Finance A
select A.FrID,A.Status,A.Type,
A.Is_Cashier,
E.ECOrderId,E.ECOrderDetailId from RB_Finance A
inner join RB_ECFinanceId_Relation E on A.FrID = E.FinanceId
where
{
where
}
order by FrID desc
"
;
...
...
Mall.WebApi/Controllers/Product/OrderController.cs
View file @
58a7ec53
...
...
@@ -97,13 +97,19 @@ namespace Mall.WebApi.Controllers.MallBase
y
.
IsBindExpress
,
y
.
FreeShippingRemarks
,
y
.
SmallShopsCostPrice
,
y
.
YSMoney
,
y
.
RealMoney
,
y
.
YFMoney
,
y
.
PayMoney
,
SFinanceList
=
y
.
FinanceList
.
Where
(
z
=>
z
.
Type
==
1
).
Select
(
z
=>
new
{
z
.
FrID
,
z
.
Status
z
.
Status
,
z
.
Is_Cashier
}),
ZFinanceList
=
y
.
FinanceList
.
Where
(
z
=>
z
.
Type
==
2
).
Select
(
z
=>
new
{
z
.
FrID
,
z
.
Status
z
.
Status
,
z
.
Is_Cashier
})
}),
x
.
Consignee
,
...
...
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