Sfoglia il codice sorgente

人工已退商户押金修复

DuGuYang 3 anni fa
parent
commit
013f9c0968

+ 8 - 5
Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -262,12 +262,15 @@ namespace MySystem.Areas.Admin.Controllers
                 var KqSnNo = dic["KqSnNo"].ToString();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
                 //实际押金
-                string SeoKeyword = pos.SeoKeyword.ToString();
-                if (SeoKeyword.Length > 3)
+                string SeoKeyword = "0";
+                if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 {
-                    SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
+                    if (SeoKeyword.Length > 3)
+                    {
+                        SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
+                    }
+                    ReturnAmounts += decimal.Parse(SeoKeyword);
                 }
-                ReturnAmounts += decimal.Parse(SeoKeyword);
                 dic["SeoKeyword"] = SeoKeyword;
 
                 //设置押金
@@ -779,7 +782,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 JsonData dr = list[i];
                 string KqMerNo = dr[0].ToString(); // 商户编号
-                string Amount = dr[0].ToString(); // 已退金额
+                string Amount = dr[1].ToString(); // 已退金额
                 var posMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == KqMerNo) ?? new PosMerchantInfo();
                 posMerchantInfo.StandardStatus = -2;
                 posMerchantInfo.Remark = Amount;