|
|
@@ -2517,7 +2517,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
var error = "";
|
|
|
//实际押金
|
|
|
- string SeoKeyword = "0";
|
|
|
Dictionary<string, object> errorInfo = new Dictionary<string, object>();
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
if (string.IsNullOrEmpty(PosSns) && string.IsNullOrEmpty(MerNos))
|
|
|
@@ -2537,6 +2536,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string[] PosSnsList = PosSns.Replace("\r", "").Replace("\n", ",").Replace(" ", ",").Split(',');
|
|
|
foreach (string PosSn in PosSnsList)
|
|
|
{
|
|
|
+ string SeoKeyword = "0";
|
|
|
Dictionary<string, object> data = new Dictionary<string, object>();
|
|
|
var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
|
|
|
if (pos.Id > 0)
|
|
|
@@ -2555,7 +2555,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
var brand = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId) ?? new KqProducts();
|
|
|
if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(pos.SeoKeyword))
|
|
|
{
|
|
|
- SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
|
|
|
+ SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -2620,6 +2620,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string[] MerNosList = MerNos.Replace("\r", "").Replace("\n", ",").Replace(" ", ",").Split(',');
|
|
|
foreach (string MerNo in MerNosList)
|
|
|
{
|
|
|
+ string SeoKeyword = "0";
|
|
|
Dictionary<string, object> data = new Dictionary<string, object>();
|
|
|
var mer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo) ?? new PosMerchantInfo();
|
|
|
if (mer.Id > 0)
|
|
|
@@ -2638,7 +2639,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
var brand = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId) ?? new KqProducts();
|
|
|
if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(pos.SeoKeyword))
|
|
|
{
|
|
|
- SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
|
|
|
+ SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
|
|
|
}
|
|
|
else
|
|
|
{
|
DuGuYang