Skip to content

E
Education
Commit 9b6f4392 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 91cd5364
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 25 deletions
Edu.Module.Customer/CustomerRemitModule.cs
View file @ 9b6f4392
......@@ -111,7 +111,8 @@ namespace Edu.Module.Customer
keyValues.Add(nameof(RB_Customer_Remit_Extend.RejectRemark), remark);
keyValues.Add(nameof(RB_Customer_Remit_Extend.RejectDate), DateTime.Now);
}
else {
else
{
return "状态有误，请核实后再试";
}
List<WhereHelper> wheres = new List<WhereHelper>() {
......@@ -122,7 +123,8 @@ namespace Edu.Module.Customer
}
};
bool flag = customer_RemitRepository.Update(keyValues, wheres);
if (flag) {
if (flag)
{
if (state == 1)
{
var cmodel = customerRepository.GetEntity(rmodel.CustomerId);
......@@ -188,18 +190,28 @@ namespace Edu.Module.Customer
clientBankAccountRepository.Update(keyValues1, wheres1);
}
}
var detailList = new List<object> { };
decimal TotalMoney = rmodel.AppliedMoney;
detailList.Add(new
//var detailList = new
//{
// fcmodel.CostTypeId,
// Number = 1,
// OriginalMoney = rmodel.AppliedMoney,
// UnitPrice = rmodel.AppliedMoney,
// Remark = "同业" + (rmodel.Type == 1 ? "佣金" : "幸福存折") + "提现：" + cmodel.CustomerName + "(" + cmodel.ContactNumber + ")"
//};
var detailList = new List<object>
{
fcmodel.CostTypeId,
Number = 1,
OriginalMoney = rmodel.AppliedMoney,
UnitPrice = rmodel.AppliedMoney,
Remark = "同业" + (rmodel.Type == 1 ? "佣金" : "幸福存折") + "提现：" + cmodel.CustomerName + "(" + cmodel.ContactNumber + ")"
});
new
{
fcmodel.CostTypeId,
Number = 1,
OriginalMoney = rmodel.AppliedMoney,
UnitPrice =rmodel.AppliedMoney,
Remark = "同业" + (rmodel.Type == 1 ? "佣金" : "幸福存折") + "提现：" + cmodel.CustomerName + "(" + cmodel.ContactNumber + ")"
}
};
string Remark = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "自动生成财务单据";
var financeObj = new
{
......@@ -272,7 +284,8 @@ namespace Edu.Module.Customer
}
#endregion
}
else if (state == 2) {
else if (state == 2)
{
//驳回的话 需要修改已提现状态
var urmodel = user_ReturnComissionRepository.GetList(new Model.ViewModel.User.RB_User_ReturnComission_ViewModel() { GroupId = userInfo.Group_Id, UserId = rmodel.CustomerId, UserType = Common.Enum.User.StuCreateTypeEnum.CustomerInput, CommissionType = rmodel.Type }).FirstOrDefault();
if (urmodel != null)
......@@ -305,7 +318,7 @@ namespace Edu.Module.Customer
}
}
return flag ? "" : "出错了，请联系管理员";
}
}
#endregion
......@@ -328,7 +341,8 @@ namespace Edu.Module.Customer
List = list.OrderBy(x => x.Sort).ToList()
};
}
else {
else
{
return new
{
Title = "",
......@@ -351,7 +365,8 @@ namespace Edu.Module.Customer
bool flag = b2B_SlideShowRepository.Insert(demodel) > 0;
return flag ? "" : "出错了，请联系管理员";
}
else {
else
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_B2B_SlideShow_Extend.Title), demodel.Title},
{ nameof(RB_B2B_SlideShow_Extend.SubTitle), demodel.SubTitle},
......
Edu.Repository/User/RB_User_ReturnComissionRepository.cs
View file @ 9b6f4392
......@@ -94,19 +94,19 @@ WHERE 1=1
string where = $@" 1=1";
if (dmodel.GroupId > 0)
{
where += $@" {nameof(RB_User_ReturnComission_ViewModel.GroupId)} ={dmodel.GroupId}";
where += $@" AND {nameof(RB_User_ReturnComission_ViewModel.GroupId)} ={dmodel.GroupId}";
}
if (dmodel.UserId > 0)
{
where += $@" {nameof(RB_User_ReturnComission_ViewModel.UserId)} ={dmodel.UserId}";
where += $@" AND {nameof(RB_User_ReturnComission_ViewModel.UserId)} ={dmodel.UserId}";
}
if (dmodel.UserType > 0)
{
where += $@" {nameof(RB_User_ReturnComission_ViewModel.UserType)} ={(int)dmodel.UserType}";
where += $@" AND {nameof(RB_User_ReturnComission_ViewModel.UserType)} ={(int)dmodel.UserType}";
}
if (dmodel.CommissionType > 0)
{
where += $@" {nameof(RB_User_ReturnComission_ViewModel.CommissionType)} ={dmodel.CommissionType}";
where += $@" AND {nameof(RB_User_ReturnComission_ViewModel.CommissionType)} ={dmodel.CommissionType}";
}
string sql = $@"select * from RB_User_ReturnCommission where {where}";
......
Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs
View file @ 9b6f4392
......@@ -125,6 +125,10 @@ namespace Edu.WebApi.Controllers.Course
}
var list = customerCommissionModule.GetCommissionUserList(dmodel);
if (dmodel.UserDept > 0)
{
list = list.Where(x => x.UserDept == dmodel.UserDept).ToList();
}
return ApiResult.Success("", list.Select(x => new
{
x.SchoolId,
......@@ -375,6 +379,9 @@ namespace Edu.WebApi.Controllers.Course
RB_Depart_Id = deptItem.Key,
Money = 0,
PayMoney = 0,
OtherType = 53,
ReFinanceId2 = deptItem.Key,
ReFinanceId = tempList.FirstOrDefault().BatchId,
Status = 1,
Fee = 0,
IsPublic = 1,//配置信息
......
Edu.WebApi/Controllers/LearningGarden/SchoolGardenController.cs
View file @ 9b6f4392
......@@ -174,17 +174,17 @@ namespace Edu.WebApi.Controllers.LearningGarden
Cache.WeChat.WeChatReidsCache2.Set(tokenKey, token);
}
var resultTotalCount = HttpHelper.HttpGet("https://api.weixin.qq.com/cgi-bin/material/get_materialcount?access_token=" + token);
Common.Plugin.LogHelper.WriteInfo("GetGoodsData: " + resultTotalCount);
JObject parm = JObject.Parse(resultTotalCount);
//var resultTotalCount = HttpHelper.HttpGet("https://api.weixin.qq.com/cgi-bin/material/get_materialcount?access_token=" + token);
//Common.Plugin.LogHelper.WriteInfo("GetGoodsData: " + resultTotalCount);
//JObject parm = JObject.Parse(resultTotalCount);
List<WeChatLearningGardenItem> allList = new List<WeChatLearningGardenItem>();
pageCount = parm.GetInt("news_count");//图文总数
//pageCount = parm.GetInt("news_count");//图文总数
int dataCount = 1;
while (dataCount>0)
{
string dt = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
var tempImgList = GetGoodsList(pageIndex, pageSize);
var tempImgList = GetFreePublishList(pageIndex, pageSize); //GetGoodsList(pageIndex, pageSize);
if (tempImgList != null && tempImgList.Any())
{
allList.AddRange(tempImgList);
......
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