押金金额格式调整

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -168,6 +168,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreIdName"] = storeid_StoreHouse.StoreName;
                 dic.Remove("StoreId");
                 //产品类型
+                var BId = int.Parse(dic["BrandId"].ToString());
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
                 //参加活动
                 dic["ActivityList"] = RelationClass.GetProfitObjectsActivesList(dic["ActivityList"].ToString());
@@ -202,7 +203,8 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //实际押金
                 string SeoKeyword = dic["SeoKeyword"].ToString();
-                if (SeoKeyword.Length > 3)
+                var brand = db.KqProducts.FirstOrDefault(m => m.Id == BId) ?? new KqProducts();
+                if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(SeoKeyword))
                 {
                     SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                 }
@@ -846,6 +848,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreIdName"] = storeid_StoreHouse.StoreName;
                 dic.Remove("StoreId");
                 //产品类型
+                var BId = int.Parse(dic["BrandId"].ToString());
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
                 decimal ScanQrTrade = decimal.Parse(dic["ScanQrTrade"].ToString());
                 var brandInfo = dic["BrandId"].ToString();
@@ -904,7 +907,8 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //实际押金
                 string SeoKeyword = dic["SeoKeyword"].ToString();
-                if (SeoKeyword.Length > 2)
+                var brand = db.KqProducts.FirstOrDefault(m => m.Id == BId) ?? new KqProducts();
+                if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(SeoKeyword))
                 {
                     SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                 }

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -557,10 +557,11 @@ namespace MySystem.Areas.Admin.Controllers
                 foreach (DataRow item in dt.Rows)
                 {
                     var BindMerchantId = item["BindMerchantId"].ToString();
-                    var BrandId = item["BrandId"].ToString();
+                    var BrandId = int.Parse(item["BrandId"].ToString());
                     var PosSn = item["PosSn"].ToString();
                     var SeoKeyword = item["SeoKeyword"].ToString();
-                    if (BrandId != "2" && BrandId != "7")
+                    var brand = db.KqProducts.FirstOrDefault(m => m.Id == BrandId) ?? new KqProducts();
+                    if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(SeoKeyword))
                     {
                         SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                     }
@@ -647,10 +648,11 @@ namespace MySystem.Areas.Admin.Controllers
                 foreach (DataRow item in dt.Rows)
                 {
                     var BindMerchantId = item["BindMerchantId"].ToString();
-                    var BrandId = item["BrandId"].ToString();
+                    var BrandId = int.Parse(item["BrandId"].ToString());
                     var PosSn = item["PosSn"].ToString();
                     var SeoKeyword = item["SeoKeyword"].ToString();
-                    if (BrandId != "2" && BrandId != "7")
+                    var brand = db.KqProducts.FirstOrDefault(m => m.Id == BrandId) ?? new KqProducts();
+                    if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(SeoKeyword))
                     {
                         SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                     }