Skip to content

M
mall.oytour.com
Commit e21aa283 authored by 吴春's avatar 吴春
Browse files
Options

解决冲突

parents b1cafb67 2ef40262
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 17 deletions
Mall.Module.Product/OrderModule.cs
View file @ e21aa283
......@@ -5035,13 +5035,13 @@ namespace Mall.Module.Product
try
{
decimal Money = dmodel.Refund ?? 0;
decimal Rate = Convert.ToDecimal(Config.SettlementRate);
decimal Fee = 0;
if (Rate > 0)
{
Fee = Math.Round(Money * Rate / 1000, 2, MidpointRounding.AwayFromZero);
Money -= Fee;
}
//decimal Rate = Convert.ToDecimal(Config.SettlementRate);
//decimal Fee = 0;
//if (Rate > 0)
//{
// Fee = Math.Round(Money * Rate / 1000, 2, MidpointRounding.AwayFromZero);
// Money -= Fee;
//}
//查询用户
var umodel = member_UserRepository.GetEntity(dmodel.UserId);
if (umodel == null) { return false; }
......@@ -5050,7 +5050,7 @@ namespace Mall.Module.Product
//先查询规则
var financeConfigurineList = financeConfigurineRepository.GetList(new Model.Extend.Finance.RB_Finance_Configurine_Extend { Type = 3 });
string dstr = "已收货，客人付款:" + (dmodel.Income ?? 0) + "金额，申请退款:" + (dmodel.Refund ?? 0) + "，手续费:" + Fee;
string dstr = "已收货，客人付款:" + (dmodel.Income ?? 0) + "金额，申请退款:" + (dmodel.Refund ?? 0);
if (financeConfigurineList != null && financeConfigurineList.Any())
{
var item = financeConfigurineList.FirstOrDefault();
......@@ -6073,21 +6073,22 @@ namespace Mall.Module.Product
var flag = false;
try
{
decimal Rate = Convert.ToDecimal(Config.SettlementRate);
//decimal Rate = Convert.ToDecimal(Config.SettlementRate);
decimal Money = omodel.Income ?? 0;
decimal Fee = 0;
if (Rate > 0)
{
Fee = Math.Round(Money * Rate / 1000, 2, MidpointRounding.AwayFromZero);
Money -= Fee;
}
//decimal Fee = 0;
//if (Rate > 0) {
// Fee = Math.Round(Money * Rate / 1000, 2, MidpointRounding.AwayFromZero);
// Money -= Fee;
//}
//查询用户
var umodel = member_UserRepository.GetEntity(omodel.UserId);
if (umodel == null) { return false; }
//先查询规则
var financeConfigurineList = financeConfigurineRepository.GetList(new Model.Extend.Finance.RB_Finance_Configurine_Extend { Type = 3 });
string dstr = "客人付款:" + (omodel.Income ?? 0) + "金额，退款:" + (omodel.Income ?? 0) + "，手续费:" + Fee;
//string dstr = "客人付款:" + (omodel.Income ?? 0) + "金额，退款:" + (omodel.Income ?? 0) + "，手续费:" + Fee;
string dstr = "客人付款:" + (omodel.Income ?? 0) + "金额，退款:" + (omodel.Income ?? 0);
if (financeConfigurineList != null && financeConfigurineList.Any())
{
var item = financeConfigurineList.FirstOrDefault();
......@@ -6813,7 +6814,14 @@ namespace Mall.Module.Product
oeList = goods_OrderExpressRepository.GetList(new RB_Goods_OrderExpress_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderExpressIds = string.Join(",", erlist.Select(x => x.OrderExpressId)) });
foreach (var item in oeList)
{
item.ExpressName = logistics_ExpressRepository.GetEntity(item.ExpressId)?.Name ?? "";
if (item.Type == 1)
{
item.ExpressName = logistics_ExpressRepository.GetEntity(item.ExpressId)?.Name ?? "";
}
else
{
item.ExpressName = item.Remark;
}
}
}
......
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