修复查询问题

Areas/Api/Controllers/v1/Main1/ConsumerOrdersController.cs

@@ -48,7 +48,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string condition = "";
             if (!string.IsNullOrEmpty(data["MerchantName"].ToString()))
             {
-                condition += " and MerchantName='" + MerchantName + "'";
+                var merAddInfo = MerchantAddInfoService.Query(" and CertMerchantName=" + MerchantName + "");
+                condition += " and MerchantId='" + merAddInfo.Id + "'";
             }
             if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))
             {

Areas/Api/Controllers/v1/Main1/MerchantInfoController.cs

@@ -28,34 +28,57 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = DirectQualifiedMerchantsDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = DirectQualifiedMerchantsDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> DirectQualifiedMerchantsDo(string value)
+        private List<Dictionary<string, object>> DirectQualifiedMerchantsDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantName = data["MerchantName"].ToString(); //商户名称
-            string MctNo = data["MctNo"].ToString(); //商户号
+            string AliPID = data["AliPID"].ToString(); //支付宝PID
+            string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
+            if (!string.IsNullOrEmpty(MerchantName))
+            {
+                condition += " and Name='" + MerchantName + "'";
+            }
+            if (!string.IsNullOrEmpty(AliPID))
+            {
+                var merAddInfo = MerchantAddInfoService.Query(" and AlipayPid=" + AliPID + "");
+                condition += " and Id=" + merAddInfo.Id + "";
+            }
+            if (!string.IsNullOrEmpty(WeChatNo))
+            {
+                var merAddInfo = MerchantAddInfoService.Query(" and SubMchid=" + WeChatNo + "");
+                condition += " and Id=" + merAddInfo.Id + "";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = MerchantInfoService.List(relationData, condition, pageNum, pageSize);
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = MerchantInfoService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("", subdata[""].ToString()); //
-                curData.Add("Id", subdata["Id"].ToString()); //Id
-                curData.Add("MerchantName", ""); //商户名称
-                curData.Add("MctNo", ""); //商户号
-                curData.Add("UpdateDate", ""); //激活时间
-                curData.Add("PayMode", ""); //支付方式(1 支付宝 2 微信)
-                curData.Add("Status", ""); //达标状态(-1 未参与 0 考核中 1 已通过 2 未通过 101 待领取 100 已领取 99 发放中)
-                curData.Add("Months", ""); //达标月数
-
+                var MerchantId = int.Parse(subdata["Id"].ToString());
+                var merAddInfo = MerchantAddInfoService.Query(MerchantId);
+                var Status = -1;
+                var order = MerchantDepositOrderService.Query(" and Status>0 and MerchantId=" + MerchantId + "");
+                if (order.Id > 0) Status = int.Parse(subdata["Status"].ToString());
+                curData.Add("Id", MerchantId); //Id
+                curData.Add("MerchantName", subdata["Id"].ToString()); //商户名称
+                curData.Add("AliPID", merAddInfo.AlipayPid); //支付宝PID
+                curData.Add("WeChatNo", merAddInfo.SubMchid); //微信商户号
+                curData.Add("UpdateDate", order.UpdateDate.ToString() == null ? "" : DateTime.Parse(order.UpdateDate.ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                curData.Add("PayMode", order.Sort); //支付方式(1 支付宝 2 微信)
+                curData.Add("Status", Status); //达标状态(-1 未参与 0 考核中 1 已通过 2 未通过 101 待领取 100 已领取 99 发放中)
+                curData.Add("Months", subdata["Months"].ToString()); //达标月数
                 dataList.Add(curData);
             }
+            Other.Add("Count", count); //总数
             return dataList;
         }
         #endregion

Areas/Api/Controllers/v1/Main2/ConsumerOrdersController.cs

@@ -48,7 +48,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string condition = "";
             if (!string.IsNullOrEmpty(data["MerchantName"].ToString()))
             {
-                condition += " and MerchantName='" + MerchantName + "'";
+                var merAddInfo = MerchantAddInfoService.Query(" and CertMerchantName=" + MerchantName + "");
+                condition += " and MerchantId='" + merAddInfo.Id + "'";
             }
             if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))
             {

Areas/Api/Controllers/v1/Main2/MerchantInfoController.cs

@@ -28,10 +28,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = UnionPayQualifiedMerchantsDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = UnionPayQualifiedMerchantsDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> UnionPayQualifiedMerchantsDo(string value)
+        private List<Dictionary<string, object>> UnionPayQualifiedMerchantsDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantName = data["MerchantName"].ToString(); //商户名称
@@ -39,22 +40,39 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
+            if (!string.IsNullOrEmpty(MerchantName))
+            {
+                condition += " and Name='" + MerchantName + "'";
+            }
+            if (!string.IsNullOrEmpty(MctNo))
+            {
+                var merAddInfo = MerchantAddInfoService.Query(" and MchtNo=" + MctNo + "");
+                condition += " and Id=" + merAddInfo.Id + "";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = MerchantInfoService.List(relationData, condition, pageNum, pageSize);
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = MerchantInfoService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Id", subdata["Id"].ToString()); //Id
-                curData.Add("MerchantName", ""); //商户名称
-                curData.Add("MctNo", ""); //商户号
-                curData.Add("UpdateDate", ""); //激活时间
-                curData.Add("PayMode", ""); //支付方式(1 支付宝 2 微信)
-                curData.Add("Status", ""); //达标状态(-1 未参与 0 考核中 1 已通过 2 未通过 101 待领取 100 已领取 99 发放中)
-                curData.Add("Months", ""); //达标月数
+                var MerchantId = int.Parse(subdata["Id"].ToString());
+                var merAddInfo = MerchantAddInfoService.Query(MerchantId);
+                var Status = -1;
+                var order = MerchantDepositOrderService.Query(" and Status>0 and MerchantId=" + MerchantId + "");
+                if (order.Id > 0) Status = int.Parse(subdata["Status"].ToString());
+                curData.Add("Id", MerchantId); //Id
+                curData.Add("MerchantName", subdata["Id"].ToString()); //商户名称
+                curData.Add("MctNo", merAddInfo.MchtNo); //商户号
+                curData.Add("UpdateDate", order.UpdateDate.ToString() == null ? "" : DateTime.Parse(order.UpdateDate.ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                curData.Add("PayMode", order.Sort); //支付方式(1 支付宝 2 微信)
+                curData.Add("Status", Status); //达标状态(-1 未参与 0 考核中 1 已通过 2 未通过 101 待领取 100 已领取 99 发放中)
+                curData.Add("Months", subdata["Months"].ToString()); //达标月数
 
                 dataList.Add(curData);
             }
+            Other.Add("Count", count); //总数
             return dataList;
         }
         #endregion

Util/Main1/MerchantAddInfoUtil.cs

@@ -185,7 +185,7 @@ namespace MySystem.Service.Main1
             string condition = "";
             if (!string.IsNullOrEmpty(MerchantName))
             {
-                condition += " and MerchantName='" + MerchantName + "'";
+                condition += " and CertMerchantName='" + MerchantName + "'";
             }
             if (!string.IsNullOrEmpty(Mobile))
             {

Util/Main2/MerchantAddInfoUtil.cs

@@ -173,7 +173,7 @@ namespace MySystem.Service.Main2
             string condition = "";
             if (!string.IsNullOrEmpty(MerchantName))
             {
-                condition += " and MerchantName='" + MerchantName + "'";
+                condition += " and CertMerchantName='" + MerchantName + "'";
             }
             if (!string.IsNullOrEmpty(Mobile))
             {
@@ -182,7 +182,7 @@ namespace MySystem.Service.Main2
             if (!string.IsNullOrEmpty(MakerCode))
             {
                 var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
-                condition += " and MerchantId in (" + Ids + ")";
+                condition += " and Id in (" + Ids + ")";
             }
             if (!string.IsNullOrEmpty(MatchNo))
             {