Commit 0b535b42 authored by 黄奎's avatar 黄奎

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

parents b051f2bf 91cd5364
...@@ -302,6 +302,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -302,6 +302,10 @@ namespace Edu.WebApi.Controllers.Course
#region 批量生成返佣金额财务单据 #region 批量生成返佣金额财务单据
/// <summary>
/// 批量生成返佣金额财务单据
/// </summary>
/// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetBatchFinance() public ApiResult SetBatchFinance()
{ {
...@@ -408,6 +412,17 @@ namespace Edu.WebApi.Controllers.Course ...@@ -408,6 +412,17 @@ namespace Edu.WebApi.Controllers.Course
{ {
msg = sign, msg = sign,
}; };
System.Threading.Tasks.Task.Run(() => SetFinance(resultInfo, dmodel.BatchId));
return ApiResult.Success("财务单据生成中,请稍后刷新查看");
}
/// <summary>
/// 调用erp生成财务单据接口
/// </summary>
/// <param name="resultInfo"></param>
/// <param name="BatchId"></param>
public void SetFinance(object resultInfo, int BatchId)
{
string apiResult = Common.Plugin.HttpHelper.HttpPost(Config.ReadConfigKey("SellFinanceApi"), JsonHelper.Serialize(resultInfo), ""); string apiResult = Common.Plugin.HttpHelper.HttpPost(Config.ReadConfigKey("SellFinanceApi"), JsonHelper.Serialize(resultInfo), "");
JObject parmsJob = JObject.Parse(apiResult); JObject parmsJob = JObject.Parse(apiResult);
string resultCode = parmsJob.GetStringValue("resultCode"); string resultCode = parmsJob.GetStringValue("resultCode");
...@@ -416,23 +431,9 @@ namespace Edu.WebApi.Controllers.Course ...@@ -416,23 +431,9 @@ namespace Edu.WebApi.Controllers.Course
if (resultCode == "1" && !string.IsNullOrWhiteSpace(frid))//新增记录 if (resultCode == "1" && !string.IsNullOrWhiteSpace(frid))//新增记录
{ {
bool result = customerCommissionModule.UdateReturnMoneyModule(frid.Trim('"'), dmodel.BatchId); bool result = customerCommissionModule.UdateReturnMoneyModule(frid.Trim('"'), BatchId);
if (result)
{
return ApiResult.Success("生成财务单据成功");
}
else
{
return ApiResult.Failed("保存财务单据失败,财务单据:" + frid);
}
}
else
{
return ApiResult.Failed(message);
} }
} }
#endregion #endregion
......
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