|
@@ -168,6 +168,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
|
|
|
|
|
#region 根据条件查询人工已退商户列表
|
|
#region 根据条件查询人工已退商户列表
|
|
|
|
|
|
|
|
|
|
+
|
|
|
/// <summary>
|
|
/// <summary>
|
|
|
/// 人工已退商户列表
|
|
/// 人工已退商户列表
|
|
|
/// </summary>
|
|
/// </summary>
|
|
@@ -266,7 +267,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string SeoKeyword = "0";
|
|
string SeoKeyword = "0";
|
|
|
if (!string.IsNullOrEmpty(pos.SeoKeyword))
|
|
if (!string.IsNullOrEmpty(pos.SeoKeyword))
|
|
|
{
|
|
{
|
|
|
- if (pos.SeoKeyword.Length > 3)
|
|
|
|
|
|
|
+ if (pos.BrandId != 2 && pos.BrandId != 7)
|
|
|
{
|
|
{
|
|
|
SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
|
|
SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
|
|
|
}
|
|
}
|
|
@@ -302,7 +303,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
|
|
var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
|
|
|
if (!string.IsNullOrEmpty(pos.SeoKeyword))
|
|
if (!string.IsNullOrEmpty(pos.SeoKeyword))
|
|
|
{
|
|
{
|
|
|
- if (pos.SeoKeyword.Length > 3)
|
|
|
|
|
|
|
+ if (pos.BrandId != 2 && pos.BrandId != 7)
|
|
|
{
|
|
{
|
|
|
ReturnAmounts += decimal.Parse(pos.SeoKeyword) / 100;
|
|
ReturnAmounts += decimal.Parse(pos.SeoKeyword) / 100;
|
|
|
}
|
|
}
|