Commit b7eefcf5 authored by 黄奎's avatar 黄奎

页面修改

parent 95bddaa1
using Edu.Model.Entity.Sell;
using Edu.Common.Enum.Mall;
using Edu.Model.Entity.Sell;
using System;
using System.Collections.Generic;
using System.Text;
......@@ -83,5 +84,11 @@ namespace Edu.Model.ViewModel.Sell
/// 员工id
/// </summary>
public int EnterID { get; set; }
/// <summary>
/// 订单类型
/// </summary>
public OrderTypeEnum OrderType { get; set; }
}
}
......@@ -148,9 +148,8 @@ where a.`Status`=0 and c.CreateTime<date_add(curdate(),interval -day(curdate())+
{
where += $@" and cus.{nameof(RB_Order_ReturnComission_ViewModel.CategoryId)}={demodel.CategoryId} ";
}
string sql = $@"
select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName
select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName,o.OrderType
from RB_Order_ReturnComission r left join rb_returnmoney_batch b on r.BatchId = b.Id
left join rb_order o on r.OrderId = o.OrderId
left join rb_class c on o.ClassId = c.ClassId
......
......@@ -260,7 +260,8 @@ namespace Edu.WebApi.Controllers.Course
x.BatchName,
x.StuId,
x.StuName,
x.CommissionType
x.CommissionType,
x.OrderType,
})
};
return ApiResult.Success("", pageModel);
......
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