实体修改

Edu.Model/Entity/Course/RB_Finance_Config.cs → Edu.Model/Entity/Finance/RB_Finance_Config.cs

@@ -3,7 +3,7 @@ using Edu.Common.Enum.Course;
 using System;
 using VT.FW.DB;
 
-namespace Edu.Model.Entity.Course
+namespace Edu.Model.Entity.Finance
 {
     /// <summary>
     /// 财务流程费用配置实体类

Edu.Model/ViewModel/Course/RB_Finance_Config_ViewModel.cs → Edu.Model/ViewModel/Finance/RB_Finance_Config_ViewModel.cs

-using System;
-using System.Collections.Generic;
+using Edu.Model.Entity.Finance;
+using System;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Finance
 {
     /// <summary>
     /// 财务流程费用配置扩展类
     /// </summary>
     [Serializable]
-    public class RB_Finance_Config_ViewModel : Model.Entity.Course.RB_Finance_Config
+    public class RB_Finance_Config_ViewModel : RB_Finance_Config
     {
         
     }

Edu.Module.Course/EducationContractModule.cs

@@ -8,6 +8,7 @@ using Edu.Model.CacheModel;
 using Edu.Model.Entity.Finance;
 using Edu.Model.ViewModel.Contract;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Finance;
 using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;

Edu.Module.Course/StudentBillModule.cs

@@ -8,6 +8,7 @@ using Edu.Model.CacheModel;
 using Edu.Model.Entity.BackClass;
 using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Finance;
 using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;

Edu.Repository/Course/RB_Finance_ConfigRepository.cs

 using Edu.Common.Enum;
 using Edu.Model.Entity.Course;
+using Edu.Model.Entity.Finance;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Finance;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Edu.WebApi/Controllers/Course/TeachingRewardsController.cs

@@ -6,6 +6,7 @@ using Edu.Common.API;
 using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Finance;
 using Edu.Model.ViewModel.Log;
 using Edu.Module.Course;
 using Edu.WebApi.Filter;

Edu.WebApi/Controllers/WeChatPay/WeChatPayController.cs

@@ -16,6 +16,7 @@ using Edu.Common.WeChatPayAPIv3.Model.Refunds;
 using Edu.Common.WeChatPayAPIv3.Model.RefundsCallback;
 using Edu.Common.WeChatPayAPIv3.Model.WxPayCallback;
 using Edu.Model.Entity.Finance;
+using Edu.Model.ViewModel.Finance;
 using Edu.Module.Course;
 using Edu.Module.User;
 using Edu.WebApi.Filter;
@@ -159,10 +160,10 @@ namespace Edu.WebApi.Controllers.WeChatPay
                     LogHelper.WriteInfo(payModel.out_trade_no + "我要新增财务单据啦...." + System.DateTime.Now);
                     var orderModle = educationContractModule.GetEducationContractModule(contractId);
                     var orderModel = orderModule.GetClassOrderInfoModule(orderModle.OrderId);
-                    var financeConfig = educationContractModule.GetFinanceConfigList(new Model.ViewModel.Course.RB_Finance_Config_ViewModel { Group_Id = orderModle.Group_Id, Type = Common.Enum.Course.FinanceConfigTypeEnum.Tuition }).FirstOrDefault();
+                    var financeConfig = educationContractModule.GetFinanceConfigList(new RB_Finance_Config_ViewModel { Group_Id = orderModle.Group_Id, Type = Common.Enum.Course.FinanceConfigTypeEnum.Tuition }).FirstOrDefault();
                     if (financeConfig == null)
                     {
-                        financeConfig = new Model.ViewModel.Course.RB_Finance_Config_ViewModel();
+                        financeConfig = new RB_Finance_Config_ViewModel();
                     }
                     var userInfo = employeeModule.GetEmployeeListModule(new Model.ViewModel.User.Employee_ViewModel { Id = orderModel.EnterID, Group_Id = orderModel.Group_Id }).ToList().FirstOrDefault();
                     var OriginalFee = Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(payModel.amount.payer_total) / 100), 2, MidpointRounding.AwayFromZero);//手续费

education.sln

@@ -66,7 +66,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Advertising", "E
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.EduTask", "Edu.Module.EduTask\Edu.Module.EduTask.csproj", "{FEDB8D19-2C7E-4393-8D91-332256EC89CC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edu.Module.QYWeChat", "Edu.Module.QYWeChat\Edu.Module.QYWeChat.csproj", "{00E05F5A-A5B7-46ED-AE5F-9D54D67FA78F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.QYWeChat", "Edu.Module.QYWeChat\Edu.Module.QYWeChat.csproj", "{00E05F5A-A5B7-46ED-AE5F-9D54D67FA78F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution