调整完成

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -108,7 +108,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> other = new Dictionary<string, object>();
             var ReturnAmount = "0";
             var fReturnAmount = "0";
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(ReturnAmount),SUM(ReturnAmount*0.92) FROM MerchantDepositReturns" + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(ReturnAmount),SUM(ReturnAmount*0.92) FROM MerchantDepositReturns WHERE Status>-1" + condition);
             if (dt.Rows.Count > 0)
             {
                 ReturnAmount = dt.Rows[0][0].ToString();
@@ -116,6 +116,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             other.Add("ReturnAmount", ReturnAmount);
             other.Add("fReturnAmount", fReturnAmount);
+            obj.Add("other", other);
             return Json(obj);
         }
 

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -282,7 +282,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
             List<Dictionary<string, object>> diclist = new List<Dictionary<string, object>>();
-            DataTable dt = OtherMySqlConn.dtable("SELECT a.BrandId,a.PosSn,a.BindMerchantId,a.SeoKeyword,b.KqMerNo,b.MerIdcardNo,b.MerchantName,b.MerchantMobile FROM PosMachinesTwo a,PosMerchantInfo b WHERE a.`Status`>-1 AND a.SeoKeyword!='' AND a.SeoKeyword!=0 AND a.SeoKeyword IS NOT NULL AND a.IsFirst=1 AND b.StandardMonths=10 AND b.StandardStatus=4 AND a.BindMerchantId=b.Id " + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT a.BrandId,a.PosSn,a.BindMerchantId,a.SeoKeyword,b.KqMerNo,b.MerIdcardNo,b.MerchantName,b.MerchantMobile FROM PosMachinesTwo a,PosMerchantInfo b WHERE a.`Status`>-1 AND a.SeoKeyword!='' AND a.SeoKeyword!='0' AND a.SeoKeyword IS NOT NULL AND a.IsFirst=1 AND b.StandardMonths=10 AND b.StandardStatus=4 AND a.BindMerchantId=b.Id " + condition);
             if (dt.Rows.Count > 0)
             {
                 foreach (DataRow item in dt.Rows)
@@ -365,7 +365,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
             List<Dictionary<string, object>> diclist = new List<Dictionary<string, object>>();
-            DataTable dt = OtherMySqlConn.dtable("SELECT a.BrandId,a.PosSn,a.BindMerchantId,a.SeoKeyword,b.KqMerNo,b.MerIdcardNo,b.MerchantName,b.MerchantMobile FROM PosMachinesTwo a,PosMerchantInfo b WHERE a.`Status`>-1 AND a.SeoKeyword!='' AND a.SeoKeyword!=0 AND a.SeoKeyword IS NOT NULL  AND a.IsFirst=0 AND b.StandardMonths=10 AND b.StandardStatus=4 AND a.BindMerchantId=b.Id " + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT a.BrandId,a.PosSn,a.BindMerchantId,a.SeoKeyword,b.KqMerNo,b.MerIdcardNo,b.MerchantName,b.MerchantMobile FROM PosMachinesTwo a,PosMerchantInfo b WHERE a.`Status`>-1 AND a.SeoKeyword!='' AND a.SeoKeyword!='0' AND a.SeoKeyword IS NOT NULL  AND a.IsFirst=0 AND b.StandardMonths=10 AND b.StandardStatus=4 AND a.BindMerchantId=b.Id " + condition);
             if (dt.Rows.Count > 0)
             {
                 foreach (DataRow item in dt.Rows)

Areas/Admin/Views/MainServer/MerchantDepositReturns/Index.cshtml

@@ -124,11 +124,10 @@
                         <button class="layui-btn" data-type="Cash"><i
                             class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到代付平台</button>
                     }
-                    <blockquote class="layui-elem-quote layui-text">
-                        退押总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　实际总金额：<span style="color: #f00;" id="fReturnAmount">0.00</span>
-                    </blockquote>
                 </div>
-
+                <blockquote class="layui-elem-quote layui-text">
+                    退押总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　实际总金额：<span style="color: #f00;" id="fReturnAmount">0.00</span>
+                </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))