1

Edu.Common/Enum/Course/FinanceConfigTypeEnum.cs

@@ -75,6 +75,11 @@ namespace Edu.Common.Enum.Course
         /// 教育同业幸福存折
         /// </summary>
         [EnumField("教育同业幸福存折")]
-        HappinessPassbook = 12
+        HappinessPassbook = 12,
+        /// <summary>
+        /// 其他耗材出库
+        /// </summary>
+        [EnumField("其他耗材出库")]
+        OtherSuppliesStockOut = 13
     }
 }

Edu.Module.Finance/FinanceModule.cs

@@ -599,6 +599,18 @@ namespace Edu.Module.Finance
             }
             #endregion
 
+            #region 试听课程
+
+            var rclist = reserve_ClassRepository.GetReserveClassListRepository(new Model.ViewModel.Reserve.RB_Reserve_Class_Extend() { Group_Id = GroupId, StartClassDate = STime, EndClassDate = ETime });
+            if (rclist.Any()) {
+                string rclassIds = string.Join(",", rclist.Select(x => x.ReserveClassId));
+                //查询班级下所有的财务单据
+                FAllList = RB_FinanceRepository.GetDataStatisticsListThree(new RB_Finance_Extend() { RB_Group_Id = GroupId, TCIDStr = rclassIds, OrderSource = OrderResourceEnum.ReserveClass });
+            }
+
+
+            #endregion
+
             var fumodel = edu_UpdateRecordRepository.GetList(new RB_Report_UpdateRecord() { Type = 1 }).FirstOrDefault();
             if (fumodel != null)
             {

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -573,6 +573,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                 extModel.ImgCover,
                 extModel.ProductType,
                 extModel.StudyFeature,
+                extModel.StudyCountryId,
                 extModel.B2CRatio,
                 extModel.B2CReNewRatio,
                 extModel.B2BRebateRatio,