后台块钱查询补全

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -52,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 交易记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(TradeRecord data, string right, string BrandId, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string BankCardTypeSelect, string MerBuddyTypeSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(TradeRecord data, string right, string BrandId, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string MerNo, string SnNo, string BankCardTypeSelect, string MerBuddyTypeSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -102,6 +102,16 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and MerUserId in (select UserId from UserForRealName where RealName='" + MerRealName + "')";
             }
+            //快钱商户编号
+            if (!string.IsNullOrEmpty(MerNo))
+            {
+                condition += " and MerNo='" + MerNo + "'";
+            }
+            //块钱SN号
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                condition += " and SnNo='" + SnNo + "'";
+            }
             //银行卡类型
             if(!string.IsNullOrEmpty(BankCardTypeSelect))
             {
@@ -154,19 +164,20 @@ namespace MySystem.Areas.Admin.Controllers
                 if(MerBuddyType == 1) dic["MerBuddyType"] = "商户型创客";
                 //银行卡类型
                 int BankCardType = int.Parse(dic["BankCardType"].ToString());
-                if(BankCardType == 0) dic["BankCardType"] = "贷记卡";
-                if(BankCardType == 1) dic["BankCardType"] = "借记卡";
+                if(BankCardType == 0) dic["BankCardType"] = "借记卡";
+                if(BankCardType == 1) dic["BankCardType"] = "贷记卡";
+                if(BankCardType == 2) dic["BankCardType"] = "准贷记卡";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             
             string TotalTrade0 = "0.00";//贷记卡交易总额
             string TotalTrade1 = "0.00";//借记卡交易总额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=0" + condition);
+            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 TotalTrade0 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
             }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=1" + condition);
+            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=0" + condition);
             if (dt.Rows.Count > 0)
             {
                 TotalTrade1 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");