Commit 0b11c3b2 by guanzhenshan

增加获取头程费配置规则增加排序功能

parent be78629b
...@@ -3346,7 +3346,7 @@ namespace Bailun.DC.Services ...@@ -3346,7 +3346,7 @@ namespace Bailun.DC.Services
public List<dc_base_finance_ebay> ListEbayFee(BtTableParameter parameter, int? companyid, DateTime? start, DateTime? end, ref int total, string[] feetype, string[] description, string orderno, string account,string itemid) public List<dc_base_finance_ebay> ListEbayFee(BtTableParameter parameter, int? companyid, DateTime? start, DateTime? end, ref int total, string[] feetype, string[] description, string orderno, string account,string itemid)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
var sql = "select t1.id,t1.account_entry_type,t1.description,t1.bj_date as gmt_date,t1.gross_amount,t1.item_id,t1.net_amount,t1.vat_percent,t1.order_line_id,t1.currency,t1.exchange_rate,(t1.exchange_rate*t1.gross_amount) gross_amount_rmb,t2.account_name from dc_base_finance_ebay t1 "; var sql = "select t1.id,t1.account_entry_type,t1.description,t1.bj_date as gmt_date,t1.gross_amount,t1.item_id,t1.net_amount,t1.vat_percent,t1.order_line_id,t1.currency,t1.exchange_rate,(t1.exchange_rate*t1.gross_amount) gross_amount_rmb,t2.account_name,t1.memo,t1.ref_number from dc_base_finance_ebay t1 ";
sql += " left join dc_base_company_account t2 on t1.company_id=t2.company_id and t1.account_id=t2.account_id "; sql += " left join dc_base_company_account t2 on t1.company_id=t2.company_id and t1.account_id=t2.account_id ";
sql += " where 1=1 "; sql += " where 1=1 ";
...@@ -7379,7 +7379,6 @@ namespace Bailun.DC.Services ...@@ -7379,7 +7379,6 @@ namespace Bailun.DC.Services
#endregion #endregion
#region 头程费 #region 头程费
/// <summary> /// <summary>
...@@ -7486,7 +7485,7 @@ namespace Bailun.DC.Services ...@@ -7486,7 +7485,7 @@ namespace Bailun.DC.Services
} }
else else
{ {
sql += " order by operation_time desc"; sql += " order by operation_time desc,id desc";
} }
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
...@@ -7626,8 +7625,6 @@ namespace Bailun.DC.Services ...@@ -7626,8 +7625,6 @@ namespace Bailun.DC.Services
#endregion #endregion
#region API Service #region API Service
/// <summary> /// <summary>
......
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