Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
data-center-auto
Overview
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
bltdc
data-center-auto
Commits
f1bb3f7c
Commit
f1bb3f7c
authored
Apr 24, 2023
by
lizefeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
0c04ec33
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
dc_profit_business_amazon_storage_fee.cs
AutoTurnOver.Models/dc_profit_business_amazon_storage_fee.cs
+1
-0
AmazonDataSynchroService.cs
AutoTurnOver.Services/AmazonDataSynchroService.cs
+6
-7
No files found.
AutoTurnOver.Models/dc_profit_business_amazon_storage_fee.cs
View file @
f1bb3f7c
...
...
@@ -18,6 +18,7 @@ namespace AutoTurnOver.Models
public
string
asin
{
get
;
set
;
}
public
string
site
{
get
;
set
;
}
public
decimal
fee
{
get
;
set
;
}
public
decimal
?
exchange_cny
{
get
;
set
;
}
public
string
fee_type
{
get
;
set
;
}
public
string
currency
{
get
;
set
;
}
public
string
fulfillment_center
{
get
;
set
;
}
...
...
AutoTurnOver.Services/AmazonDataSynchroService.cs
View file @
f1bb3f7c
...
...
@@ -873,6 +873,8 @@ namespace AutoTurnOver.Services
// 多份报表都出现同一份数据。已报表实际较晚的为准
if
(
oldData
.
report_end_date
<=
storageFee
.
report_end_date
)
{
storageFee
.
_project
=
oldData
.
_project
;
storageFee
.
exchange_cny
=
oldData
.
exchange_cny
;
MyMySqlConnection
.
_connection
.
Update
(
storageFee
);
}
...
...
@@ -979,7 +981,7 @@ namespace AutoTurnOver.Services
report_end_date
=
reportData
.
DataEndTime
??
new
DateTime
(
1991
,
1
,
1
)
};
storageFee
.
fee
=
row
.
DataRowToNumber
(
"estimated-ltsf-next-charge"
)
??
0
;
storageFee
.
_date
=
reportData
.
DataStartTime
.
Value
.
AddHours
(-
8
).
ToDayHome
();
storageFee
.
_date
=
reportData
.
DataStartTime
.
Value
.
ToDayHome
();
//storageFee.site = row.DataRowToString("country_code");
if
(
"GB"
.
Equals
(
storageFee
.
site
,
StringComparison
.
CurrentCultureIgnoreCase
))
{
...
...
@@ -991,12 +993,9 @@ namespace AutoTurnOver.Services
var
oldData
=
MyMySqlConnection
.
_connection
.
QueryFirstOrDefault
<
dc_profit_business_amazon_storage_fee
>(
" select * from dc_profit_business_amazon_storage_fee where _unique_id=@unique_id "
,
new
{
unique_id
=
storageFee
.
_unique_id
});
if
(
oldData
!=
null
)
{
// 多份报表都出现同一份数据。已报表实际较晚的为准
if
(
oldData
.
report_end_date
<=
storageFee
.
report_end_date
)
{
MyMySqlConnection
.
_connection
.
Update
(
storageFee
);
}
storageFee
.
_project
=
oldData
.
_project
;
storageFee
.
exchange_cny
=
oldData
.
exchange_cny
;
MyMySqlConnection
.
_connection
.
Update
(
storageFee
);
}
else
{
...
...
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