暂存

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

@@ -35,6 +35,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
         private List<Dictionary<string, object>> ListDo(string value, out Dictionary<string, object> Other)
+        // public List<Dictionary<string, object>> ListDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
             int ConsumerId = int.Parse(function.CheckInt(data["ConsumerId"].ToString())); //用户Id
@@ -50,7 +51,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 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);
+            var aa = "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;
+            
+            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);
             foreach (DataRow dr in dt.Rows)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();

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

@@ -35,6 +35,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
         private List<Dictionary<string, object>> ListDo(string value, out Dictionary<string, object> Other)
+        // public List<Dictionary<string, object>> ListDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
             int ConsumerId = int.Parse(function.CheckInt(data["ConsumerId"].ToString())); //用户Id
@@ -51,7 +52,9 @@ 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='"+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);
+            var aa = "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 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,CreateDate,SeoTitle,GetMoney,MerchantId FROM QrCodePlateMainServer2.ConsumerProfit WHERE OrderId IN(SELECT Id 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;
+
+            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 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,CreateDate,SeoTitle,GetMoney,MerchantId FROM QrCodePlateMainServer2.ConsumerProfit WHERE OrderId IN(SELECT Id 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);
             foreach (DataRow dr in dt.Rows)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();

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

@@ -79,16 +79,17 @@ namespace MySystem.Areas.Api.Controllers.v1
         public JsonResult OssInfo()
         {
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            var OssUrl = "laikeba.oss-cn-chengdu.aliyuncs.com";
-            var AccessKeyId = "LTA15tJsPaNzgCSMCPwb8zfz";
-            var AccessKeySecret = "efM31Up75f0cgZ32U6xvAciagceQae";
+            var OssUrl = "oss-cn-chengdu.aliyuncs.com";
+            var AccessKeyId = "LTAI5tNfshCAkuZkpxGTEoxb";
+            var AccessKeySecret = "gnLlKh1fRUsxf6Bio4b2284ZlqYx4H";
 
             var dir = DateTime.Now.ToString("yyyyMMdd") + "/";
             // 构造OssClient实例。 endpoint 格式:https://oss-cn-beijing.aliyuncs.com
-            var ossClient = new OssClient("https://" + OssUrl, AccessKeyId, AccessKeySecret);
+            var ossClient = new OssClient(OssUrl, AccessKeyId, AccessKeySecret);
             var config = new PolicyConditions();
             config.AddConditionItem(PolicyConditions.CondContentLengthRange, 1, 1024L * 1024 * 1024 * 5);// 文件大小范围：单位byte
-            config.AddConditionItem(MatchMode.StartWith, PolicyConditions.CondKey, dir);
+            // config.AddConditionItem(MatchMode.StartWith, PolicyConditions.CondKey, dir);
+            // config.AddConditionItem(PolicyConditions.CondSuccessActionStatus, "200");
             var expire = DateTimeOffset.Now.AddMinutes(30);// 过期时间
             // 生成 Policy，并进行 Base64 编码
             var policy = ossClient.GeneratePostPolicy(expire.LocalDateTime, config);
@@ -97,10 +98,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             var hmac = new HMACSHA1(Encoding.UTF8.GetBytes(AccessKeySecret));
             var bytes = hmac.ComputeHash(Encoding.UTF8.GetBytes(policyBase64));
             var Signature = Convert.ToBase64String(bytes);
+
             Obj.Add("OssUrl", OssUrl);
             Obj.Add("AccessKeyId", AccessKeyId);
             Obj.Add("AccessKeySecret", AccessKeySecret);
             Obj.Add("Policy", policyBase64);
+            Obj.Add("Expiration", expire);
             Obj.Add("Signature", Signature);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
         }

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

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using MySystem.MainModels;
+using LitJson;
+using Library;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("/v1/QrCodePlateMain/[controller]/[action]")]
+    public class PageInfoController : ConsumersController
+    {
+        public PageInfoController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+        }
+
+
+        #region 我的-分红记录-列表
+        [Authorize]
+        public JsonResult AgreeMentInfo(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = AgreeMentInfoDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
+        }
+        private List<Dictionary<string, object>> AgreeMentInfoDo(string value, out Dictionary<string, object> Other)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int Id = int.Parse(function.CheckInt(data["Id"].ToString())); //Id
+            List<RelationData> relationData = new List<RelationData>();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            DataTable dt = CustomerSqlConn.dtable("SELECT Title,Contents FROM PageInfo WHERE Id=" + Id + "", AppConfig.Base.BsSqlConnStr);
+            foreach (DataRow dr in dt.Rows)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Title", dr["SeoTitle"].ToString()); //标题
+                curData.Add("Contents", dr["Contents"].ToString()); //创建时间
+                dataList.Add(curData);
+            }
+            Other = new Dictionary<string, object>();
+            Other.Add("count", dt.Rows.Count);
+            return dataList;
+        }
+        #endregion
+
+    }
+}

Config/Base.cs

@@ -11,6 +11,7 @@ namespace AppConfig
         public static string Database = Library.ConfigurationManager.AppSettings["Database"].ToString();
         public static string defaultImage = Library.ConfigurationManager.AppSettings["Host"].ToString() + "/skin/app/default/static/images/default.jpg";
         
+        public static string BsSqlConnStr = Library.ConfigurationManager.AppSettings["BsSqlConnStr"].ToString();
         public static string SqlConnStr = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         public static string SqlConnStr2 = Library.ConfigurationManager.AppSettings["SqlConnStr2"].ToString();
         public static string StatConnRds = Library.ConfigurationManager.AppSettings["StatSqlConnStr"].ToString();