调整为微信或支付宝唯一标识查询数据

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

@@ -39,6 +39,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             JsonData data = JsonMapper.ToObject(value);
             int ConsumerId = int.Parse(function.CheckInt(data["ConsumerId"].ToString())); //用户Id
+            string OpenId = data["OpenId"].ToString(); //用户OpenId
             int Kind = int.Parse(function.CheckInt(data["Kind"].ToString())); //类型(1 支付宝 2 微信)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
@@ -51,7 +52,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             condition += limitString;
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            DataTable dt = CustomerSqlConn.dtable("SELECT * FROM(SELECT a.*,b.CertMerchantName FROM(SELECT Id,1 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE Id='" + ConsumerId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id UNION ALL SELECT a.*,b.CertMerchantName FROM (SELECT Id,2 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer2.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE Id='" + ConsumerId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer2.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id)aa" + condition, AppConfig.Base.SqlConnStr);
+            // DataTable dt = CustomerSqlConn.dtable("SELECT * FROM(SELECT a.*,b.CertMerchantName FROM(SELECT Id,1 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE Id='" + ConsumerId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id UNION ALL SELECT a.*,b.CertMerchantName FROM (SELECT Id,2 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer2.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE Id='" + ConsumerId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer2.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id)aa" + condition, AppConfig.Base.SqlConnStr);
+
+            DataTable dt = CustomerSqlConn.dtable("SELECT * FROM(SELECT a.*,b.CertMerchantName FROM(SELECT Id,1 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE WechatOpenId='" + OpenId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id UNION ALL SELECT a.*,b.CertMerchantName FROM (SELECT Id,2 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer2.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer2.Consumers WHERE WechatOpenId='" + OpenId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer2.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id)aa" + condition, AppConfig.Base.SqlConnStr);
             foreach (DataRow dr in dt.Rows)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();

Areas/Api/Controllers/v1/MainServer/ConsumerProfitController.cs

@@ -38,6 +38,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             JsonData data = JsonMapper.ToObject(value);
             int ConsumerId = int.Parse(function.CheckInt(data["ConsumerId"].ToString())); //用户Id
+            string OpenId = data["OpenId"].ToString(); //用户OpenId
             int Kind = int.Parse(function.CheckInt(data["Kind"].ToString())); //类型(1 支付宝 2 微信)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
@@ -52,21 +53,21 @@ namespace MySystem.Areas.Api.Controllers.v1
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             Other = new Dictionary<string, object>();
-            var WechatOpenId = "";
+            var WechatOpenId = OpenId;
 
-            var consumer = Services.Main.ConsumersService.Query(ConsumerId);
-            var consumer2 = Services.Main2.ConsumersService.Query(ConsumerId);
-            if (consumer.Id > 0 && ConsumerId > 0)
-            {
-                WechatOpenId = consumer.WechatOpenId;
-            }
-            else
-            {
-                if (consumer2.Id > 0 && ConsumerId > 0)
-                {
-                    WechatOpenId = consumer2.WechatOpenId;
-                }
-            }
+            // var consumer = Services.Main.ConsumersService.Query(ConsumerId);
+            // var consumer2 = Services.Main2.ConsumersService.Query(ConsumerId);
+            // if (consumer.Id > 0 && ConsumerId > 0)
+            // {
+            //     WechatOpenId = consumer.WechatOpenId;
+            // }
+            // else
+            // {
+            //     if (consumer2.Id > 0 && ConsumerId > 0)
+            //     {
+            //         WechatOpenId = consumer2.WechatOpenId;
+            //     }
+            // }
 
             if (ConsumerId > 0 && !string.IsNullOrEmpty(WechatOpenId))
             {