Commit e88ab9dc authored by liudong1993's avatar liudong1993

1投稿调整

parent 404af261
...@@ -143,5 +143,10 @@ namespace Edu.Model.Entity.WeChat ...@@ -143,5 +143,10 @@ namespace Edu.Model.Entity.WeChat
/// </summary> /// </summary>
public decimal CommissionMoney { get; set; } public decimal CommissionMoney { get; set; }
/// <summary>
/// 稿酬状态 1发放 2不发放
/// </summary>
public int RemunerationState { get; set; }
} }
} }
...@@ -110,7 +110,7 @@ ORDER BY r.Id DESC "; ...@@ -110,7 +110,7 @@ ORDER BY r.Id DESC ";
public List<RB_Contribute_Info_ViewModel> GetCanSendCommissionList(int group_Id, string eDate) public List<RB_Contribute_Info_ViewModel> GetCanSendCommissionList(int group_Id, string eDate)
{ {
string sql = $@"SELECT * FROM rb_contribute_info WHERE `Status` =0 and Group_Id ={group_Id} string sql = $@"SELECT * FROM rb_contribute_info WHERE `Status` =0 and Group_Id ={group_Id}
and AuditState =2 and PublishDate <='{eDate} 23:59:59' and IFNULL(IsSendCommission,0) <>1"; and AuditState =2 and PublishDate <='{eDate} 23:59:59' and IFNULL(IsSendCommission,0) <>1 and RemunerationState =1";
return Get<RB_Contribute_Info_ViewModel>(sql).ToList(); return Get<RB_Contribute_Info_ViewModel>(sql).ToList();
} }
} }
......
...@@ -617,7 +617,8 @@ namespace Edu.WebApi.Controllers.QYWeChat ...@@ -617,7 +617,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
x.CommissionMoney, x.CommissionMoney,
x.UpdateBy, x.UpdateBy,
UpdateByName = Cache.User.UserReidsCache.GetUserLoginInfo(x.UpdateBy)?.AccountName ?? "", UpdateByName = Cache.User.UserReidsCache.GetUserLoginInfo(x.UpdateBy)?.AccountName ?? "",
UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm") UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm"),
x.RemunerationState
}); });
return ApiResult.Success("", pmodel); return ApiResult.Success("", pmodel);
} }
...@@ -662,6 +663,7 @@ namespace Edu.WebApi.Controllers.QYWeChat ...@@ -662,6 +663,7 @@ namespace Edu.WebApi.Controllers.QYWeChat
model.AuditState, model.AuditState,
AuditStateName = model.AuditState.ToName(), AuditStateName = model.AuditState.ToName(),
model.UpdateBy, model.UpdateBy,
model.RemunerationState
}); });
} }
...@@ -798,7 +800,6 @@ namespace Edu.WebApi.Controllers.QYWeChat ...@@ -798,7 +800,6 @@ namespace Edu.WebApi.Controllers.QYWeChat
x.Id x.Id
})); }));
} }
#endregion #endregion
#region 发布管理 #region 发布管理
......
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