Commit c978ba72 authored by 黄奎's avatar 黄奎

配置文件修改

parent 805aa44b
...@@ -17,6 +17,7 @@ using Edu.Common.WeChatPayAPIv3.Model.RefundsCallback; ...@@ -17,6 +17,7 @@ using Edu.Common.WeChatPayAPIv3.Model.RefundsCallback;
using Edu.Common.WeChatPayAPIv3.Model.WxPayCallback; using Edu.Common.WeChatPayAPIv3.Model.WxPayCallback;
using Edu.Model.Entity.Finance; using Edu.Model.Entity.Finance;
using Edu.Model.ViewModel.Finance; using Edu.Model.ViewModel.Finance;
using Edu.Model.ViewModel.User;
using Edu.Module.Course; using Edu.Module.Course;
using Edu.Module.User; using Edu.Module.User;
using Edu.WebApi.Filter; using Edu.WebApi.Filter;
...@@ -165,7 +166,21 @@ namespace Edu.WebApi.Controllers.WeChatPay ...@@ -165,7 +166,21 @@ namespace Edu.WebApi.Controllers.WeChatPay
{ {
financeConfig = new 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 userInfo = new Employee_ViewModel();
if (orderModel.CreateBy > 0)
{
userInfo = employeeModule.GetEmployeeListModule(new Model.ViewModel.User.Employee_ViewModel { Id = orderModel.CreateBy, Group_Id = orderModel.Group_Id }).ToList().FirstOrDefault();
}
else if (orderModel.EnterID > 0)
{
userInfo = employeeModule.GetEmployeeListModule(new Model.ViewModel.User.Employee_ViewModel { Id = orderModel.EnterID, Group_Id = orderModel.Group_Id }).ToList().FirstOrDefault();
}
else if (orderModel.CourseConsultantId > 0)
{
userInfo = employeeModule.GetEmployeeListModule(new Model.ViewModel.User.Employee_ViewModel { Id = orderModel.CourseConsultantId, 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);//手续费 var OriginalFee = Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(payModel.amount.payer_total) / 100), 2, MidpointRounding.AwayFromZero);//手续费
RB_Online_Trade_Detail model = new RB_Online_Trade_Detail(); RB_Online_Trade_Detail model = new RB_Online_Trade_Detail();
RB_Finance_OrderRecord orderRecordModel = new RB_Finance_OrderRecord RB_Finance_OrderRecord orderRecordModel = new RB_Finance_OrderRecord
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"Microsoft.Hosting.Lifetime": "Information" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"SettlementRated": "0.60", "SettlementRate": "0.54",
"SellCommissionFFBL": "0.15", "SellCommissionFFBL": "0.15",
"JwtSecretKey": "@VIITTOREBORN*2018", "JwtSecretKey": "@VIITTOREBORN*2018",
"MallJwtSecretKey": "@VIITTOREBORN*2018123", "MallJwtSecretKey": "@VIITTOREBORN*2018123",
......
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