调整

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

@@ -37,19 +37,11 @@ namespace MySystem.Areas.Api.Controllers.v1
         private List<Dictionary<string, object>> ListDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
-            string OpenId = data["OpenId"].ToString(); //微信或支付宝Id
-            int Kind = int.Parse(data["Kind"].ToString()); //类型(1 支付宝 2 微信)
+            int ConsumerId = int.Parse(function.CheckInt(data["ConsumerId"].ToString())); //用户Id
+            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()));
             string condition = " WHERE 1=1";
-            if (Kind == 1)
-            {
-                OpenId = AlipayMiniOpenIdDo(OpenId);
-            }
-            if (Kind == 2)
-            {
-                OpenId = WeChatMiniOpenIdDo(OpenId);
-            }
             string limitString = " LIMIT " + pageSize;
             if (pageNum > 1)
             {
@@ -58,7 +50,7 @@ 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 WechatOpenId='" + OpenId + "') AND Status>0 AND PayModel=" + 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 WechatOpenId='" + OpenId + "') AND Status>0 AND PayModel=" + 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='" + ConsumerId + "') AND Status>0 AND PayModel=" + 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 WechatOpenId='" + ConsumerId + "') AND Status>0 AND PayModel=" + 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

@@ -37,19 +37,11 @@ namespace MySystem.Areas.Api.Controllers.v1
         private List<Dictionary<string, object>> ListDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
-            string OpenId = data["OpenId"].ToString(); //微信或支付宝Id
-            int Kind = int.Parse(data["Kind"].ToString()); //类型(1 支付宝 2 微信)
+            int ConsumerId = int.Parse(function.CheckInt(data["ConsumerId"].ToString())); //用户Id
+            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()));
             string condition = " WHERE 1=1";
-            if (Kind == 1)
-            {
-                OpenId = AlipayMiniOpenIdDo(OpenId);
-            }
-            if (Kind == 2)
-            {
-                OpenId = WeChatMiniOpenIdDo(OpenId);
-            }
             string limitString = " LIMIT " + pageSize;
             if (pageNum > 1)
             {
@@ -59,7 +51,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             condition += limitString;
             List<RelationData> relationData = new List<RelationData>();
             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,CreateDate,SeoTitle,GetMoney,MerchantId FROM QrCodePlateMainServer.ConsumerProfit WHERE OrderId IN(SELECT Id FROM QrCodePlateMainServer.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE WechatOpenId='') AND Status>0 AND PayModel=" + 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,CreateDate,SeoTitle,GetMoney,MerchantId FROM QrCodePlateMainServer2.ConsumerProfit WHERE OrderId IN(SELECT Id FROM QrCodePlateMainServer2.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE WechatOpenId='') AND Status>0 AND PayModel=" + 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,CreateDate,SeoTitle,GetMoney,MerchantId FROM QrCodePlateMainServer.ConsumerProfit WHERE OrderId IN(SELECT Id FROM QrCodePlateMainServer.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE WechatOpenId='"+ConsumerId+"') AND Status>0 AND PayModel=" + 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,CreateDate,SeoTitle,GetMoney,MerchantId FROM QrCodePlateMainServer2.ConsumerProfit WHERE OrderId IN(SELECT Id FROM QrCodePlateMainServer2.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE WechatOpenId='"+ConsumerId+"') AND Status>0 AND PayModel=" + 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/ConsumersController.cs

@@ -66,6 +66,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("HeadPhoto", HeadPhoto); //头像
             Obj.Add("NickName", NickName); //昵称
             Obj.Add("Token", token); //token
+            Obj.Add("ConsumerId", consumer.Id); //用户Id
 
             return Obj;
         }
@@ -84,24 +85,11 @@ namespace MySystem.Areas.Api.Controllers.v1
         private AppResultJson EditPersonalInfoDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
-            string OpenId = data["OpenId"].ToString(); //微信或支付宝Id
-            int Kind = int.Parse(data["Kind"].ToString()); //类型(1 支付宝 2 微信)
+            int ConsumerId = int.Parse(function.CheckInt(data["ConsumerId"].ToString())); //用户Id
             string HeadPhoto = data["HeadPhoto"].ToString(); //头像
             string NickName = data["NickName"].ToString(); //昵称
-            if (Kind == 1)
-            {
-                OpenId = AlipayMiniOpenIdDo(OpenId);
-            }
-            if (Kind == 2)
-            {
-                OpenId = AlipayMiniOpenIdDo(OpenId);
-            }
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            var consumer = maindb.Consumers.FirstOrDefault(m => m.WechatOpenId == OpenId) ?? new Consumers();
-            if (string.IsNullOrEmpty(OpenId))
-            {
-                return new AppResultJson() { Status = "-1", Info = "微信或支付宝Id为空" };
-            }
+            var consumer = maindb.Consumers.FirstOrDefault(m => m.Id == ConsumerId) ?? new Consumers();
             if (consumer.Id > 0)
             {
                 if (!string.IsNullOrEmpty(HeadPhoto))