显示问题修复

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -287,12 +287,12 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["PrizeParams"] = PrizeParams;
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            decimal ReturnAmounts = 0.00M;
-            decimal ReturnAmount = 0.00M;
+            decimal ReturnAmount = 0.00M;//服务费总金额
+            decimal ReturnAmounts = 0.00M;//退还总金额
             DataTable dt = OtherMySqlConn.dtable("SELECT SUM(Remark) FROM PosMerchantInfo WHERE 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
-                ReturnAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+                ReturnAmounts = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
             }
             DataTable dts = OtherMySqlConn.dtable("SELECT KqSnNo FROM PosMerchantInfo WHERE 1=1" + condition);
             if (dt.Rows.Count > 0)
@@ -303,13 +303,13 @@ namespace MySystem.Areas.Admin.Controllers
                     var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
                     if (!string.IsNullOrEmpty(pos.SeoKeyword))
                     {
-                        if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11)
+                        if (pos.BrandId != 2 && pos.BrandId != 7)
                         {
-                            ReturnAmounts += decimal.Parse(pos.SeoKeyword) / 100;
+                            ReturnAmount += decimal.Parse(pos.SeoKeyword) / 100;
                         }
                         else
                         {
-                            ReturnAmounts += decimal.Parse(pos.SeoKeyword);
+                            ReturnAmount += decimal.Parse(pos.SeoKeyword);
                         }
                     }
                 }

Areas/Admin/Views/MainServer/PosMerchantInfoList/Indexrg.cshtml

@@ -93,7 +93,7 @@
                         }
                     </div>
                     <blockquote class="layui-elem-quote layui-text">
-                        服务费总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　达标奖总金额：<span style="color: #f00;" id="ReturnAmounts">0.00</span>
+                        服务费总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　退还总金额：<span style="color: #f00;" id="ReturnAmounts">0.00</span>
                     </blockquote>
                 </div>
             </div>

wwwroot/layuiadmin/modules_main/PosMerchantInforgList_Admin.js

@@ -126,7 +126,7 @@ layui.config({
             , { field: 'KqSnNo', width: 220, title: '机具SN号', sort: true }
             , { field: 'SeoKeyword', width: 220, title: '服务费', sort: true }
             // , { field: 'PrizeParams', width: 220, title: '设置押金', sort: true }
-            , { field: 'Remark', width: 220, title: '达标奖', sort: true }
+            , { field: 'Remark', width: 220, title: '　退还金额：', sort: true }
         ]]
         , where: {
         }