Skip to content

E
Education
Commit 55becc4e authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 8f5238bb 652646ec
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 26 deletions
Edu.Common/Enum/Course/FinanceConfigTypeEnum.cs
View file @ 55becc4e
...@@ -80,6 +80,12 @@ namespace Edu.Common.Enum.Course ...@@ -80,6 +80,12 @@ namespace Edu.Common.Enum.Course
/// 其他耗材出库 /// 其他耗材出库
/// </summary> /// </summary>
[EnumField("其他耗材出库")] [EnumField("其他耗材出库")]
OtherSuppliesStockOut = 13 OtherSuppliesStockOut = 13,
/// <summary>
/// 销售返佣批量生成财务单据
/// </summary>
[EnumField("销售返佣批量生成财务单据")]
SellCommission = 14
} }
} }
Edu.Model/Entity/Sell/RB_ReturnMoney_Batch.cs
View file @ 55becc4e
...@@ -43,5 +43,10 @@ namespace Edu.Model.Entity.Sell ...@@ -43,5 +43,10 @@ namespace Edu.Model.Entity.Sell
/// 1。返佣；2.幸福存折 /// 1。返佣；2.幸福存折
/// </summary> /// </summary>
public int CommissionType { get; set; } public int CommissionType { get; set; }
/// <summary>
/// 财务单据
/// </summary>
public string FinanceIds { get; set; }
} }
} }
Edu.Model/ViewModel/Sell/RB_Order_ReturnComission_ViewModel.cs
View file @ 55becc4e
...@@ -29,6 +29,17 @@ namespace Edu.Model.ViewModel.Sell ...@@ -29,6 +29,17 @@ namespace Edu.Model.ViewModel.Sell
/// </summary> /// </summary>
public string UserName { get; set; } public string UserName { get; set; }
/// <summary>
/// 用户部门
/// </summary>
public int UserDept { get; set; }
/// <summary>
/// 用户部门
/// </summary>
public string UserDeptName { get; set; }
/// <summary> /// <summary>
/// 返佣期数 /// 返佣期数
/// </summary> /// </summary>
......
Edu.Model/ViewModel/Sell/RB_ReturnMoney_Batch_ViewModel.cs
View file @ 55becc4e
...@@ -15,5 +15,31 @@ namespace Edu.Model.ViewModel.Sell ...@@ -15,5 +15,31 @@ namespace Edu.Model.ViewModel.Sell
/// 月份 /// 月份
/// </summary> /// </summary>
public string Month { get; set; } public string Month { get; set; }
/// <summary>
/// 个人直客期数总金额
/// </summary>
public decimal TotalEmployee { get; set; }
/// <summary>
/// 同业录入期数总金额
/// </summary>
public decimal TotalCustomer { get; set; }
/// <summary>
/// 内部介绍期数总金额
/// </summary>
public decimal TotalInternal { get; set; }
/// <summary>
/// 学员转介绍期数总金额
/// </summary>
public decimal TotalTrans { get; set; }
} }
} }
Edu.Module.Customer/CustomerCommissionModule.cs
View file @ 55becc4e
...@@ -179,6 +179,8 @@ namespace Edu.Module.Course ...@@ -179,6 +179,8 @@ namespace Edu.Module.Course
if (item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput || item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.InternalIntroduction) if (item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput || item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.InternalIntroduction)
{ {
var umodel = ulist.Where(x => x.Id == item.OrderSourceId).FirstOrDefault(); var umodel = ulist.Where(x => x.Id == item.OrderSourceId).FirstOrDefault();
item.UserDept = umodel.Dept_Id;
item.UserDeptName = umodel.DeptName;
item.UserName = umodel.EmployeeName + (umodel.LeaveStatus == Common.Enum.User.LeaveStatusEnum.Departure ? "离职" : ""); item.UserName = umodel.EmployeeName + (umodel.LeaveStatus == Common.Enum.User.LeaveStatusEnum.Departure ? "离职" : "");
} }
else if (item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.CustomerInput) else if (item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.CustomerInput)
...@@ -280,5 +282,23 @@ namespace Edu.Module.Course ...@@ -280,5 +282,23 @@ namespace Edu.Module.Course
}; };
} }
#endregion #endregion
#region 更新返佣财务单据
/// <summary>
/// 更新返佣财务单据
/// </summary>
/// <param name="CustomerId"></param>
/// <returns></returns>
public bool UdateReturnMoneyModule(object FinanceIds,int Id)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_ReturnMoney_Batch.FinanceIds),FinanceIds},
};
var flag = returnMoney_BatchRepository.Update(fileds, new WhereHelper(nameof(RB_ReturnMoney_Batch.Id), Id));
return flag;
}
#endregion
} }
} }
Edu.Repository/Sell/RB_ReturnMoney_BatchRepository.cs
View file @ 55becc4e
...@@ -24,8 +24,20 @@ namespace Edu.Repository.Sell ...@@ -24,8 +24,20 @@ namespace Edu.Repository.Sell
/// <returns></returns> /// <returns></returns>
public List<RB_ReturnMoney_Batch_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, int type, string month, int groupId) public List<RB_ReturnMoney_Batch_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, int type, string month, int groupId)
{ {
string sql = "select a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr"; string sql = $@"select IFNULL(SUM(b.CommissionMoeny),0) as TotalEmployee,IFNULL(SUM(c.CommissionMoeny),0) as TotalCustomer,a.FinanceIds,
sql += " from RB_ReturnMoney_Batch a"; IFNULL(SUM(d.CommissionMoeny),0) as TotalInternal,IFNULL(SUM(e.CommissionMoeny),0) as TotalTrans, a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr";
sql += $@" from RB_ReturnMoney_Batch a LEFT JOIN
(SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission where OrderSourceType=1 and `Status` in(1,2) GROUP BY OrderSourceType) as b
on a.Id=b.BatchId
LEFT JOIN
(SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission where OrderSourceType=2 and `Status` in(1,2) GROUP BY OrderSourceType) as c
on a.Id=c.BatchId
LEFT JOIN
(SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission where OrderSourceType=3 and `Status` in(1,2) GROUP BY OrderSourceType ) as d
on a.Id=d.BatchId
LEFT JOIN
(SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission where OrderSourceType=4 and `Status` in(1,2) GROUP BY OrderSourceType ) as e
on a.Id=e.BatchId ";
sql += " where a.GroupId=@gid"; sql += " where a.GroupId=@gid";
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
parameters.Add("gid", groupId); parameters.Add("gid", groupId);
......
Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs
View file @ 55becc4e
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Edu.Cache.User; using Edu.Cache.User;
using Edu.Common;
using Edu.Common.API; using Edu.Common.API;
using Edu.Common.Enum.Course; using Edu.Common.Enum.Course;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.ViewModel.Course; using Edu.Model.ViewModel.Course;
using Edu.Model.ViewModel.Finance;
using Edu.Model.ViewModel.Log; using Edu.Model.ViewModel.Log;
using Edu.Model.ViewModel.Sell; using Edu.Model.ViewModel.Sell;
using Edu.Module.Course; using Edu.Module.Course;
...@@ -27,6 +29,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -27,6 +29,12 @@ namespace Edu.WebApi.Controllers.Course
/// </summary> /// </summary>
private readonly CustomerCommissionModule customerCommissionModule = new CustomerCommissionModule(); private readonly CustomerCommissionModule customerCommissionModule = new CustomerCommissionModule();
/// <summary>
/// 财务配置
/// </summary>
private readonly EducationContractModule educationContractModule = new EducationContractModule();
#region 获取首页返佣 #region 获取首页返佣
/// <summary> /// <summary>
/// 获取首页返佣统计 /// 获取首页返佣统计
...@@ -280,5 +288,141 @@ namespace Edu.WebApi.Controllers.Course ...@@ -280,5 +288,141 @@ namespace Edu.WebApi.Controllers.Course
} }
#endregion #endregion
#region 批量生成返佣金额财务单据
[HttpPost]
public ApiResult SetBatchFinance()
{
var userInfo = base.UserInfo;
var dmodel = JsonHelper.DeserializeObject<RB_Order_ReturnComission_ViewModel>(RequestParm.Msg.ToString());
dmodel.GroupId = userInfo.Group_Id;
if (dmodel.BatchId <= 0)
{
return ApiResult.ParamIsNull("请传递期数id");
}
var financeConfig = educationContractModule.GetFinanceConfigList(new RB_Finance_Config_ViewModel { Group_Id = userInfo.Group_Id, Type = Common.Enum.Course.FinanceConfigTypeEnum.SellCommission }).FirstOrDefault();
if (financeConfig == null)
{
financeConfig = new RB_Finance_Config_ViewModel();
}
var list = customerCommissionModule.GetCommissionUserList(dmodel);
if (list == null || !list.Any(x => x.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput))
{
return ApiResult.Failed("暂无个人直客数据");
}
List<object> financeList = new List<object>();
foreach (var item in list.Where(x => x.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.SchoolId))//先区分出校区
{
foreach (var deptItem in list.Where(x => x.SchoolId == item.Key && x.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.UserDept))//区分出同一个校区不同部门
{
var tempList = list.Where(x => x.SchoolId == item.Key && x.UserDept == deptItem.Key);
if (tempList != null && tempList.Any())
{
List<object> deptList = new List<object>();
foreach (var itemDept in tempList)
{
if (itemDept.CommissionMoeny > 0 && itemDept.UserDept > 0)
{
var deptObj = new
{
ID = 0,
UnitPrice = Math.Round((itemDept.CommissionMoeny / itemDept.StudentCount), 2, MidpointRounding.AwayFromZero),
UnitPriceTo = "",
Number = itemDept.StudentCount,
Rate = 1,
CostTypeId = financeConfig.CostTypeId,//配置信息
CurrencyId = financeConfig.CurrencyId,
Remark = itemDept.UserName + "的提成，学生数：" + itemDept.StudentCount + "，总提成：" + itemDept.CommissionMoeny,
CostTypeName = "",//费用名称
yTotalPrice = itemDept.CommissionMoeny,
yTotalPriceTo = itemDept.CommissionMoeny,
bTotalPrice = itemDept.CommissionMoeny,
bTotalPriceTo = itemDept.CommissionMoeny,
show = true,
currenName = "人民币"
};
deptList.Add(deptObj);
}
}
var financeModel = new
{
FrID = 0,
OrderID = 0,
TemplateId = financeConfig.TempleteId,//配置信息
financeConfig.ClientID,//配置信息
ClientType = 10,//配置信息
RemitterName = "工资或提成（工资或提成）",//配置信息
AccountNumber = "虚拟-公账-公账",//配置信息
Type = 2,
RB_Branch_Id = item.Key,
RB_Depart_Id = deptItem.Key,
Money = 0,
PayMoney = 0,
Status = 1,
Fee = 0,
IsPublic = 1,//配置信息
IsUploadPic = 0,
OriginalFee = 0,
TradeDate = "",
PayDate = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
FinanceName = "",//配置信息
CreateDate = "",
EmName = userInfo.AccountName,
CompanyName = userInfo.SchoolName,
Description = "自动生成财务单据",
IsLeader = 1,
InvoiceType = 0,
InvoiceMoney = 0,
InvoiceRemark = "",
detailList = deptList,
RB_DepartName = tempList.FirstOrDefault()?.UserDeptName,
RB_BranchName = tempList.FirstOrDefault()?.SchoolName,
RelevanceFrId = "",
CreateBy = userInfo.Id,
OrderSource = 17,
RB_Group_Id = userInfo.Group_Id,
RB_CreateByName = userInfo.AccountName,
RB_GroupName = userInfo.GroupName,
};
financeList.Add(financeModel);
}
}
}
string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeList), Config.FinanceKey);
var resultInfo = new
{
msg = sign,
};
string apiResult = Common.Plugin.HttpHelper.HttpPost(Config.ReadConfigKey("SellFinanceApi"), JsonHelper.Serialize(resultInfo), "");
JObject parmsJob = JObject.Parse(apiResult);
string resultCode = parmsJob.GetStringValue("resultCode");
string message = parmsJob.GetStringValue("message");
string frid = parmsJob.GetStringValue("data");
if (resultCode == "1" && !string.IsNullOrWhiteSpace(frid))//新增记录
{
bool result = customerCommissionModule.UdateReturnMoneyModule(frid.Trim('"'), dmodel.BatchId);
if (result)
{
return ApiResult.Success("生成财务单据成功");
}
else
{
return ApiResult.Failed("保存财务单据失败，财务单据：" + frid);
}
}
else
{
return ApiResult.Failed(message);
}
}
#endregion
} }
} }
Edu.WebApi/Controllers/Finance/FinanceController.cs
View file @ 55becc4e
...@@ -78,7 +78,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -78,7 +78,7 @@ namespace Edu.WebApi.Controllers.Finance
{ {
return ApiResult.Success(result.message); return ApiResult.Success(result.message);
} }
else else
{ {
return ApiResult.Failed(result.message); return ApiResult.Failed(result.message);
} }
...@@ -111,7 +111,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -111,7 +111,7 @@ namespace Edu.WebApi.Controllers.Finance
return ApiResult.Success("", pageModel); return ApiResult.Success("", pageModel);
} }
else else
{ {
return ApiResult.Failed("请传入指定的返佣类型"); return ApiResult.Failed("请传入指定的返佣类型");
} }
...@@ -160,10 +160,12 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -160,10 +160,12 @@ namespace Edu.WebApi.Controllers.Finance
//提成 //提成
decimal SaleCommission = (orderList != null && orderList.Any()) ? orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney + x.ExtraCommissionMoney) : 0;//销售提成 decimal SaleCommission = (orderList != null && orderList.Any()) ? orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney + x.ExtraCommissionMoney) : 0;//销售提成
if (orderList.Any()) { if (orderList.Any())
{
string OrderIds = string.Join(",", orderList.Select(x => x.OrderId)); string OrderIds = string.Join(",", orderList.Select(x => x.OrderId));
var achList = financeModule.GetAchListForOrderIds(OrderIds, base.UserInfo.Group_Id); var achList = financeModule.GetAchListForOrderIds(OrderIds, base.UserInfo.Group_Id);
if (achList.Any()) { if (achList.Any())
{
SaleCommission += achList.Sum(x => x.GiveOutMoney);// 业绩提成 SaleCommission += achList.Sum(x => x.GiveOutMoney);// 业绩提成
} }
} }
...@@ -596,7 +598,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -596,7 +598,7 @@ namespace Edu.WebApi.Controllers.Finance
//查询月结老师的课时费 //查询月结老师的课时费
var monthModel = financeModule.GetReserveClassHours(ReserveClassId, base.UserInfo.Group_Id); var monthModel = financeModule.GetReserveClassHours(ReserveClassId, base.UserInfo.Group_Id);
var recultFiniceList = financeList.Select(x => new var recultFiniceList = financeList.Select(x => new
{ {
x.FrID, x.FrID,
...@@ -688,7 +690,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -688,7 +690,7 @@ namespace Edu.WebApi.Controllers.Finance
string subtitle = "试听班级名称"; string subtitle = "试听班级名称";
string thirdTitle = "试听课程名称："; string thirdTitle = "试听课程名称：";
string fourTitle = "试听开班时间："; string fourTitle = "试听开班时间：";
List<RB_Finance_Extend> financeReciveList = financeList.Where(t => t.Type == WFTempLateClassEnum.IN).ToList(); List<RB_Finance_Extend> financeReciveList = financeList.Where(t => t.Type == WFTempLateClassEnum.IN).ToList();
List<RB_Finance_Extend> financePayList = financeList.Where(t => t.Type == WFTempLateClassEnum.OUT).ToList(); List<RB_Finance_Extend> financePayList = financeList.Where(t => t.Type == WFTempLateClassEnum.OUT).ToList();
...@@ -726,7 +728,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -726,7 +728,7 @@ namespace Edu.WebApi.Controllers.Finance
{ {
HAlignmentEnum= HAlignmentEnum.LEFT HAlignmentEnum= HAlignmentEnum.LEFT
}, },
} }
}; };
slist.Add(firstRow); slist.Add(firstRow);
...@@ -1733,7 +1735,8 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1733,7 +1735,8 @@ namespace Edu.WebApi.Controllers.Finance
/// <returns></returns> /// <returns></returns>
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
public ApiResult UpdateStudentValidClassHours() { public ApiResult UpdateStudentValidClassHours()
{
JObject jObj = JObject.Parse(RequestParm.Msg.ToString()); JObject jObj = JObject.Parse(RequestParm.Msg.ToString());
int GuestId = jObj.GetInt("GuestId", 0); int GuestId = jObj.GetInt("GuestId", 0);
decimal Money = jObj.GetDecimal("Money"); decimal Money = jObj.GetDecimal("Money");
...@@ -2083,7 +2086,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2083,7 +2086,7 @@ namespace Edu.WebApi.Controllers.Finance
string StartMonth = base.ParmJObj.GetStringValue("StartMonth"); string StartMonth = base.ParmJObj.GetStringValue("StartMonth");
string EndMonth = base.ParmJObj.GetStringValue("EndMonth"); string EndMonth = base.ParmJObj.GetStringValue("EndMonth");
string StudentName = base.ParmJObj.GetStringValue("StudentName");//学生名称 string StudentName = base.ParmJObj.GetStringValue("StudentName");//学生名称
int StudentId = base.ParmJObj.GetInt("StudentId",0);//学员id int StudentId = base.ParmJObj.GetInt("StudentId", 0);//学员id
int OrderId = base.ParmJObj.GetInt("OrderId", 0);//订单 int OrderId = base.ParmJObj.GetInt("OrderId", 0);//订单
string ContractNo = base.ParmJObj.GetStringValue("ContractNo");//合同编号 string ContractNo = base.ParmJObj.GetStringValue("ContractNo");//合同编号
if (string.IsNullOrEmpty(StartMonth)) if (string.IsNullOrEmpty(StartMonth))
...@@ -2466,7 +2469,8 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2466,7 +2469,8 @@ namespace Edu.WebApi.Controllers.Finance
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetReceiptConfigInfo() { public ApiResult GetReceiptConfigInfo()
{
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
var model = financeModule.GetReceiptConfigInfo(userInfo); var model = financeModule.GetReceiptConfigInfo(userInfo);
...@@ -2485,7 +2489,8 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2485,7 +2489,8 @@ namespace Edu.WebApi.Controllers.Finance
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetReceiptConfigInfo() { public ApiResult SetReceiptConfigInfo()
{
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
RB_Receipt_Config_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Config_ViewModel>(base.RequestParm.Msg.ToString()); RB_Receipt_Config_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Config_ViewModel>(base.RequestParm.Msg.ToString());
if (string.IsNullOrEmpty(demodel.TempleteIds)) if (string.IsNullOrEmpty(demodel.TempleteIds))
...@@ -2504,7 +2509,8 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2504,7 +2509,8 @@ namespace Edu.WebApi.Controllers.Finance
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(msg); return ApiResult.Failed(msg);
} }
} }
...@@ -2514,7 +2520,8 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2514,7 +2520,8 @@ namespace Edu.WebApi.Controllers.Finance
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetReceiptInfoPageList() { public ApiResult GetReceiptInfoPageList()
{
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString()); ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
RB_Receipt_Info_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Info_ViewModel>(base.RequestParm.Msg.ToString()); RB_Receipt_Info_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Info_ViewModel>(base.RequestParm.Msg.ToString());
...@@ -2546,11 +2553,13 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2546,11 +2553,13 @@ namespace Edu.WebApi.Controllers.Finance
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetReceiptInfoForFinanceId() { public ApiResult GetReceiptInfoForFinanceId()
{
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString()); JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int FinanceId = parms.GetInt("FinanceId", 0); int FinanceId = parms.GetInt("FinanceId", 0);
if (FinanceId <= 0) { if (FinanceId <= 0)
{
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
...@@ -2579,16 +2588,20 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2579,16 +2588,20 @@ namespace Edu.WebApi.Controllers.Finance
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetReceiptInfo() { public ApiResult SetReceiptInfo()
{
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
RB_Receipt_Info_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Info_ViewModel>(base.RequestParm.Msg.ToString()); RB_Receipt_Info_ViewModel demodel = JsonHelper.DeserializeObject<RB_Receipt_Info_ViewModel>(base.RequestParm.Msg.ToString());
if (demodel.FinanceId <= 0) { if (demodel.FinanceId <= 0)
{
return ApiResult.ParamIsNull("请传递财务单据ID"); return ApiResult.ParamIsNull("请传递财务单据ID");
} }
if (string.IsNullOrEmpty(demodel.Remitter)) { if (string.IsNullOrEmpty(demodel.Remitter))
{
return ApiResult.ParamIsNull("请传递汇款人"); return ApiResult.ParamIsNull("请传递汇款人");
} }
if (demodel.Money <= 0) { if (demodel.Money <= 0)
{
return ApiResult.ParamIsNull("请传递收据金额"); return ApiResult.ParamIsNull("请传递收据金额");
} }
...@@ -2607,7 +2620,8 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2607,7 +2620,8 @@ namespace Edu.WebApi.Controllers.Finance
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(msg); return ApiResult.Failed(msg);
} }
} }
...@@ -2617,11 +2631,13 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2617,11 +2631,13 @@ namespace Edu.WebApi.Controllers.Finance
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DelReceiptInfo() { public ApiResult DelReceiptInfo()
{
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString()); JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int ReceiptId = parms.GetInt("ReceiptId", 0); int ReceiptId = parms.GetInt("ReceiptId", 0);
if (ReceiptId <= 0) { if (ReceiptId <= 0)
{
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
...@@ -2630,10 +2646,14 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -2630,10 +2646,14 @@ namespace Edu.WebApi.Controllers.Finance
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(msg); return ApiResult.Failed(msg);
} }
} }
#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