Commit 983ae040 authored by 吴春's avatar 吴春

提交代码

parent 7dc53d9f
...@@ -5029,14 +5029,14 @@ namespace Mall.Module.Product ...@@ -5029,14 +5029,14 @@ namespace Mall.Module.Product
item.IsPublic = 8;//默认原路退款 item.IsPublic = 8;//默认原路退款
var financeObj = new var financeObj = new
{ {
CreateBy = Config.NetworkDirector, CreateBy = Config.ExpendDirector,
item.IsPublic, item.IsPublic,
ClientType = 0, ClientType = 0,
ClientID = 0, ClientID = 0,
item.CurrencyId, item.CurrencyId,
WBMoney = Money, WBMoney = Money,
PayDate = DateTime.Now.ToString("yyyy-MM-dd"), PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
Config.RB_Branch_Id, RB_Branch_Id=Config.ExpendBranchId,
TemplateId = item.WorkFlowId, TemplateId = item.WorkFlowId,
OrderSource = 16, OrderSource = 16,
OtherType = 12, OtherType = 12,
...@@ -5975,14 +5975,14 @@ namespace Mall.Module.Product ...@@ -5975,14 +5975,14 @@ namespace Mall.Module.Product
} }
var financeObj = new var financeObj = new
{ {
CreateBy = Config.NetworkDirector, CreateBy = Config.ExpendDirector,
item.IsPublic, item.IsPublic,
ClientType = 0, ClientType = 0,
ClientID = 0, ClientID = 0,
item.CurrencyId, item.CurrencyId,
WBMoney = Money, WBMoney = Money,
PayDate = DateTime.Now.ToString("yyyy-MM-dd"), PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
Config.RB_Branch_Id, RB_Branch_Id= Config.ExpendBranchId,
TemplateId = item.WorkFlowId, TemplateId = item.WorkFlowId,
OrderSource = 16, OrderSource = 16,
OtherType = 14, OtherType = 14,
......
...@@ -2085,14 +2085,14 @@ namespace Mall.Module.User ...@@ -2085,14 +2085,14 @@ namespace Mall.Module.User
item.IsPublic = 5;//默认平台虚拟账户 item.IsPublic = 5;//默认平台虚拟账户
var financeObj = new var financeObj = new
{ {
CreateBy = Config.NetworkDirector, CreateBy = Config.ExpendDirector,
item.IsPublic, item.IsPublic,
ClientType = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("FinanceSetting")["RemitTypeId"]), ClientType = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("FinanceSetting")["RemitTypeId"]),
ClientID = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("FinanceSetting")["RemitAccountId"]), ClientID = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("FinanceSetting")["RemitAccountId"]),
item.CurrencyId, item.CurrencyId,
WBMoney = Money, WBMoney = Money,
PayDate = DateTime.Now.ToString("yyyy-MM-dd"), PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
Config.RB_Branch_Id, RB_Branch_Id= Config.ExpendBranchId,
TemplateId = item.WorkFlowId, TemplateId = item.WorkFlowId,
OrderSource = 16, OrderSource = 16,
OtherType = 11, OtherType = 11,
......
...@@ -319,13 +319,13 @@ namespace Mall.WebApi.Controllers.User ...@@ -319,13 +319,13 @@ namespace Mall.WebApi.Controllers.User
}); });
var financeObj = new var financeObj = new
{ {
CreateBy = Config.NetworkDirector, CreateBy = Config.ExpendDirector,
IsPublic = demodel.IsPublic,// supplierModel.ClientBankAccount.AccountType, //financeConfigurineModel.AccountType, IsPublic = demodel.IsPublic,// supplierModel.ClientBankAccount.AccountType, //financeConfigurineModel.AccountType,
ClientType = supplierModel.ClientBankAccount.Type, ClientType = supplierModel.ClientBankAccount.Type,
ClientID = supplierModel.BankAccountId, ClientID = supplierModel.BankAccountId,
CurrencyId = financeConfigurineModel.CurrencyId, CurrencyId = financeConfigurineModel.CurrencyId,
WBMoney = result.Sum(x => ((x.CostMoney ?? 0) * (x.Number ?? 0)) + (x.FreightCostMoney ?? 0)), WBMoney = result.Sum(x => ((x.CostMoney ?? 0) * (x.Number ?? 0)) + (x.FreightCostMoney ?? 0)),
RB_Branch_Id = Config.RB_Branch_Id, RB_Branch_Id = Config.ExpendBranchId,
PayDate = System.DateTime.Now.ToString("yyyy-MM-dd"), PayDate = System.DateTime.Now.ToString("yyyy-MM-dd"),
TemplateId = financeConfigurineModel.WorkFlowId, TemplateId = financeConfigurineModel.WorkFlowId,
OrderSource = 16, OrderSource = 16,
......
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