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
0002770c
Commit
0002770c
authored
Jan 07, 2025
by
Neo Turing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
1c5e53d9
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
7 deletions
+23
-7
InvoiceApplyExtension.cs
Src/Extensions/InvoiceApplyExtension.cs
+5
-0
PaymentExtension.cs
Src/Extensions/PaymentExtension.cs
+9
-0
AssemblyInfo.cs
Src/Properties/AssemblyInfo.cs
+2
-2
RestfulPayment.cs
Src/Transforms/RestfulPayment.cs
+7
-5
No files found.
Src/Extensions/InvoiceApplyExtension.cs
View file @
0002770c
...
@@ -106,6 +106,11 @@ namespace Kivii.Finances
...
@@ -106,6 +106,11 @@ namespace Kivii.Finances
{
{
if
(
payment
.
InvoiceTime
.
Value
>
payment
.
OperateTime
)
payment
.
AuditTime
=
payment
.
InvoiceTime
;
if
(
payment
.
InvoiceTime
.
Value
>
payment
.
OperateTime
)
payment
.
AuditTime
=
payment
.
InvoiceTime
;
else
payment
.
AuditTime
=
payment
.
OperateTime
;
else
payment
.
AuditTime
=
payment
.
OperateTime
;
if
(
payment
.
AuditTime
!=
null
)
{
payment
.
AuditorName
=
payment
.
AuditTime
.
Value
.
Year
.
ToString
();
payment
.
AddOnlyProperties
(
o
=>
o
.
AuditorName
);
}
payment
.
AddOnlyProperties
(
o
=>
o
.
AuditTime
);
payment
.
AddOnlyProperties
(
o
=>
o
.
AuditTime
);
}
}
...
...
Src/Extensions/PaymentExtension.cs
View file @
0002770c
...
@@ -346,6 +346,11 @@ namespace Kivii.Finances
...
@@ -346,6 +346,11 @@ namespace Kivii.Finances
{
{
if
(
payment
.
InvoiceTime
.
Value
>
payment
.
OperateTime
)
payment
.
AuditTime
=
payment
.
InvoiceTime
;
if
(
payment
.
InvoiceTime
.
Value
>
payment
.
OperateTime
)
payment
.
AuditTime
=
payment
.
InvoiceTime
;
else
payment
.
AuditTime
=
payment
.
OperateTime
;
else
payment
.
AuditTime
=
payment
.
OperateTime
;
if
(
payment
.
AuditTime
!=
null
)
{
payment
.
AuditorName
=
payment
.
AuditTime
.
Value
.
Year
.
ToString
();
payment
.
AddOnlyProperties
(
o
=>
o
.
AuditorName
);
}
payment
.
AddOnlyProperties
(
o
=>
o
.
AuditTime
);
payment
.
AddOnlyProperties
(
o
=>
o
.
AuditTime
);
}
}
}
}
...
@@ -746,6 +751,10 @@ namespace Kivii.Finances
...
@@ -746,6 +751,10 @@ namespace Kivii.Finances
{
{
if
(
splitPayment
.
InvoiceTime
.
Value
>
splitPayment
.
OperateTime
)
splitPayment
.
AuditTime
=
payment
.
InvoiceTime
;
if
(
splitPayment
.
InvoiceTime
.
Value
>
splitPayment
.
OperateTime
)
splitPayment
.
AuditTime
=
payment
.
InvoiceTime
;
else
splitPayment
.
AuditTime
=
payment
.
OperateTime
;
else
splitPayment
.
AuditTime
=
payment
.
OperateTime
;
if
(
splitPayment
.
AuditTime
!=
null
)
{
splitPayment
.
AuditorName
=
splitPayment
.
AuditTime
.
Value
.
Year
.
ToString
();
}
}
}
}
}
...
...
Src/Properties/AssemblyInfo.cs
View file @
0002770c
...
@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
...
@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.202
4.52
70")]
[assembly: AssemblyVersion("5.4.202
5.10
70")]
[assembly: AssemblyFileVersion("5.4.202
4.52
70")]
[assembly: AssemblyFileVersion("5.4.202
5.10
70")]
Src/Transforms/RestfulPayment.cs
View file @
0002770c
...
@@ -18,9 +18,7 @@ namespace Kivii.Finances.Transforms
...
@@ -18,9 +18,7 @@ namespace Kivii.Finances.Transforms
{
{
if
(
Item
.
OnlyPropertiesIsExist
(
o
=>
o
.
AuditTime
))
if
(
Item
.
OnlyPropertiesIsExist
(
o
=>
o
.
AuditTime
))
{
{
if
(
Item
.
Metadata
.
IsNullOrEmpty
())
if
(
Item
.
Metadata
.
IsNullOrEmpty
())
Item
.
Metadata
=
new
Dictionary
<
string
,
string
>();
{
Item
.
Metadata
=
new
Dictionary
<
string
,
string
>();
if
(
Item
.
AuditTime
!=
null
)
if
(
Item
.
AuditTime
!=
null
)
{
{
Item
.
Metadata
[
"ManualAuditTime"
]
=
true
.
ToString
();
Item
.
Metadata
[
"ManualAuditTime"
]
=
true
.
ToString
();
...
@@ -29,8 +27,12 @@ namespace Kivii.Finances.Transforms
...
@@ -29,8 +27,12 @@ namespace Kivii.Finances.Transforms
{
{
Item
.
Metadata
[
"ManualAuditTime"
]
=
string
.
Empty
;
Item
.
Metadata
[
"ManualAuditTime"
]
=
string
.
Empty
;
}
}
Item
.
AddOnlyProperties
(
o
=>
o
.
Metadata
);
if
(
Item
.
AuditTime
!=
null
)
{
Item
.
AuditorName
=
Item
.
AuditTime
.
Value
.
Year
.
ToString
();
Item
.
AddOnlyProperties
(
o
=>
o
.
AuditorName
);
}
}
Item
.
AddOnlyProperties
(
o
=>
o
.
Metadata
);
}
}
return
base
.
OnPreRestfulUpdate
(
req
,
res
,
dbConnection
,
rtns
);
return
base
.
OnPreRestfulUpdate
(
req
,
res
,
dbConnection
,
rtns
);
}
}
...
@@ -275,7 +277,7 @@ namespace Kivii.Finances.Transforms
...
@@ -275,7 +277,7 @@ namespace Kivii.Finances.Transforms
var
request
=
new
RestfulQuery
<
Payment
>();
var
request
=
new
RestfulQuery
<
Payment
>();
request
=
request
.
PopulateWith
(
this
);
request
=
request
.
PopulateWith
(
this
);
var
sqlExpress
=
autoQuery
.
CreateQuery
(
Request
,
conn
,
request
,
dynamicParams
);
var
sqlExpress
=
autoQuery
.
CreateQuery
(
Request
,
conn
,
request
,
dynamicParams
);
sqlExpress
.
Where
(
o
=>
o
.
OffsetKvid
!=
Guid
.
Empty
&&
o
.
Amount
>=
0
&&
Sql
.
In
(
o
.
Type
,
PaymentType
.
AliPay
,
PaymentType
.
WeChat
,
PaymentType
.
Bank
,
PaymentType
.
Cash
,
PaymentType
.
Pos
));
sqlExpress
.
Where
(
o
=>
o
.
OffsetKvid
!=
Guid
.
Empty
&&
Sql
.
In
(
o
.
Type
,
PaymentType
.
AliPay
,
PaymentType
.
WeChat
,
PaymentType
.
Bank
,
PaymentType
.
Cash
,
PaymentType
.
Pos
));
var
rtns
=
autoQuery
.
Execute
(
Request
,
conn
,
request
,
sqlExpress
);
var
rtns
=
autoQuery
.
Execute
(
Request
,
conn
,
request
,
sqlExpress
);
return
rtns
;
return
rtns
;
}
}
...
...
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