bug调整

Edu.Module.Course/TeachingRewardsModule.cs

@@ -394,7 +394,7 @@ namespace Edu.Module.Course
             else if (type == 2)
             {
                 LogContent = "教务奖励取消";
-                if (model.State != BonusStateEnum.Wait || model.State != BonusStateEnum.Confirmed)
+                if (model.State != BonusStateEnum.Wait && model.State != BonusStateEnum.Confirmed)
                 {
                     return false;
                 }
@@ -435,14 +435,14 @@ namespace Edu.Module.Course
         public string SetTeachingBonusAdd(RB_Teaching_Bonus_ViewModel dmodel, UserInfo userInfo)
         {
             //验证当月教师是否已存在奖励
-            var tlist = teaching_BonusRepository.GetList(new RB_Teaching_Bonus_ViewModel() { Group_Id = userInfo.Group_Id, Month = Convert.ToDateTime(dmodel.Month).ToString("yyyyMM") });
+            var tlist = teaching_BonusRepository.GetList(new RB_Teaching_Bonus_ViewModel() { Group_Id = userInfo.Group_Id, Month = Convert.ToDateTime(dmodel.Month).ToString("yyyy-MM") }).Where(x => x.State != BonusStateEnum.Cancel).ToList();
             if (tlist.Any()) {
                 string[] teacherArr = dmodel.TeacherIds.Split(',');
                 foreach (var item in tlist) {
                     foreach (var qitem in teacherArr) {
                         if (("," + item.TeacherIds + ",").Contains("," + qitem + ","))
                         {
-                            return "教师" + UserReidsCache.GetUserLoginInfo(qitem).AccountName + "【" + qitem + "】" + "已存在当月奖励";
+                            return "教师 " + (teacherRepository.GetEntity(qitem)?.TeacherName ?? "") + "【" + qitem + "】" + "已存在当月奖励";
                         }
                     }
                 }

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -362,6 +362,7 @@ namespace Edu.WebApi.Controllers.Course
             {
                 model.OrderId,
                 model.ClassId,
+                model.ClassName,
                 model.TradeWay,
                 model.Class_Price,
                 model.Unit_Price,