Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/StudentBillModule.cs

@@ -839,8 +839,8 @@ namespace Edu.Module.Course
         /// 退课一键制单
         /// </summary>
         /// <param name="backClassId"></param>
-        /// <param name="isPublic"></param>
-        /// <param name="currencyId"></param>
+        /// <param name="IsPublic"></param>
+        /// <param name="CurrencyId"></param>
         /// <param name="clientType"></param>
         /// <param name="clientId"></param>
         /// <param name="userInfo"></param>
@@ -869,7 +869,7 @@ namespace Edu.Module.Course
                 }
             };
             var classModel = classRepository.GetEntity(backModel.ClassId);
-            string Remark = "【" + (classModel?.ClassName ?? "") + "】下订单" + backModel.OrderId + " 客人退课";
+            string Remark = "【" + (classModel?.ClassName ?? "") + "】下,订单" + backModel.OrderId + " 客人退课";
             var financeObj = new
             {
                 IsPublic,
@@ -912,16 +912,7 @@ namespace Edu.Module.Course
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                     { nameof(RB_Student_BackClass.FinanceId),frid}
                 };
-                List<WhereHelper> wheres = new List<WhereHelper>()
-                {
-                    new WhereHelper()
-                    {
-                         FiledName=nameof(RB_Teaching_Perf_ViewModel.Id),
-                         FiledValue=backModel.BackId,
-                         OperatorEnum=OperatorEnum.Equal
-                    }
-                };
-                bool flag = student_BackClassRepository.Update(keyValues, wheres);
+                bool flag = student_BackClassRepository.Update(keyValues, new WhereHelper(nameof(RB_Student_BackClass.BackId), backModel.BackId));
                 if (flag)
                 {
                     //记录日志
@@ -945,7 +936,6 @@ namespace Edu.Module.Course
                 msg += backModel.BackId + "创建财务单据失败;";
             }
             #endregion
-
             return msg;
         }
     }

Edu.WebApi/Controllers/Course/StuController.cs

@@ -85,6 +85,7 @@ namespace Edu.WebApi.Controllers.Course
                     AuditStatusName=item.AuditStatus.ToName(),
                     item.SpecialNode,
                     item.RealityBackMoney,
+                    item.FinanceId,
                 });
             }
             pageModel.Count = rowsCount;
@@ -157,22 +158,14 @@ namespace Edu.WebApi.Controllers.Course
             int ClientId = parms.GetInt("ClientId", 0);
             if (BackClassId <= 0)
             {
-                return ApiResult.ParamIsNull();
+                return ApiResult.ParamIsNull(message:"请传递退课编号!");
             }
             if (ClientId <= 0)
             {
-                return ApiResult.ParamIsNull();
+                return ApiResult.ParamIsNull(message:"请传递客户编号!");
             }
-
             string msg = studentBillModule.SetStudentBackFinance(BackClassId, IsPublic, CurrencyId, ClientType, ClientId, userInfo);
-            if (msg == "")
-            {
-                return ApiResult.Success();
-            }
-            else
-            {
-                return ApiResult.Failed(msg);
-            }
+            return string.IsNullOrEmpty(msg) ? ApiResult.Success() : ApiResult.Failed(msg);
         }
     }
 }