|
@@ -106,26 +106,26 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
|
|
string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
|
|
|
var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
|
|
var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
|
|
|
var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
|
|
var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
|
|
|
- var check = db.ProfitRewardRecord.Any(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId));
|
|
|
|
|
- var checks = db.ProfitRewardRecord.Any(m => m.CreateDate <= end && m.BrandId == Convert.ToInt32(BrandId));
|
|
|
|
|
|
|
+ var check = db.ProfitRewardRecord.Any(m => m.CreateDate >= start && m.BrandId == data.BrandId);
|
|
|
|
|
+ var checks = db.ProfitRewardRecord.Any(m => m.CreateDate <= end && m.BrandId == data.BrandId);
|
|
|
if (check)
|
|
if (check)
|
|
|
{
|
|
{
|
|
|
- var sId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
|
|
|
|
|
|
|
+ var sId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start && m.BrandId == data.BrandId).Min(m => m.Id);
|
|
|
condition += " and Id >=" + sId;
|
|
condition += " and Id >=" + sId;
|
|
|
}
|
|
}
|
|
|
if (checks)
|
|
if (checks)
|
|
|
{
|
|
{
|
|
|
- var eId = db.ProfitRewardRecord.Where(m => m.CreateDate <= end && m.BrandId == Convert.ToInt32(BrandId)).Max(m => m.Id);
|
|
|
|
|
|
|
+ var eId = db.ProfitRewardRecord.Where(m => m.CreateDate <= end && m.BrandId == data.BrandId).Max(m => m.Id);
|
|
|
condition += " and Id <=" + eId;
|
|
condition += " and Id <=" + eId;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
|
|
var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
|
|
|
- var check = db.ProfitRewardRecord.Any(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId));
|
|
|
|
|
|
|
+ var check = db.ProfitRewardRecord.Any(m => m.CreateDate >= start && m.BrandId == data.BrandId);
|
|
|
if (check)
|
|
if (check)
|
|
|
{
|
|
{
|
|
|
- var minId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
|
|
|
|
|
|
|
+ var minId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start && m.BrandId == data.BrandId).Min(m => m.Id);
|
|
|
var Info = function.ReadInstance("/WritePage/ProfitRewardRecord/ProfitRewardRecord.txt");
|
|
var Info = function.ReadInstance("/WritePage/ProfitRewardRecord/ProfitRewardRecord.txt");
|
|
|
if (string.IsNullOrEmpty(Info.ToString()))
|
|
if (string.IsNullOrEmpty(Info.ToString()))
|
|
|
{
|
|
{
|