Commit 7e81e124 by guanzhenshan

调整拦截订单的接口

parent bceea170
......@@ -4668,16 +4668,16 @@ namespace Bailun.DC.Services
{
var sqlparam = new DynamicParameters();
var sql = "select platform_type,origin_order_id,paid_time,item_id,(platform_sku_quantity_ordered-platform_sku_quantity_shipped) count,gmt_modified from dc_base_oms_platform_sku where bailun_order_status!='Canceled' and bailun_payment_status!='Canceled' and bailun_interception_status!='None' and platform_sku_quantity_ordered>platform_sku_quantity_shipped ";
var sql = "select item_id,sum(platform_sku_quantity_ordered-platform_sku_quantity_shipped) count from dc_base_oms_platform_sku where bailun_order_status!='Canceled' and bailun_payment_status!='Canceled' and bailun_interception_status!='None' and platform_sku_quantity_ordered>platform_sku_quantity_shipped ";
if (start.HasValue)
{
sql += " and gmt_modified>=@start";
sql += " and paid_time>=@start";
sqlparam.Add("start", start.Value);
}
if (end.HasValue)
{
sql += " and gmt_modified<@end";
sql += " and paid_time<@end";
sqlparam.Add("end", end.Value.AddDays(1));
}
......@@ -4690,6 +4690,8 @@ namespace Bailun.DC.Services
//分页记录
//sql += " limit "+(page-1)*pagesize+","+pagesize;
sql += " group by item_id ";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if(cn.State== System.Data.ConnectionState.Closed)
......@@ -4697,7 +4699,7 @@ namespace Bailun.DC.Services
cn.Open();
}
var obj = cn.Page<mInterceptOrderItemid>(page, pagesize, sql, ref total, sqlparam, "", 2 * 60).AsList();
var obj = cn.Query<mInterceptOrderItemid>(sql, sqlparam, null,true,2*60).AsList();
return obj;
}
......
......@@ -351,6 +351,7 @@ namespace Bailun.DC.Web.Controllers
try
{
var obj = new Services.OrdersServices().ListInterceptOrderItemId(page, pagesize, start, end,ref total, platform);
total = obj.Count;
return Json(new {
success = true,
......
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