Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
Kivii.Biz.Finances.V2.0
Project
Overview
Details
Activity
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
陶然
Kivii.Biz.Finances.V2.0
Commits
900dc4eb
Commit
900dc4eb
authored
Jun 09, 2022
by
陶然
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
6dbad5c0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
PayExtension.cs
Src/Extensions/PayExtension.cs
+2
-2
RestfulPay.cs
Src/Transforms/RestfulPay.cs
+3
-1
RestfulPayment.Account.cs
Src/Transforms/RestfulPayment.Account.cs
+4
-0
No files found.
Src/Extensions/PayExtension.cs
View file @
900dc4eb
...
...
@@ -88,7 +88,7 @@ namespace Kivii.Finances
var
currentAmount
=
(
amount
<=
(
settlement
.
Amount
-
settlement
.
AmountPayment
)
?
amount
:
(
settlement
.
Amount
-
settlement
.
AmountPayment
));
var
pay
=
new
Pay
();
pay
.
BizId
=
settlement
.
SerialNumber
;
pay
.
BizId
=
settlement
.
BizId
;
pay
.
BizKvid
=
settlement
.
Kvid
;
pay
.
BizType
=
typeof
(
Settlement
).
FullName
;
pay
.
OwnerKvid
=
KiviiContext
.
CurrentMember
.
DepartmentKvid
;
...
...
@@ -202,7 +202,7 @@ namespace Kivii.Finances
var
currentAmount
=
amount
<=
(
settlement
.
Amount
-
settlement
.
AmountPayment
)
?
amount
:
(
settlement
.
Amount
-
settlement
.
AmountPayment
);
var
pay
=
new
Pay
();
pay
.
BizId
=
settlement
.
SerialNumber
;
pay
.
BizId
=
settlement
.
BizId
;
pay
.
BizKvid
=
settlement
.
Kvid
;
pay
.
BizType
=
typeof
(
Settlement
).
FullName
;
pay
.
OwnerKvid
=
KiviiContext
.
CurrentMember
.
DepartmentKvid
;
...
...
Src/Transforms/RestfulPay.cs
View file @
900dc4eb
...
...
@@ -652,6 +652,8 @@ namespace Kivii.Finances.Transforms
#
endregion
public
Guid
AccountKvid
{
get
;
set
;
}
public
override
object
OnExecution
(
IRequest
req
,
IResponse
res
)
{
var
conn
=
KiviiContext
.
GetOpenedDbConnection
<
Pay
>();
...
...
@@ -661,9 +663,9 @@ namespace Kivii.Finances.Transforms
var
request
=
new
RestfulQuery
<
Pay
>();
request
=
request
.
PopulateWith
(
this
);
var
sqlExpress
=
autoQuery
.
CreateQuery
(
Request
,
conn
,
request
,
dynamicParams
);
if
(
AccountKvid
!=
Guid
.
Empty
)
sqlExpress
.
Where
(
o
=>
(
o
.
ToType
==
PayType
.
Account
&&
o
.
ToKvid
==
AccountKvid
)
||
(
o
.
FromType
==
PayType
.
Account
&&
o
.
FromKvid
==
AccountKvid
));
var
rtns
=
autoQuery
.
Execute
(
Request
,
conn
,
request
,
sqlExpress
);
return
rtns
;
}
}
}
Src/Transforms/RestfulPayment.Account.cs
View file @
900dc4eb
...
...
@@ -91,6 +91,10 @@ namespace Kivii.Finances.Transforms
accountDetails
.
ForEach
(
o
=>
o
.
Insert
(
conn
));
payment
.
RecalculateAmountUsed
(
conn
);
//重新计算AmountUsed!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//if (parentPayment != null) conn.UpdateOnly(parentPayment);
foreach
(
var
item
in
pays
)
{
conn
.
Insert
(
item
);
}
trans
.
Commit
();
}
catch
(
Exception
ex
)
...
...
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