Commit 9b2a7f7c by lizefeng

fix

parent 6116e207
...@@ -326,7 +326,7 @@ namespace AutoTurnOver.DB ...@@ -326,7 +326,7 @@ namespace AutoTurnOver.DB
}, commandTimeout: 0); }, 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; ana.estimated_freight = ana.freight_unit_price * ana.stock;
...@@ -448,8 +448,12 @@ namespace AutoTurnOver.DB ...@@ -448,8 +448,12 @@ namespace AutoTurnOver.DB
/// <summary> /// <summary>
/// 计算单位运费 /// 计算单位运费
/// </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 _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 ...@@ -521,7 +525,7 @@ where t1.dataid in @dataIds", new
orders.AddRange(groupOrders); orders.AddRange(groupOrders);
foreach (var itemOrder in orders) foreach (var itemOrder in orders)
{ {
_connection.Insert(itemOrder); //_connection.Insert(itemOrder);
} }
......
...@@ -48,7 +48,7 @@ namespace ResetOutofstock ...@@ -48,7 +48,7 @@ namespace ResetOutofstock
// report_invest_return_dao.SynchBtmAdFees(); // report_invest_return_dao.SynchBtmAdFees();
//report_invest_return_dao.ShareAdFee(); //report_invest_return_dao.ShareAdFee();
//report_invest_return_dao.SynchBtmOrderRefund(); //report_invest_return_dao.SynchBtmOrderRefund();
//report_invest_return_dao.CalculationStockScore("962568801"); //report_invest_return_dao.CalculationStockScore("228441601");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment