调整提现板块显示问题

Areas/Admin/Controllers/CashServer/WithdrawRecordController.cs

@@ -83,17 +83,28 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 //订单状态
                 int TradeStatus = int.Parse(dic["TradeStatus"].ToString());
-                if (TradeStatus == 0) dic["TradeStatusName"] = "初始化";
-                if (TradeStatus == 1) dic["TradeStatusName"] = "未审核,待打款";
-                if (TradeStatus == 2) dic["TradeStatusName"] = "审核通过,待打款";
-                if (TradeStatus == 3) dic["TradeStatusName"] = "审核不通过,已解冻";
-                if (TradeStatus == 4) dic["TradeStatusName"] = "冻结失败(预留)";
-                if (TradeStatus == 5) dic["TradeStatusName"] = "代付成功";
-                if (TradeStatus == 6) dic["TradeStatusName"] = "代付失败,待核实";
-                if (TradeStatus == 7) dic["TradeStatusName"] = "代付失败,已解冻";
-                if (TradeStatus == 8) dic["TradeStatusName"] = "代付处理中";
-                //代付渠道
-                dic["CashChannel"] = "云汇算";
+                string CashChannel = dic["CashChannel"].ToString();
+                if(CashChannel == "云汇算")
+                {
+                    if (TradeStatus == 0) dic["TradeStatusName"] = "初始化";
+                    if (TradeStatus == 1) dic["TradeStatusName"] = "未审核,待打款";
+                    if (TradeStatus == 2) dic["TradeStatusName"] = "审核通过,待打款";
+                    if (TradeStatus == 3) dic["TradeStatusName"] = "审核不通过,已解冻";
+                    if (TradeStatus == 4) dic["TradeStatusName"] = "冻结失败(预留)";
+                    if (TradeStatus == 5) dic["TradeStatusName"] = "代付成功";
+                    if (TradeStatus == 6) dic["TradeStatusName"] = "代付失败,待核实";
+                    if (TradeStatus == 7) dic["TradeStatusName"] = "代付失败,已解冻";
+                    if (TradeStatus == 8) dic["TradeStatusName"] = "代付处理中";
+                }
+                else if(CashChannel == "金控")
+                {
+                    if (TradeStatus == 0) dic["TradeStatusName"] = "进行中";
+                    if (TradeStatus == 1) dic["TradeStatusName"] = "处理中";
+                    if (TradeStatus == 2) dic["TradeStatusName"] = "成功";
+                    if (TradeStatus == 3) dic["TradeStatusName"] = "失败";
+                    if (TradeStatus == 4) dic["TradeStatusName"] = "取消";
+                    if (TradeStatus == 10) dic["TradeStatusName"] = "可疑";
+                }
 
             }
             return Json(obj);
@@ -335,23 +346,28 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 //订单状态
                 int TradeStatus = int.Parse(dic["TradeStatus"].ToString());
-                if (TradeStatus == 0) dic["TradeStatus"] = "初始化";
-                if (TradeStatus == 1) dic["TradeStatus"] = "未审核,待打款";
-                if (TradeStatus == 2) dic["TradeStatus"] = "审核通过,待打款";
-                if (TradeStatus == 3) dic["TradeStatus"] = "审核不通过,已解冻";
-                if (TradeStatus == 4) dic["TradeStatus"] = "冻结失败(预留)";
-                if (TradeStatus == 5) dic["TradeStatus"] = "代付成功";
-                if (TradeStatus == 6) dic["TradeStatus"] = "代付失败,待核实";
-                if (TradeStatus == 7) dic["TradeStatus"] = "代付失败,已解冻";
-                if (TradeStatus == 8) dic["TradeStatus"] = "代付处理中";
-                //代付渠道
                 string CashChannel = dic["CashChannel"].ToString();
-                if (CashChannel == "CloudAcc") dic["CashChannel"] = "云账户";
-                if (CashChannel == "KuaiQian") dic["CashChannel"] = "快钱";
-                if (CashChannel == "CloudPay") dic["CashChannel"] = "云银付";
-                if (CashChannel == "CloudPayAF") dic["CashChannel"] = "安福灵新";
-                if (CashChannel == "JuHeBa") dic["CashChannel"] = "聚合吧云慧算";
-                if (CashChannel == "") dic["CashChannel"] = "";
+                if(CashChannel == "云汇算")
+                {
+                    if (TradeStatus == 0) dic["TradeStatus"] = "初始化";
+                    if (TradeStatus == 1) dic["TradeStatus"] = "未审核,待打款";
+                    if (TradeStatus == 2) dic["TradeStatus"] = "审核通过,待打款";
+                    if (TradeStatus == 3) dic["TradeStatus"] = "审核不通过,已解冻";
+                    if (TradeStatus == 4) dic["TradeStatus"] = "冻结失败(预留)";
+                    if (TradeStatus == 5) dic["TradeStatus"] = "代付成功";
+                    if (TradeStatus == 6) dic["TradeStatus"] = "代付失败,待核实";
+                    if (TradeStatus == 7) dic["TradeStatus"] = "代付失败,已解冻";
+                    if (TradeStatus == 8) dic["TradeStatus"] = "代付处理中";
+                }
+                else if(CashChannel == "金控")
+                {
+                    if (TradeStatus == 0) dic["TradeStatus"] = "进行中";
+                    if (TradeStatus == 1) dic["TradeStatus"] = "处理中";
+                    if (TradeStatus == 2) dic["TradeStatus"] = "成功";
+                    if (TradeStatus == 3) dic["TradeStatus"] = "失败";
+                    if (TradeStatus == 4) dic["TradeStatus"] = "取消";
+                    if (TradeStatus == 10) dic["TradeStatus"] = "可疑";
+                }
 
             }
 

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -157,7 +157,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 int QueryCount = int.Parse(dic["QueryCount"].ToString());
                 if (QueryCount == 0) dic["LockName"] = "待提交";
-                if (QueryCount == 1) dic["LockName"] = "已提交";
+                if (QueryCount > 0) dic["LockName"] = "已提交";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();