Commit e019c3d0 by guanzhenshan

修改退款数据,改为从CRM拿

parent 803a0196
......@@ -95,6 +95,11 @@ namespace Bailun.DC.Models
public decimal amount_refund_rmb { get; set; }
/// <summary>
/// 美元金额
/// </summary>
public decimal amount_refund_usd { get; set; }
/// <summary>
/// 发货状态
/// </summary>
public string bailun_shipping_status { get; set; }
......
......@@ -3836,67 +3836,120 @@ namespace Bailun.DC.Services
/// <param name="orderno">平台订单号</param>
/// <param name="total">符合条件的记录数</param>
/// <returns></returns>
public List<dc_base_oms_order> ListOrderReturn(BtTableParameter parameter, DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno, ref int total)
public List<dc_base_crm_refund> ListOrderReturn(BtTableParameter parameter, DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno, ref int total)
{
var sqlparam = new DynamicParameters();
var sqlselect = "select t1.platform_type,t1.website,t1.origin_order_id,t1.seller_account,t1.amount_refund,(t1.seller_order_exchange_rate*t1.amount_refund) as refundrmb,t1.refund_time,t1.refund_reference_id from dc_base_oms_order t1 ";
var sql = " where t1.amount_refund>0 ";
//if (paytimestart.HasValue || paytimeend.HasValue)
#region 订单表版本
//var sqlselect = "select t1.platform_type,t1.website,t1.origin_order_id,t1.seller_account,t1.amount_refund,(t1.seller_order_exchange_rate*t1.amount_refund) as refundrmb,t1.refund_time,t1.refund_reference_id from dc_base_oms_order t1 ";
//var sql = " where t1.amount_refund>0 ";
//if (companyid.HasValue && companyid.Value > 0)
//{
// sql += " and t1.bailun_order_status!='Canceled' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
// sql += " and t1.company_id=@companyid";
// sqlparam.Add("companyid", companyid.Value);
//}
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and t1.company_id=@companyid";
sqlparam.Add("companyid", companyid.Value);
}
//if (start.HasValue)
//{
// sql += " and t1.refund_time>=@start";
// sqlparam.Add("start", start.Value);
//}
//if (end.HasValue)
//{
// sql += " and t1.refund_time<@end";
// sqlparam.Add("end", end.Value.AddDays(1));
//}
//if (!string.IsNullOrWhiteSpace(platform))
//{
// sql += " and t1.platform_type=@platform";
// sqlparam.Add("platform", platform);
//}
//if (!string.IsNullOrWhiteSpace(website))
//{
// sql += " and t1.website=@website";
// sqlparam.Add("website", website);
//}
//if (!string.IsNullOrWhiteSpace(orderno))
//{
// sql += " and t1.origin_order_id=@orderno";
// sqlparam.Add("orderno", orderno);
//}
//if (paytimestart.HasValue)
//{
// sql += " and t1.paid_time>=@paytimestart";
// sqlparam.Add("paytimestart", paytimestart.Value);
//}
//if (paytimeend.HasValue)
//{
// sql += " and t1.paid_time<@paytimeend";
// sqlparam.Add("paytimeend", paytimeend.Value.AddDays(1));
//}
//var sqlcount = "select count(id) from dc_base_oms_order t1 " + sql;
//if (!string.IsNullOrWhiteSpace(parameter.sort))
//{
// sql += " order by t1." + parameter.sort + " " + parameter.order;
//}
//else {
// sql += " order by t1.refund_time desc ";
//}
//using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
//{
// if (cn.State == System.Data.ConnectionState.Closed)
// {
// cn.Open();
// }
// var obj = cn.Page<dc_base_oms_order>(parameter.pageIndex, parameter.limit, sqlselect + sql, ref total, sqlparam, sqlcount, 2 * 60);
// return obj.AsList();
//}
#endregion
var sql = "select platform_type,bailun_account,website,origin_order_id,amount_refund_rmb,amount_refund_usd,refund_time from dc_base_crm_refund where 1=1 ";
if (start.HasValue)
{
sql += " and t1.refund_time>=@start";
sql += " and refund_time>=@start";
sqlparam.Add("start", start.Value);
}
if (end.HasValue)
{
sql += " and t1.refund_time<@end";
sql += " and refund_time<@end";
sqlparam.Add("end", end.Value.AddDays(1));
}
if (companyid.HasValue && companyid.Value != 0)
{
sql += " and company_id="+companyid.Value;
}
if (!string.IsNullOrWhiteSpace(platform))
{
sql += " and t1.platform_type=@platform";
sqlparam.Add("platform", platform);
sql += " and platform_type=@platform_type";
sqlparam.Add("platform_type", platform);
}
if (!string.IsNullOrWhiteSpace(website))
if (!string.IsNullOrEmpty(website))
{
sql += " and t1.website=@website";
sql += " and website=@website";
sqlparam.Add("website", website);
}
if (!string.IsNullOrWhiteSpace(orderno))
if (!string.IsNullOrEmpty(orderno))
{
sql += " and t1.origin_order_id=@orderno";
sql += " and origin_order_id=@orderno";
sqlparam.Add("orderno", orderno);
}
if (paytimestart.HasValue)
{
sql += " and t1.paid_time>=@paytimestart";
sqlparam.Add("paytimestart", paytimestart.Value);
}
if (paytimeend.HasValue)
{
sql += " and t1.paid_time<@paytimeend";
sqlparam.Add("paytimeend", paytimeend.Value.AddDays(1));
}
var sqlcount = "select count(id) from dc_base_oms_order t1 " + sql;
if (!string.IsNullOrWhiteSpace(parameter.sort))
if (!string.IsNullOrEmpty(parameter.sort))
{
sql += " order by t1." + parameter.sort + " " + parameter.order;
}
else {
sql += " order by t1.refund_time desc ";
sql += " order by refund_time desc";
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
......@@ -3906,7 +3959,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Page<dc_base_oms_order>(parameter.pageIndex, parameter.limit, sqlselect + sql, ref total, sqlparam, sqlcount, 2 * 60);
var obj = cn.Page<dc_base_crm_refund>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam, "", 2 * 60);
return obj.AsList();
}
......@@ -3925,59 +3978,106 @@ namespace Bailun.DC.Services
/// <param name="orderno">平台订单号</param>
/// <param name="total">符合条件的记录数</param>
/// <returns></returns>
public List<dc_base_oms_order> ListOrderReturn(DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno)
public List<dc_base_crm_refund> ListOrderReturn(DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno)
{
var sqlparam = new DynamicParameters();
var sql = "select t1.platform_type,t1.website,t1.origin_order_id,t1.seller_account,t1.amount_refund,(t1.seller_order_exchange_rate*t1.amount_refund) as refundrmb,t1.refund_time,t1.refund_reference_id from dc_base_oms_order t1 ";
//sql += " where ((t1.platform_type!='FBA' and t1.bailun_order_status!='CantHandle') or t1.platform_type='FBA') and t1.amount_refund>0 ";
sql += " where t1.amount_refund>0 ";
//if (paytimestart.HasValue || paytimeend.HasValue)
#region 订单表版本
//var sql = "select t1.platform_type,t1.website,t1.origin_order_id,t1.seller_account,t1.amount_refund,(t1.seller_order_exchange_rate*t1.amount_refund) as refundrmb,t1.refund_time,t1.refund_reference_id from dc_base_oms_order t1 ";
//sql += " where t1.amount_refund>0 ";
//if (companyid.HasValue && companyid.Value > 0)
//{
// sql += " and t1.bailun_order_status!='Canceled' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
// sql += " and t1.company_id=@companyid";
// sqlparam.Add("companyid", companyid.Value);
//}
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and t1.company_id=@companyid";
sqlparam.Add("companyid", companyid.Value);
}
//if (start.HasValue)
//{
// sql += " and t1.refund_time>=@start";
// sqlparam.Add("start", start.Value);
//}
//if (end.HasValue)
//{
// sql += " and t1.refund_time<@end";
// sqlparam.Add("end", end.Value.AddDays(1));
//}
//if (!string.IsNullOrWhiteSpace(platform))
//{
// sql += " and t1.platform_type=@platform";
// sqlparam.Add("platform", platform);
//}
//if (!string.IsNullOrWhiteSpace(website))
//{
// sql += " and t1.website=@website";
// sqlparam.Add("website", website);
//}
//if (!string.IsNullOrWhiteSpace(orderno))
//{
// sql += " and t1.origin_order_id=@orderno";
// sqlparam.Add("orderno", orderno);
//}
//if (paytimestart.HasValue)
//{
// sql += " and t1.paid_time>=@paytimestart";
// sqlparam.Add("paytimestart", paytimestart.Value);
//}
//if (paytimeend.HasValue)
//{
// sql += " and t1.paid_time<@paytimeend";
// sqlparam.Add("paytimeend", paytimeend.Value.AddDays(1));
//}
//using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
//{
// if (cn.State == System.Data.ConnectionState.Closed)
// {
// cn.Open();
// }
// var obj = cn.Query<dc_base_oms_order>(sql, sqlparam, null, true, 3 * 60);
// return obj.AsList();
//}
#endregion
var sql = "select platform_type,bailun_account,website,origin_order_id,amount_refund_rmb,amount_refund_usd,refund_time from dc_base_crm_refund where 1=1 ";
if (start.HasValue)
{
sql += " and t1.refund_time>=@start";
sql += " and refund_time>=@start";
sqlparam.Add("start", start.Value);
}
if (end.HasValue)
{
sql += " and t1.refund_time<@end";
sql += " and refund_time<@end";
sqlparam.Add("end", end.Value.AddDays(1));
}
if (companyid.HasValue && companyid.Value != 0)
{
sql += " and company_id=" + companyid.Value;
}
if (!string.IsNullOrWhiteSpace(platform))
{
sql += " and t1.platform_type=@platform";
sqlparam.Add("platform", platform);
sql += " and platform_type=@platform_type";
sqlparam.Add("platform_type", platform);
}
if (!string.IsNullOrWhiteSpace(website))
if (!string.IsNullOrEmpty(website))
{
sql += " and t1.website=@website";
sql += " and website=@website";
sqlparam.Add("website", website);
}
if (!string.IsNullOrWhiteSpace(orderno))
if (!string.IsNullOrEmpty(orderno))
{
sql += " and t1.origin_order_id=@orderno";
sql += " and origin_order_id=@orderno";
sqlparam.Add("orderno", orderno);
}
if (paytimestart.HasValue)
{
sql += " and t1.paid_time>=@paytimestart";
sqlparam.Add("paytimestart", paytimestart.Value);
}
if (paytimeend.HasValue)
{
sql += " and t1.paid_time<@paytimeend";
sqlparam.Add("paytimeend", paytimeend.Value.AddDays(1));
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
......@@ -3986,10 +4086,13 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Query<dc_base_oms_order>(sql, sqlparam, null, true, 3 * 60);
var obj = cn.Query<dc_base_crm_refund>(sql,sqlparam,null,true,2*60);
return obj.AsList();
}
}
......@@ -4003,70 +4106,177 @@ namespace Bailun.DC.Services
/// <param name="website"></param>
/// <param name="orderno"></param>
/// <returns></returns>
public dc_base_oms_order ListOrderReturnCount(DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno)
public dc_base_crm_refund ListOrderReturnCount(DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno)
{
var sqlparam = new DynamicParameters();
var sql = "select sum(t1.amount_refund) as amount_refund,sum(t1.seller_order_exchange_rate*t1.amount_refund) as refundrmb from dc_base_oms_order t1 ";
sql += " where t1.amount_refund>0 ";
//if (paytimestart.HasValue || paytimeend.HasValue)
#region 订单表版本
//var sql = "select sum(t1.amount_refund) as amount_refund,sum(t1.seller_order_exchange_rate*t1.amount_refund) as refundrmb from dc_base_oms_order t1 ";
//sql += " where t1.amount_refund>0 ";
//if (companyid.HasValue && companyid.Value > 0)
//{
// sql += " and t1.bailun_order_status!='Canceled' and t1.has_scalp=0 and t1.has_innersale=0 and t1.bailun_interception_status in ('None','Failed') ";
// sql += " and t1.company_id=@companyid";
// sqlparam.Add("companyid", companyid.Value);
//}
if (companyid.HasValue && companyid.Value > 0)
{
sql += " and t1.company_id=@companyid";
sqlparam.Add("companyid", companyid.Value);
}
//if (start.HasValue)
//{
// sql += " and t1.refund_time>=@start";
// sqlparam.Add("start", start.Value);
//}
//if (end.HasValue)
//{
// sql += " and t1.refund_time<@end";
// sqlparam.Add("end", end.Value.AddDays(1));
//}
//if (!string.IsNullOrWhiteSpace(platform))
//{
// sql += " and t1.platform_type=@platform";
// sqlparam.Add("platform", platform);
//}
//if (!string.IsNullOrWhiteSpace(website))
//{
// sql += " and t1.website=@website";
// sqlparam.Add("website", website);
//}
//if (!string.IsNullOrWhiteSpace(orderno))
//{
// sql += " and t1.origin_order_id=@orderno";
// sqlparam.Add("orderno", orderno);
//}
//if (paytimestart.HasValue)
//{
// sql += " and t1.paid_time>=@paytimestart";
// sqlparam.Add("paytimestart", paytimestart.Value);
//}
//if (paytimeend.HasValue)
//{
// sql += " and t1.paid_time<@paytimeend";
// sqlparam.Add("paytimeend", paytimeend.Value.AddDays(1));
//}
//using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
//{
// if (cn.State == System.Data.ConnectionState.Closed)
// {
// cn.Open();
// }
// var obj = cn.QueryFirstOrDefault<dc_base_oms_order>(sql, sqlparam);
// return obj;
//}
#endregion
var sql = "select sum(amount_refund_rmb) amount_refund_rmb,sum(amount_refund_usd) amount_refund_usd from dc_base_crm_refund where 1=1 ";
if (start.HasValue)
{
sql += " and t1.refund_time>=@start";
sql += " and refund_time>=@start";
sqlparam.Add("start", start.Value);
}
if (end.HasValue)
{
sql += " and t1.refund_time<@end";
sql += " and refund_time<@end";
sqlparam.Add("end", end.Value.AddDays(1));
}
if (companyid.HasValue && companyid.Value != 0)
{
sql += " and company_id=" + companyid.Value;
}
if (!string.IsNullOrWhiteSpace(platform))
{
sql += " and t1.platform_type=@platform";
sqlparam.Add("platform", platform);
sql += " and platform_type=@platform_type";
sqlparam.Add("platform_type", platform);
}
if (!string.IsNullOrWhiteSpace(website))
if (!string.IsNullOrEmpty(website))
{
sql += " and t1.website=@website";
sql += " and website=@website";
sqlparam.Add("website", website);
}
if (!string.IsNullOrWhiteSpace(orderno))
if (!string.IsNullOrEmpty(orderno))
{
sql += " and t1.origin_order_id=@orderno";
sql += " and origin_order_id=@orderno";
sqlparam.Add("orderno", orderno);
}
if (paytimestart.HasValue)
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
{
sql += " and t1.paid_time>=@paytimestart";
sqlparam.Add("paytimestart", paytimestart.Value);
cn.Open();
}
if (paytimeend.HasValue)
var obj = cn.QueryFirstOrDefault<dc_base_crm_refund>(sql,sqlparam,null,2*60);
return obj;
}
}
/// <summary>
/// 获取平台退款数据
/// </summary>
/// <param name="start"></param>
/// <param name="end"></param>
/// <param name="paycompanyid"></param>
/// <param name="platform"></param>
/// <param name="website"></param>
/// <param name="isUSD"></param>
/// <returns></returns>
public List<dc_base_oms_order> ListPlatformRefund(DateTime? start, DateTime? end, int? companyid, string platform, string website, bool isUSD)
{
sql += " and t1.paid_time<@paytimeend";
sqlparam.Add("paytimeend", paytimeend.Value.AddDays(1));
var sqlparam = new DynamicParameters();
var sql = $"select platform_type,{(isUSD? "sum(amount_refund_usd)" : "sum(amount_refund_rmb)")} as amount_refund from dc_base_crm_refund where 1=1 ";
if (companyid.HasValue && companyid.Value != 0)
{
sql += " and company_id="+companyid.Value;
}
if (!string.IsNullOrWhiteSpace(platform))
{
sql += " and platform_type=@platform_type";
sqlparam.Add("platform_type", platform);
}
if (!string.IsNullOrWhiteSpace(website))
{
sql += " and website=@website";
sqlparam.Add("website", website);
}
if (start.HasValue)
{
sql += " and refund_time>=@start";
sqlparam.Add("start", start.Value);
}
if (end.HasValue)
{
sql += " and refund_time<@end";
sqlparam.Add("end", end.Value.AddDays(1));
}
sql += " group by platform_type";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
if(cn.State== System.Data.ConnectionState.Closed)
{
cn.Open();
}
var obj = cn.QueryFirstOrDefault<dc_base_oms_order>(sql, sqlparam);
var obj = cn.Query<dc_base_oms_order>(sql, sqlparam, null, true, 2 * 60);
return obj;
return obj.AsList();
}
}
#endregion
......
......@@ -1336,6 +1336,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var dtend = end;
var ebayADFee = new dc_base_finance_ebay(); //Ebay 广告费
var ebayPutAway = new dc_base_finance_ebay(); //Ebay 上架费
var listRefund = new List<Models.Orders.dc_base_oms_order>();
var ADfeeType = new string[] {
"CustomCode"
};
......@@ -1381,6 +1382,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
ebayPutAway = _service.EbayFeeCount(companyid, dtstart, dtend, PutAwayFeeType, "", "", currency.ToUpper() == "USD");
var amazonAD = _service.ListAmazonADSkuCount("", dtstart, dtend, companyid, currency.ToUpper() == "USD");
listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD");
foreach (var item in result)
{
item.adfee = 0;
......@@ -1404,9 +1408,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
item.profit_rate = Math.Round((item.profit_total / item.amount_sales), 2);
}
item.amount_refund = 0;
item.amount_refund_rate = 0;
var objRefund = listRefund.Where(a => a.platform_type == item.platform_type).FirstOrDefault();
if (objRefund != null)
{
item.amount_refund = objRefund.amount_refund;
item.amount_refund_rate = (item.amount_sales>0?item.amount_refund/item.amount_sales:0);
}
//利润减去退款
item.profit_total = (item.profit_total - item.amount_refund);
item.profit_rate = Math.Round((item.profit_total / item.amount_sales), 2);
}
if (result.Count > 0)
......@@ -2043,17 +2057,16 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
a.platform_type,
a.website,
a.origin_order_id,
a.seller_account,
amount_refund = a.amount_refund.ToString("N2"),
refundrmb = a.refundrmb.ToString("N2"),
refund_time = a.refund_time.ToString("yyyy-MM-dd HH:mm:ss"),
a.refund_reference_id
a.bailun_account,
amount_refund_rmb = a.amount_refund_rmb.ToString("N2"),
amount_refund_usd = a.amount_refund_usd.ToString("N2"),
refund_time = a.refund_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
});
return JsonConvert.SerializeObject(new { total = total, rows = list, count_row = new {
seller_account = "合计",
refundrmb = countOjb.refundrmb.ToString("N2"),
amount_refund = countOjb.amount_refund.ToString("N2"),
bailun_account = "合计",
amount_refund_rmb = countOjb.amount_refund_rmb.ToString("N2"),
amount_refund_usd = countOjb.amount_refund_usd.ToString("N2"),
},companyid});
}
......@@ -2075,23 +2088,22 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
a.platform_type,
a.website,
a.origin_order_id,
a.seller_account,
amount_refund = a.amount_refund.ToString("N2"),
refundrmb = a.refundrmb.ToString("N2"),
refund_time = a.refund_time.ToString("yyyy-MM-dd HH:mm:ss"),
a.refund_reference_id
a.bailun_account,
amount_refund_rmb = a.amount_refund_rmb.ToString("N2"),
amount_refund_usd = a.amount_refund_usd.ToString("N2"),
refund_time = a.refund_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
});
var colNames = new List<string> {"平台订单号","平台名称","平台站点", "卖家帐号", "退款金额",
"退款RMB", "退款时间","退款交易号"
"退款USD", "退款时间"
};
var listVal = new List<string>();
foreach (var item in list)
{
listVal.Add(
item.origin_order_id + "|" + item.platform_type + "|" + item.website + "|" + item.seller_account + "|" + item.amount_refund + "|" +
item.refundrmb + "|" + item.refund_time + "|" + item.refund_reference_id
item.origin_order_id + "|" + item.platform_type + "|" + item.website + "|" + item.bailun_account + "|" + item.amount_refund_rmb + "|" +
item.amount_refund_usd + "|" + item.refund_time
);
}
......
......@@ -27,17 +27,17 @@
<option value="">选择帐号</option>
</select>
</div>*@
<div class="form-group">
@*<div class="form-group">
<label>付款时间</label>
<input id="paystart" name="paystart" type="text" class="form-control" style="width:130px;" value="" placeholder="付款开始时间" />
<span>至</span>
<input id="payend" name="payend" type="text" class="form-control" style="width:130px;" value="" placeholder="付款结束时间" />
</div>
</div>*@
<div class="form-group">
<label>退款时间</label>
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"))" placeholder="退款开始时间" />
<span>至</span>
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.ToString("yyyy-MM-dd"))" placeholder="退款结束时间" />
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" placeholder="退款结束时间" />
</div>
<div class="form-group">
<label>&nbsp;</label>
......@@ -101,14 +101,13 @@
{ field: 'platform_type', title: '平台名称', width: '100', sortable: true },
{ field: 'website', title: '平台站点', width: '90', sortable: true },
{
field: 'seller_account', title: '卖家帐号', width: '160', sortable: true, iscount: true, formatter: function (idx, data) {
return '<div class="mules" title="' + data.seller_account + '">' + data.seller_account+'</div>';
field: 'bailun_account', title: '卖家帐号', width: '160', sortable: true, iscount: true, formatter: function (idx, data) {
return '<div class="mules" title="' + data.bailun_account + '">' + data.bailun_account+'</div>';
}
},
{ field: 'amount_refund', title: '退款金额', width: '100', sortable: true, iscount: true },
{ field: 'refundrmb', title: '退款RMB', width: '100', sortable: false, iscount: true },
{ field: 'refund_time', title: '退款时间', width: '150', sortable: true },
{ field: 'refund_reference_id', title: '退款交易号', width: '150', sortable: false }
{ field: 'amount_refund_rmb', title: '退款金额', width: '100', sortable: true, iscount: true },
{ field: 'amount_refund_usd', title: '退款USD', width: '100', sortable: false, iscount: true },
{ field: 'refund_time', title: '退款时间', width: '150', sortable: true }
];
var url = '@Url.Content("~/Reports/Orders/ListReturnJson")' + '?' + $("#toolbar").serialize();
......
......@@ -14,6 +14,10 @@
</div>
<div style="float:right;width:100%;">
<div id="rightcontain">
<div class="alert alert-warning">
说明:退款金额是根据页面的付款时间和发货时间匹配退款时间获取的,只匹配到订单维度。
</div>
<div class="ibox-content m-b-sm border-bottom">
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
......
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