提交

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -102,13 +102,13 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("UserId");
 
                 //实际返还金额
-                var amt = int.Parse(function.CheckInt(dic["ReturnAmount"].ToString()));
-                dic["fReturnAmount"] = amt * 0.92;
+                decimal amt = decimal.Parse(dic["ReturnAmount"].ToString());
+                dic["ReturnAmounts"] = (amt * 0.92M).ToString("f2");
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            decimal ReturnAmount = 0;
-            decimal fReturnAmount = 0;
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(ReturnAmount),SUM(ReturnAmount*0.92) FROM MerchantDepositReturns WHERE Status>-1" + condition);
+            decimal ReturnAmount = 0.00M;
+            decimal fReturnAmount = 0.00M;
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(ReturnAmount),SUM(ReturnAmount*0.92) FROM MerchantDepositReturns WHERE 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 ReturnAmount = decimal.Parse(dt.Rows[0][0].ToString());
@@ -196,13 +196,13 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("UserId");
 
                 //实际返还金额
-                var amt = int.Parse(function.CheckInt(dic["ReturnAmount"].ToString()));
-                dic["fReturnAmount"] = amt * 0.92;
+                decimal amt = decimal.Parse(dic["ReturnAmount"].ToString());
+                dic["ReturnAmounts"] = (amt * 0.92M).ToString("f2");
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            decimal ReturnAmount = 0;
-            decimal fReturnAmount = 0;
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(ReturnAmount),SUM(ReturnAmount*0.92) FROM MerchantDepositReturns WHERE Status>-1" + condition);
+            decimal ReturnAmount = 0.00M;
+            decimal fReturnAmount = 0.00M;
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(ReturnAmount),SUM(ReturnAmount*0.92) FROM MerchantDepositReturns WHERE 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 ReturnAmount = decimal.Parse(dt.Rows[0][0].ToString());

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -280,7 +280,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and b.MerIdcardNo like '%" + MerIdcardNo + "%'";
             }
-
+            var amount = 0.00M;
             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);
             if (dt.Rows.Count > 0)
@@ -295,6 +295,7 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                     }
+                    amount += decimal.Parse(SeoKeyword);
                     var KqMerNo = item["KqMerNo"].ToString();
                     var IdcardNo = item["MerIdcardNo"].ToString();
                     var MerchantName = item["MerchantName"].ToString();
@@ -312,6 +313,12 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             Dictionary<string, object> obj = new Dictionary<string, object>();
+            Dictionary<string, object> other = new Dictionary<string, object>();
+            var ReturnAmount = amount;
+            var fReturnAmount = amount * 0.92M;
+            other.Add("ReturnAmount", ReturnAmount.ToString("f2"));
+            other.Add("fReturnAmount", fReturnAmount.ToString("f2"));
+            obj.Add("other", other);
             obj.Add("code", 0);
             obj.Add("msg", "");
             obj.Add("count", diclist.Count);
@@ -363,7 +370,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and b.MerIdcardNo like '%" + MerIdcardNo + "%'";
             }
-
+            var amount = 0.00M;
             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);
             if (dt.Rows.Count > 0)
@@ -378,6 +385,7 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
                     }
+                    amount += decimal.Parse(SeoKeyword);
                     var KqMerNo = item["KqMerNo"].ToString();
                     var IdcardNo = item["MerIdcardNo"].ToString();
                     var MerchantName = item["MerchantName"].ToString();
@@ -395,6 +403,12 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             Dictionary<string, object> obj = new Dictionary<string, object>();
+            Dictionary<string, object> other = new Dictionary<string, object>();
+            var ReturnAmount = amount;
+            var fReturnAmount = amount * 0.92M;
+            other.Add("ReturnAmount", ReturnAmount.ToString("f2"));
+            other.Add("fReturnAmount", fReturnAmount.ToString("f2"));
+            obj.Add("other", other);
             obj.Add("code", 0);
             obj.Add("msg", "");
             obj.Add("count", diclist.Count);

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

@@ -86,7 +86,9 @@
                     </div>
                 </div>
             </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>
             <div class="layui-card-body">
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
             </div>

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

@@ -86,7 +86,9 @@
                     </div>
                 </div>
             </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>
             <div class="layui-card-body">
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
             </div>

wwwroot/layuiadmin/modules_main/MerchantDepositReturns_Admin.js

@@ -104,7 +104,7 @@ layui.config({
             , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
             , { field: 'ReturnAmount', width: 200, title: '返还金额', sort: true }
-            , { field: 'fReturnAmount', width: 200, title: '实际返还金额', sort: true }
+            , { field: 'ReturnAmounts', width: 200, title: '实际返还金额', sort: true }
 
             // , { title: '操作', align: 'center', width: 400, fixed: 'right', toolbar: '#table-list-tools' }
         ]]

wwwroot/layuiadmin/modules_main/MerchantDepositReturnsn_Admin.js

@@ -104,7 +104,7 @@ layui.config({
             , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
             , { field: 'ReturnAmount', width: 200, title: '返还金额', sort: true }
-            , { field: 'fReturnAmount', width: 200, title: '实际返还金额', sort: true }
+            , { field: 'ReturnAmounts', width: 200, title: '实际返还金额', sort: true }
 
             // , { title: '操作', align: 'center', width: 400, fixed: 'right', toolbar: '#table-list-tools' }
         ]]

wwwroot/layuiadmin/modules_main/PosMerchantInfofsList_Admin.js

@@ -134,6 +134,8 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
+            $("#ReturnAmount").text(res.other.ReturnAmount);
+            $("#fReturnAmount").text(res.other.fReturnAmount);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/PosMerchantInfonfsList_Admin.js

@@ -134,6 +134,8 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
+            $("#ReturnAmount").text(res.other.ReturnAmount);
+            $("#fReturnAmount").text(res.other.fReturnAmount);
             $(".layui-none").text("无数据");
         }
     });