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
e6103e56
Commit
e6103e56
authored
Feb 22, 2024
by
陶然
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加结算作废日志
parent
680e0dbf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
2 deletions
+34
-2
RestfulSettlement.Offset.cs
Src/Transforms/RestfulSettlement.Offset.cs
+16
-1
RestfulSettlement.cs
Src/Transforms/RestfulSettlement.cs
+18
-1
No files found.
Src/Transforms/RestfulSettlement.Offset.cs
View file @
e6103e56
...
@@ -63,6 +63,7 @@ namespace Kivii.Finances.Transforms
...
@@ -63,6 +63,7 @@ namespace Kivii.Finances.Transforms
if
(!
payFromAccounts
.
IsNullOrEmpty
())
allFromAccounts
=
connF
.
Select
<
Account
>(
o
=>
Sql
.
In
(
o
.
Kvid
,
payFromAccounts
.
ConvertAll
(
p
=>
p
.
FromKvid
).
Distinct
()));
if
(!
payFromAccounts
.
IsNullOrEmpty
())
allFromAccounts
=
connF
.
Select
<
Account
>(
o
=>
Sql
.
In
(
o
.
Kvid
,
payFromAccounts
.
ConvertAll
(
p
=>
p
.
FromKvid
).
Distinct
()));
#
endregion
#
endregion
}
}
var
logs
=
new
List
<
EntityLog
<
Settlement
>>();
foreach
(
var
settlement
in
settlements
)
foreach
(
var
settlement
in
settlements
)
{
{
if
(!
allPays
.
IsNullOrEmpty
())
if
(!
allPays
.
IsNullOrEmpty
())
...
@@ -162,13 +163,23 @@ namespace Kivii.Finances.Transforms
...
@@ -162,13 +163,23 @@ namespace Kivii.Finances.Transforms
{
{
var
offset
=
record
.
Offset
(
"结算作废"
);
var
offset
=
record
.
Offset
(
"结算作废"
);
policyRecordOffsetPreInsert
.
Add
(
offset
);
policyRecordOffsetPreInsert
.
Add
(
offset
);
policyRecordOffsetPreUpdate
.
Add
(
record
);
policyRecordOffsetPreUpdate
.
Add
(
record
);
}
}
}
}
}
}
var
settlementOffset
=
settlement
.
Offset
(
"结算项作废"
);
var
settlementOffset
=
settlement
.
Offset
(
"结算项作废"
);
settlementsOffsetPreUpdate
.
Add
(
settlement
);
settlementsOffsetPreUpdate
.
Add
(
settlement
);
settlementsOffsetPreInsert
.
Add
(
settlementOffset
);
settlementsOffsetPreInsert
.
Add
(
settlementOffset
);
var
log
=
new
EntityLog
<
Settlement
>();
log
.
OwnerKvid
=
settlement
.
Kvid
;
log
.
BizId
=
settlement
.
BizId
;
log
.
BizKvid
=
settlement
.
Kvid
;
log
.
Type
=
"结算作废或删除"
;
log
.
BizType
=
typeof
(
Settlement
).
FullName
;
log
.
Title
=
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
log
.
Summary
=
"结算作废"
;
log
.
Remark
=
$"
{
settlement
.
BizId
}
结算已经作废."
;
logs
.
Add
(
log
);
}
}
if
(!
paymentsPreUpdate
.
IsNullOrEmpty
())
if
(!
paymentsPreUpdate
.
IsNullOrEmpty
())
{
{
...
@@ -283,6 +294,10 @@ namespace Kivii.Finances.Transforms
...
@@ -283,6 +294,10 @@ namespace Kivii.Finances.Transforms
updateBills
=
updateBills
.
Where
(
o
=>
Sql
.
In
(
o
.
Kvid
,
billKvids
));
updateBills
=
updateBills
.
Where
(
o
=>
Sql
.
In
(
o
.
Kvid
,
billKvids
));
connE
.
UpdateOnly
<
Bill
>(
new
Bill
{
Summary
=
"当前账单结算项目可能被删除或作废,请查看详情或重新制作账单!"
},
updateBills
);
connE
.
UpdateOnly
<
Bill
>(
new
Bill
{
Summary
=
"当前账单结算项目可能被删除或作废,请查看详情或重新制作账单!"
},
updateBills
);
}
}
foreach
(
var
item
in
logs
)
{
connF
.
Insert
(
item
);
}
tranE
?.
Commit
();
tranE
?.
Commit
();
tranF
?.
Commit
();
tranF
?.
Commit
();
}
}
...
...
Src/Transforms/RestfulSettlement.cs
View file @
e6103e56
...
@@ -480,7 +480,21 @@ namespace Kivii.Finances.Transforms
...
@@ -480,7 +480,21 @@ namespace Kivii.Finances.Transforms
var
rtns
=
new
RestfulDeleteResponse
<
Settlement
>();
var
rtns
=
new
RestfulDeleteResponse
<
Settlement
>();
rtns
.
Results
=
new
List
<
Guid
>();
rtns
.
Results
=
new
List
<
Guid
>();
var
logs
=
new
List
<
EntityLog
<
Settlement
>>();
foreach
(
var
item
in
settlements
)
{
var
log
=
new
EntityLog
<
Settlement
>();
log
.
OwnerKvid
=
item
.
Kvid
;
log
.
BizId
=
item
.
BizId
;
log
.
BizKvid
=
item
.
Kvid
;
log
.
Type
=
"结算作废或删除"
;
log
.
BizType
=
typeof
(
Settlement
).
FullName
;
log
.
Title
=
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
log
.
Summary
=
"结算删除"
;
log
.
Remark
=
$"
{
item
.
BizId
}
结算已经删除."
;
logs
.
Add
(
log
);
}
#
region
合并数据库连接
,
并启用事务
#
region
合并数据库连接
,
并启用事务
IDbTransaction
tranE
=
null
,
tranF
=
null
;
IDbTransaction
tranE
=
null
,
tranF
=
null
;
//if (connE.ConnectionString == connR.ConnectionString)//现在的连接会自动取缓存
//if (connE.ConnectionString == connR.ConnectionString)//现在的连接会自动取缓存
...
@@ -579,7 +593,10 @@ namespace Kivii.Finances.Transforms
...
@@ -579,7 +593,10 @@ namespace Kivii.Finances.Transforms
connE
.
UpdateOnly
<
Bill
>(
new
Bill
{
Summary
=
"当前账单结算项目可能被删除或作废,请查看详情或重新制作账单!"
},
updateBills
);
connE
.
UpdateOnly
<
Bill
>(
new
Bill
{
Summary
=
"当前账单结算项目可能被删除或作废,请查看详情或重新制作账单!"
},
updateBills
);
}
}
#
endregion
#
endregion
foreach
(
var
item
in
logs
)
{
connF
.
Insert
(
item
);
}
rtns
.
Results
.
AddRange
(
Kvids
);
rtns
.
Results
.
AddRange
(
Kvids
);
tranF
?.
Commit
();
tranF
?.
Commit
();
...
...
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