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
9b2a7f7c
Commit
9b2a7f7c
authored
Dec 26, 2022
by
lizefeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
6116e207
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
report_invest_return_dao.cs
AutoTurnOver.DB/report_invest_return_dao.cs
+7
-3
Program.cs
ResetOutofstock/Program.cs
+1
-1
No files found.
AutoTurnOver.DB/report_invest_return_dao.cs
View file @
9b2a7f7c
...
...
@@ -326,7 +326,7 @@ namespace AutoTurnOver.DB
},
commandTimeout
:
0
);
//计算单位运费
ana
.
freight_unit_price
=
CalculationFreight
(
ana
.
sku
,
ana
.
warehouse_code
);
ana
.
freight_unit_price
=
CalculationFreight
(
ana
.
sku
,
ana
.
warehouse_code
,
ana
.
warehouse_type
);
//预估运费,库存 * 单位运费
ana
.
estimated_freight
=
ana
.
freight_unit_price
*
ana
.
stock
;
...
...
@@ -448,8 +448,12 @@ namespace AutoTurnOver.DB
/// <summary>
/// 计算单位运费
/// </summary>
public
static
decimal
CalculationFreight
(
string
bailun_sku
,
string
warehouse_code
)
public
static
decimal
CalculationFreight
(
string
bailun_sku
,
string
warehouse_code
,
string
warehouse_type
)
{
if
(
"国内仓"
.
Equals
(
warehouse_type
,
StringComparison
.
InvariantCultureIgnoreCase
))
{
return
0
;
}
// 清理运费计算日志
_connection
.
Execute
(
" delete from dc_base_transfer_freight_new_order where main_bailun_sku=@bailun_sku and warehouse_code=@warehouse_code "
,
new
{
...
...
@@ -521,7 +525,7 @@ where t1.dataid in @dataIds", new
orders
.
AddRange
(
groupOrders
);
foreach
(
var
itemOrder
in
orders
)
{
_connection
.
Insert
(
itemOrder
);
//
_connection.Insert(itemOrder);
}
...
...
ResetOutofstock/Program.cs
View file @
9b2a7f7c
...
...
@@ -48,7 +48,7 @@ namespace ResetOutofstock
// report_invest_return_dao.SynchBtmAdFees();
//report_invest_return_dao.ShareAdFee();
//report_invest_return_dao.SynchBtmOrderRefund();
//report_invest_return_dao.CalculationStockScore("
9625688
01");
//report_invest_return_dao.CalculationStockScore("
2284416
01");
}
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