增加代付

调整生成邀请二维码规则

.gitignore

@@ -0,0 +1,3 @@
+/bin
+/publish
+/obj

AppStart/Helper/Cash/CashBase.cs

@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.Models;
+using Library;
+using LitJson;
+using System.Threading;
+using System.Security.Cryptography;
+
+namespace MySystem
+{
+    public class PayApply
+    {
+        public string taskNo { get; set; }
+        public string entOrderNo { get; set; }
+        public string payeeName { get; set; }
+        public string payeeIdCard { get; set; }
+        public string payeePhone { get; set; }
+        public string payeeAccount { get; set; }
+        public string paymentModel { get; set; }
+        public string amount { get; set; }
+        public string callbackUrl { get; set; }
+        public string remark { get; set; }
+    }
+    public class CashBase
+    {
+        public readonly static CashBase Instance = new CashBase();
+        private CashBase()
+        { }
+
+        public string PrivateKey = ""; //私钥
+        public string PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoZa64mEChZCYmn6t+33ZksHoV9Me/SR2oOkbNifkwP8EmhtopMZE00yumd3zKY0enJvqZ+22x486MUUu3d658n+nl6k8taSAYVrUb6vIfFueUYcbvorxzZNLvdi3AnQGJybRGJis/9WOYJc0XioNq9ywP/RLWMNGmuF+RBFYoRic9dGMoPF2I4Y/RazxUNN9mJRQwIacAd7r+miikBzrQ0kdC0QdNR4eEc2u8UEy2VhMuMqc9oKXVSdlVV+8Cx5m9kZzyRL0UryvUV6VYk8zMxoQVHpTtu0GjL8nXBfiJzglCqIpum989AIxrafgIwvwj8fTMnET4eTwT7nUyskgewIDAQAB";  //公钥
+        public string EnterpriseNo = "8880010000269";  //平台分配的企业编码
+        public string ChannelNo = "8880010000267";  //平台分配的渠道编码
+        public string RequestUrl = "http://yhs-service-pay2data.juheba.top:8888/";  //请求地址
+
+        //查询签约状态
+        public string QuerySignStatus(string IdCard)
+        {
+            Dictionary<string, object> data = new Dictionary<string, object>();
+            data.Add("apiCode", "3003"); //接口编号，固定：3003
+            data.Add("enterpriseNo", EnterpriseNo); //平台分配的企业编码
+            data.Add("channelNo", ChannelNo); //平台分配的渠道编码
+            data.Add("timestamp", function.GetCurTimestamp()); //时间戳（毫秒）
+            data.Add("idCard", IdCard); //从业者身份证号
+            return PostData("api/personal/signed/result", data, new Dictionary<string, object>());
+        }
+
+        //从业者数据提交
+        public string CreateInfo(string Name, string IdCard, string Phone, string FrontCertImg, string BackCertImg)
+        {
+            Dictionary<string, object> data = new Dictionary<string, object>();
+            data.Add("apiCode", "3000"); //接口编号，固定：3003
+            data.Add("enterpriseNo", EnterpriseNo); //平台分配的企业编码
+            data.Add("channelNo", ChannelNo); //平台分配的渠道编码
+            data.Add("timestamp", function.GetCurTimestamp()); //时间戳（毫秒）
+            data.Add("name", Name); //从业者姓名
+            data.Add("idCard", IdCard); //从业者身份证号
+            data.Add("phone", Phone); //从业者手机号
+            Dictionary<string, object> fileData = new Dictionary<string, object>();
+            fileData.Add("frontCertImg", FrontCertImg); //身份证正面照
+            fileData.Add("backCertImg", BackCertImg); //身份证反面照
+            return PostData("api/personal/create", data, fileData);
+        }
+
+        //发起签约确认
+        public string ConfirmSign(string IdCard)
+        {
+            Dictionary<string, object> data = new Dictionary<string, object>();
+            data.Add("apiCode", "3004"); //接口编号，固定：3003
+            data.Add("enterpriseNo", EnterpriseNo); //平台分配的企业编码
+            data.Add("channelNo", ChannelNo); //平台分配的渠道编码
+            data.Add("timestamp", function.GetCurTimestamp()); //时间戳（毫秒）
+            data.Add("idCard", IdCard); //从业者身份证号
+            return PostData("api/personal/sign", data, new Dictionary<string, object>());
+        }
+
+        //提价代付申请
+        public string PayApply(PayApply ReqData)
+        {
+            Dictionary<string, object> data = new Dictionary<string, object>();
+            data.Add("apiCode", "3004"); //接口编号，固定：3003
+            data.Add("enterpriseNo", EnterpriseNo); //平台分配的企业编码
+            data.Add("channelNo", ChannelNo); //平台分配的渠道编码
+            data.Add("timestamp", function.GetCurTimestamp()); //时间戳（毫秒）
+            data.Add("taskNo", ReqData.taskNo); //企业后台创建的任务编码
+            data.Add("entOrderNo", ReqData.entOrderNo); //企业流水号
+            data.Add("payeeName", ReqData.payeeName); //收款人姓名
+            data.Add("payeeIdCard", ReqData.payeeIdCard); //收款人身份证号
+            data.Add("payeePhone", ReqData.payeePhone); //收款人手机号
+            data.Add("payeeAccount", ReqData.payeeAccount); //收款人帐号（银行卡号、支付宝帐号）
+            data.Add("paymentModel", ReqData.paymentModel); //支付类型
+            data.Add("amount", ReqData.amount); //金额（单位：分）
+            data.Add("callbackUrl", ReqData.callbackUrl); //通知地址
+            data.Add("remark", ReqData.remark); //结算单备注信息
+            return PostData("api/pay/apply", data, new Dictionary<string, object>());
+        }
+
+        //公用请求方法
+        public string PostData(string path, Dictionary<string, object> data, Dictionary<string, object> fileData)
+        {
+            Dictionary<string, object> main = new Dictionary<string, object>();
+            main.Add("enterpriseNo", EnterpriseNo);
+            main.Add("channelNo", ChannelNo);
+            function.WriteLog(DateTime.Now.ToString(), "代付公用请求方法");
+            function.WriteLog("path:" + path, "代付公用请求方法");
+            string body = Newtonsoft.Json.JsonConvert.SerializeObject(data);
+            function.WriteLog("body:" + body, "代付公用请求方法");
+            body = Encrypt(body);
+            main.Add("body", body);
+            if (fileData.Keys.Count > 0)
+            {
+                main.Add("fileData", fileData);
+            }
+            string req = Newtonsoft.Json.JsonConvert.SerializeObject(main);
+            function.WriteLog("req:" + req, "代付公用请求方法");
+            string result = function.PostWebRequest(RequestUrl + path, req, "application/json");
+            function.WriteLog("result:" + result, "代付公用请求方法");
+            function.WriteLog("-----------------", "代付公用请求方法");
+            return result;
+        }
+
+        //加密
+        public string Encrypt(string content)
+        {
+            // var toDecryptArray = System.Text.Encoding.UTF8.GetBytes(content);
+            // var keyArray = System.Text.Encoding.UTF8.GetBytes(PublicKey);
+            // var rsa = RSA.Create();
+            // rsa.ImportRSAPublicKey(keyArray, out _);
+            // var contentArray = rsa.Encrypt(toDecryptArray, RSAEncryptionPadding.Pkcs1);
+            // return Convert.ToBase64String(contentArray);
+            
+            return new RSAHelper(RSAType.RSA, System.Text.Encoding.UTF8, "", PublicKey).Encrypt(content);
+        }
+    }
+}

AppStart/Helper/Cash/CashPersonalCreateHelper.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.Models;
+using Library;
+using LitJson;
+using System.Threading;
+
+namespace MySystem
+{
+    public class CashPersonalCreateHelper
+    {
+        public readonly static CashPersonalCreateHelper Instance = new CashPersonalCreateHelper();
+        private CashPersonalCreateHelper()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(StartDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void StartDo()
+        {
+            while (true)
+            {
+                try
+                {
+                    WebCMSEntities db = new WebCMSEntities();
+                    
+                    db.SaveChanges();
+                    db.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "代付提交资料异常");
+                }
+                Thread.Sleep(1000);
+            }
+        }
+    }
+}

AppStart/Helper/Cash/CashSignConfirmHelper.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.Models;
+using Library;
+using LitJson;
+using System.Threading;
+
+namespace MySystem
+{
+    public class CashSignConfirmHelper
+    {
+        public readonly static CashSignConfirmHelper Instance = new CashSignConfirmHelper();
+        private CashSignConfirmHelper()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(StartDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void StartDo()
+        {
+            while (true)
+            {
+                try
+                {
+                    WebCMSEntities db = new WebCMSEntities();
+                    
+                    db.SaveChanges();
+                    db.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "代付确认签约异常");
+                }
+                Thread.Sleep(1000);
+            }
+        }
+    }
+}

AppStart/Helper/Cash/CashSignHelper.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.Models;
+using Library;
+using LitJson;
+using System.Threading;
+
+namespace MySystem
+{
+    public class CashSignHelper
+    {
+        public readonly static CashSignHelper Instance = new CashSignHelper();
+        private CashSignHelper()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(StartDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void StartDo()
+        {
+            while (true)
+            {
+                try
+                {
+                    WebCMSEntities db = new WebCMSEntities();
+                    
+                    db.SaveChanges();
+                    db.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "代付签约异常");
+                }
+                Thread.Sleep(1000);
+            }
+        }
+    }
+}

AppStart/Helper/MakeReferenceQrCodeService.cs

@@ -50,12 +50,8 @@ namespace MySystem
                     WebCMSEntities db = new WebCMSEntities();
                     Users user = db.Users.FirstOrDefault(m => m.Id == UserId);
                     if (user != null)
-                    { 
-                        string path = function.CreateQRCode2(ConfigurationManager.AppSettings["SourceHost"].ToString() + "p/user-inviteregist-1?Id=" + user.Id, function.MD5_16(user.Id.ToString() + "8745"), "/bsserver_com/static/ReferenceQrCode/");
-                        path = path.Replace("//", "/");
-                        string resultpath = "/bsserver_com/static/ReferenceQrCode/" + function.MD5_16(user.Id.ToString() + "8745") + "Pic.png";
-                        MakeQRCode(function.getPath("/static/QrCodeBg.png"), function.getPath(path), function.getPath(resultpath), user);
-                        resultpath = resultpath.Replace("bsserver_com/", "");
+                    {
+                        string resultpath = MergeQrCode(user);
                         user.ReferenceQrCode = resultpath;
                         db.SaveChanges();
                         PxcModels.WebCMSEntities pxcdb = new PxcModels.WebCMSEntities();
@@ -81,6 +77,19 @@ namespace MySystem
                 function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
             }
         }
+        public string MergeQrCode(Users user, int pid = 0)
+        {
+            string BgPic = "QrCodeBg.png";
+            if (pid > 0)
+            {
+                BgPic = "QrCodeBg" + pid + ".png";
+            }
+            string path = function.CreateQRCode2(ConfigurationManager.AppSettings["SourceHost"].ToString() + "p/user-inviteregist-1?Id=" + user.Id, function.MD5_16(user.Id.ToString() + "9527"), "/bsserver_com/static/ReferenceQrCode/");
+            path = path.Replace("//", "/");
+            string resultpath = "/bsserver_com/static/ReferenceQrCode/" + function.MD5_16(user.Id.ToString() + "9527") + "Pic.png";
+            MakeQRCode(function.getPath("/static/QrCodeBg.png"), function.getPath(path), function.getPath(resultpath), user);
+            return resultpath.Replace("bsserver_com/", "");
+        }
 
         public void MakeQRCode(string sourcepath, string qrcode, string resultpath, Users us)
         {

AppStart/Helper/Profit/ProfitHelper.cs

@@ -2050,7 +2050,7 @@ namespace MySystem
                     若创客为商户型创客，则机具UserId的创客获得万4分润
 
                     //查分润
-                    select u.MakerCode,u.RealName,u.UserLevel,p.PosSn,(case when ProfitType=1 then '直营' else '团队' end) as DirectFlag,
+                    select u.MakerCode,u.RealName,u.UserLevel,p.KqSnNo,(case when ProfitType=1 then '直营' else '团队' end) as DirectFlag,
                     k.Name,CreditTradeAmt,CreditTradeProfit,DebitTradeAmt,DebitTradeProfit,QrCreditTradeAmt,QrCreditTradeProfit from (
                     select UserId,ProfitType,BrandId,MerchantId,
                     sum(CreditTradeAmt) as CreditTradeAmt,
@@ -2061,7 +2061,7 @@ namespace MySystem
                     sum(QrCreditTradeProfit) as QrCreditTradeProfit
                     from ProfitRewardRecord where MerchantId>0
                     GROUP BY UserId,ProfitType,BrandId,MerchantId
-                    ) tb left join Users u on tb.UserId=u.Id LEFT JOIN KqProducts k ON k.Id=tb.BrandId left join PosMachinesTwo p on tb.MerchantId=p.BindMerchantId ORDER BY p.PosSn,u.MakerCode
+                    ) tb left join Users u on tb.UserId=u.Id LEFT JOIN KqProducts k ON k.Id=tb.BrandId left join PosMerchantInfo p on tb.MerchantId=p.Id ORDER BY p.KqSnNo,u.MakerCode
 
                     //查补贴
                     select u.MakerCode,u.RealName,u.UserLevel,m.KqSnNo,m.MerchantName,(case when SubsidyType=1 then '直营' else '团队' end) as DirectFlag,

AppStart/Helper/RSAForJava.cs

@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Org.BouncyCastle.Asn1.Pkcs;
+using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Crypto.Generators;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Math;
+using Org.BouncyCastle.Pkcs;
+using Org.BouncyCastle.Security;
+using Org.BouncyCastle.Crypto.Engines;
+using Org.BouncyCastle.X509;
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Crypto.Encodings;
+
+namespace MySystem
+{
+    public class RSAForJava
+    {
+
+        public RSAForJava()
+        {
+
+        }
+        /// <summary>
+        /// KEY 结构体
+        /// </summary>
+        public struct RSAKEY
+        {
+            /// <summary>
+            /// 公钥
+            /// </summary>
+            public string PublicKey
+            {
+                get;
+                set;
+            }
+            /// <summary>
+            /// 私钥
+            /// </summary>
+            public string PrivateKey
+            {
+                get;
+                set;
+            }
+        }
+        public RSAKEY GetKey()
+        {
+            //RSA密钥对的构造器  
+            RsaKeyPairGenerator keyGenerator = new RsaKeyPairGenerator();
+
+            //RSA密钥构造器的参数  
+            RsaKeyGenerationParameters param = new RsaKeyGenerationParameters(
+                Org.BouncyCastle.Math.BigInteger.ValueOf(3),
+                new Org.BouncyCastle.Security.SecureRandom(),
+                1024,   //密钥长度  
+                25);
+            //用参数初始化密钥构造器  
+            keyGenerator.Init(param);
+            //产生密钥对  
+            AsymmetricCipherKeyPair keyPair = keyGenerator.GenerateKeyPair();
+            //获取公钥和密钥  
+            AsymmetricKeyParameter publicKey = keyPair.Public;
+            AsymmetricKeyParameter privateKey = keyPair.Private;
+
+            SubjectPublicKeyInfo subjectPublicKeyInfo = SubjectPublicKeyInfoFactory.CreateSubjectPublicKeyInfo(publicKey);
+            PrivateKeyInfo privateKeyInfo = PrivateKeyInfoFactory.CreatePrivateKeyInfo(privateKey);
+
+
+            Asn1Object asn1ObjectPublic = subjectPublicKeyInfo.ToAsn1Object();
+
+            byte[] publicInfoByte = asn1ObjectPublic.GetEncoded("UTF-8");
+            Asn1Object asn1ObjectPrivate = privateKeyInfo.ToAsn1Object();
+            byte[] privateInfoByte = asn1ObjectPrivate.GetEncoded("UTF-8");
+
+            RSAKEY item = new RSAKEY()
+            {
+                PublicKey = Convert.ToBase64String(publicInfoByte),
+                PrivateKey = Convert.ToBase64String(privateInfoByte)
+            };
+            return item;
+        }
+        private AsymmetricKeyParameter GetPublicKeyParameter(string s)
+        {
+            s = s.Replace("\r", "").Replace("\n", "").Replace(" ", "");
+            byte[] publicInfoByte = Convert.FromBase64String(s);
+            Asn1Object pubKeyObj = Asn1Object.FromByteArray(publicInfoByte);//这里也可以从流中读取，从本地导入   
+            AsymmetricKeyParameter pubKey = PublicKeyFactory.CreateKey(publicInfoByte);
+            return pubKey;
+        }
+        private AsymmetricKeyParameter GetPrivateKeyParameter(string s)
+        {
+            s = s.Replace("\r", "").Replace("\n", "").Replace(" ", "");
+            byte[] privateInfoByte = Convert.FromBase64String(s);
+            // Asn1Object priKeyObj = Asn1Object.FromByteArray(privateInfoByte);//这里也可以从流中读取，从本地导入   
+            // PrivateKeyInfo privateKeyInfo = PrivateKeyInfoFactory.CreatePrivateKeyInfo(privateKey);
+            AsymmetricKeyParameter priKey = PrivateKeyFactory.CreateKey(privateInfoByte);
+            return priKey;
+        }
+        public string EncryptByPrivateKey(string s, string key)
+        {
+            //非对称加密算法，加解密用  
+            IAsymmetricBlockCipher engine = new Pkcs1Encoding(new RsaEngine());
+
+
+            //加密  
+
+            try
+            {
+                engine.Init(true, GetPrivateKeyParameter(key));
+                byte[] byteData = System.Text.Encoding.UTF8.GetBytes(s);
+                var ResultData = engine.ProcessBlock(byteData, 0, byteData.Length);
+                return Convert.ToBase64String(ResultData);
+                //Console.WriteLine("密文（base64编码）:" + Convert.ToBase64String(testData) + Environment.NewLine);
+            }
+            catch (Exception ex)
+            {
+                return ex.Message;
+
+            }
+        }
+        public string DecryptByPublicKey(string s, string key)
+        {
+            s = s.Replace("\r", "").Replace("\n", "").Replace(" ", "");
+            //非对称加密算法，加解密用  
+            IAsymmetricBlockCipher engine = new Pkcs1Encoding(new RsaEngine());
+
+
+            //解密
+
+            try
+            {
+                engine.Init(false, GetPublicKeyParameter(key));
+                byte[] byteData = Convert.FromBase64String(s);
+                string result = "";
+                List<byte> cache = new List<byte>();
+                for (int i = 0; i < byteData.Length; i++)
+                {
+                    cache.Add(byteData[i]);
+                    if ((i + 1) % 256 == 0 || i + 1 == byteData.Length)
+                    {
+                        var ResultData = engine.ProcessBlock(cache.ToArray(), 0, cache.ToArray().Length);
+                        result += System.Text.Encoding.UTF8.GetString(ResultData);
+                        cache.Clear();
+                    }
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                return ex.Message;
+            }
+        }
+    }
+}

AppStart/Helper/RSAHelper.cs

@@ -0,0 +1,317 @@
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace MySystem
+{
+    /// <summary>
+    /// RSA加解密 使用OpenSSL的公钥加密/私钥解密
+    /// 作者：李志强
+    /// 创建时间：2017年10月30日15:50:14
+    /// QQ:501232752
+    /// </summary>
+    public class RSAHelper
+	{
+		private readonly RSA _privateKeyRsaProvider;
+		private readonly RSA _publicKeyRsaProvider;
+		private readonly HashAlgorithmName _hashAlgorithmName;
+		private readonly Encoding _encoding;
+
+		/// <summary>
+		/// 实例化RSAHelper
+		/// </summary>
+		/// <param name="rsaType">加密算法类型 RSA SHA1;RSA2 SHA256 密钥长度至少为2048</param>
+		/// <param name="encoding">编码类型</param>
+		/// <param name="privateKey">私钥</param>
+		/// <param name="publicKey">公钥</param>
+		public RSAHelper(RSAType rsaType, Encoding encoding, string privateKey, string publicKey = null)
+		{
+			_encoding = encoding;
+			if (!string.IsNullOrEmpty(privateKey))
+			{
+				_privateKeyRsaProvider = CreateRsaProviderFromPrivateKey(privateKey);
+			}
+
+			if (!string.IsNullOrEmpty(publicKey))
+			{
+				_publicKeyRsaProvider = CreateRsaProviderFromPublicKey(publicKey);
+			}
+
+			_hashAlgorithmName = rsaType == RSAType.RSA ? HashAlgorithmName.SHA1 : HashAlgorithmName.SHA256;
+		}
+
+		#region 使用私钥签名
+
+		/// <summary>
+		/// 使用私钥签名
+		/// </summary>
+		/// <param name="data">原始数据</param>
+		/// <returns></returns>
+		public string Sign(string data)
+		{
+			byte[] dataBytes = _encoding.GetBytes(data);
+
+			var signatureBytes = _privateKeyRsaProvider.SignData(dataBytes, _hashAlgorithmName, RSASignaturePadding.Pkcs1);
+
+			return Convert.ToBase64String(signatureBytes);
+		}
+
+		#endregion
+
+		#region 使用公钥验证签名
+
+		/// <summary>
+		/// 使用公钥验证签名
+		/// </summary>
+		/// <param name="data">原始数据</param>
+		/// <param name="sign">签名</param>
+		/// <returns></returns>
+		public bool Verify(string data, string sign)
+		{
+			byte[] dataBytes = _encoding.GetBytes(data);
+			byte[] signBytes = Convert.FromBase64String(sign);
+
+			var verify = _publicKeyRsaProvider.VerifyData(dataBytes, signBytes, _hashAlgorithmName, RSASignaturePadding.Pkcs1);
+
+			return verify;
+		}
+
+		#endregion
+
+		#region 解密
+
+		public string Decrypt(string cipherText)
+		{
+			if (_privateKeyRsaProvider == null)
+			{
+				throw new Exception("_privateKeyRsaProvider is null");
+			}
+			return Encoding.UTF8.GetString(_privateKeyRsaProvider.Decrypt(Convert.FromBase64String(cipherText), RSAEncryptionPadding.Pkcs1));
+		}
+
+		#endregion
+
+		#region 加密
+
+		public string Encrypt(string text)
+		{
+			if (_publicKeyRsaProvider == null)
+			{
+				throw new Exception("_publicKeyRsaProvider is null");
+			}
+			return Convert.ToBase64String(_publicKeyRsaProvider.Encrypt(Encoding.UTF8.GetBytes(text), RSAEncryptionPadding.Pkcs1));
+		}
+
+		#endregion
+
+		#region 使用私钥创建RSA实例
+
+		public RSA CreateRsaProviderFromPrivateKey(string privateKey)
+		{
+			var privateKeyBits = Convert.FromBase64String(privateKey);
+
+			var rsa = RSA.Create();
+			var rsaParameters = new RSAParameters();
+
+			using (BinaryReader binr = new BinaryReader(new MemoryStream(privateKeyBits)))
+			{
+				byte bt = 0;
+				ushort twobytes = 0;
+				twobytes = binr.ReadUInt16();
+				if (twobytes == 0x8130)
+					binr.ReadByte();
+				else if (twobytes == 0x8230)
+					binr.ReadInt16();
+				else
+					throw new Exception("Unexpected value read binr.ReadUInt16()");
+
+				twobytes = binr.ReadUInt16();
+				if (twobytes != 0x0102)
+					throw new Exception("Unexpected version");
+
+				bt = binr.ReadByte();
+				if (bt != 0x00)
+					throw new Exception("Unexpected value read binr.ReadByte()");
+
+				rsaParameters.Modulus = binr.ReadBytes(GetIntegerSize(binr));
+				rsaParameters.Exponent = binr.ReadBytes(GetIntegerSize(binr));
+				rsaParameters.D = binr.ReadBytes(GetIntegerSize(binr));
+				rsaParameters.P = binr.ReadBytes(GetIntegerSize(binr));
+				rsaParameters.Q = binr.ReadBytes(GetIntegerSize(binr));
+				rsaParameters.DP = binr.ReadBytes(GetIntegerSize(binr));
+				rsaParameters.DQ = binr.ReadBytes(GetIntegerSize(binr));
+				rsaParameters.InverseQ = binr.ReadBytes(GetIntegerSize(binr));
+			}
+
+			rsa.ImportParameters(rsaParameters);
+			return rsa;
+		}
+
+		#endregion
+
+		#region 使用公钥创建RSA实例
+
+		public RSA CreateRsaProviderFromPublicKey(string publicKeyString)
+		{
+			// encoded OID sequence for  PKCS #1 rsaEncryption szOID_RSA_RSA = "1.2.840.113549.1.1.1"
+			byte[] seqOid = { 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00 };
+			byte[] seq = new byte[15];
+
+			var x509Key = Convert.FromBase64String(publicKeyString);
+
+			// ---------  Set up stream to read the asn.1 encoded SubjectPublicKeyInfo blob  ------
+			using (MemoryStream mem = new MemoryStream(x509Key))
+			{
+				using (BinaryReader binr = new BinaryReader(mem))  //wrap Memory Stream with BinaryReader for easy reading
+				{
+					byte bt = 0;
+					ushort twobytes = 0;
+
+					twobytes = binr.ReadUInt16();
+					if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
+						binr.ReadByte();    //advance 1 byte
+					else if (twobytes == 0x8230)
+						binr.ReadInt16();   //advance 2 bytes
+					else
+						return null;
+
+					seq = binr.ReadBytes(15);       //read the Sequence OID
+					if (!CompareBytearrays(seq, seqOid))    //make sure Sequence for OID is correct
+						return null;
+
+					twobytes = binr.ReadUInt16();
+					if (twobytes == 0x8103) //data read as little endian order (actual data order for Bit String is 03 81)
+						binr.ReadByte();    //advance 1 byte
+					else if (twobytes == 0x8203)
+						binr.ReadInt16();   //advance 2 bytes
+					else
+						return null;
+
+					bt = binr.ReadByte();
+					if (bt != 0x00)     //expect null byte next
+						return null;
+
+					twobytes = binr.ReadUInt16();
+					if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
+						binr.ReadByte();    //advance 1 byte
+					else if (twobytes == 0x8230)
+						binr.ReadInt16();   //advance 2 bytes
+					else
+						return null;
+
+					twobytes = binr.ReadUInt16();
+					byte lowbyte = 0x00;
+					byte highbyte = 0x00;
+
+					if (twobytes == 0x8102) //data read as little endian order (actual data order for Integer is 02 81)
+						lowbyte = binr.ReadByte();  // read next bytes which is bytes in modulus
+					else if (twobytes == 0x8202)
+					{
+						highbyte = binr.ReadByte(); //advance 2 bytes
+						lowbyte = binr.ReadByte();
+					}
+					else
+						return null;
+					byte[] modint = { lowbyte, highbyte, 0x00, 0x00 };   //reverse byte order since asn.1 key uses big endian order
+					int modsize = BitConverter.ToInt32(modint, 0);
+
+					int firstbyte = binr.PeekChar();
+					if (firstbyte == 0x00)
+					{   //if first byte (highest order) of modulus is zero, don't include it
+						binr.ReadByte();    //skip this null byte
+						modsize -= 1;   //reduce modulus buffer size by 1
+					}
+
+					byte[] modulus = binr.ReadBytes(modsize);   //read the modulus bytes
+
+					if (binr.ReadByte() != 0x02)            //expect an Integer for the exponent data
+						return null;
+					int expbytes = (int)binr.ReadByte();        // should only need one byte for actual exponent data (for all useful values)
+					byte[] exponent = binr.ReadBytes(expbytes);
+
+					// ------- create RSACryptoServiceProvider instance and initialize with public key -----
+					var rsa = RSA.Create();
+					RSAParameters rsaKeyInfo = new RSAParameters
+					{
+						Modulus = modulus,
+						Exponent = exponent
+					};
+					rsa.ImportParameters(rsaKeyInfo);
+
+					return rsa;
+				}
+
+			}
+		}
+
+		#endregion
+
+		#region 导入密钥算法
+
+		private int GetIntegerSize(BinaryReader binr)
+		{
+			byte bt = 0;
+			int count = 0;
+			bt = binr.ReadByte();
+			if (bt != 0x02)
+				return 0;
+			bt = binr.ReadByte();
+
+			if (bt == 0x81)
+				count = binr.ReadByte();
+			else
+			if (bt == 0x82)
+			{
+				var highbyte = binr.ReadByte();
+				var lowbyte = binr.ReadByte();
+				byte[] modint = { lowbyte, highbyte, 0x00, 0x00 };
+				count = BitConverter.ToInt32(modint, 0);
+			}
+			else
+			{
+				count = bt;
+			}
+
+			while (binr.ReadByte() == 0x00)
+			{
+				count -= 1;
+			}
+			binr.BaseStream.Seek(-1, SeekOrigin.Current);
+			return count;
+		}
+
+		private bool CompareBytearrays(byte[] a, byte[] b)
+		{
+			if (a.Length != b.Length)
+				return false;
+			int i = 0;
+			foreach (byte c in a)
+			{
+				if (c != b[i])
+					return false;
+				i++;
+			}
+			return true;
+		}
+
+		#endregion
+
+	}
+
+	/// <summary>
+	/// RSA算法类型
+	/// </summary>
+	public enum RSAType
+	{
+		/// <summary>
+		/// SHA1
+		/// </summary>
+		RSA = 0,
+		/// <summary>
+		/// RSA2 密钥长度至少为2048
+		/// SHA256
+		/// </summary>
+		RSA2
+	}
+}

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -51,7 +51,7 @@ namespace MySystem
                                 {
                                     BrandId = 3;
                                 }
-                                if (BrandId == 4 && Mer.SeoTitle == "200")
+                                if (BrandId == 4 && Mer.Field1 == "200")
                                 { 
                                     BrandId = 5;
                                 }

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -134,10 +134,14 @@ namespace MySystem
                                             }
                                         }
                                         int BrandId = int.Parse(trade.ProductType);
-                                        if (trade.MerNo.StartsWith("M900"))
+                                        if (BrandId == 1 && trade.MerNo.StartsWith("M900"))
                                         {
                                             BrandId = 3;
                                         }
+                                        if (BrandId == 4 && trade.DeviceType == "200")
+                                        { 
+                                            BrandId = 5;
+                                        }
                                         db.TradeRecord.Add(new PxcModels.TradeRecord()
                                         {
                                             CreateDate = trade.CreateDate,

Controllers/HomeController.cs

@@ -86,6 +86,18 @@ namespace MySystem.Controllers
             return "fail";
         }
 
+        public string getqrcode(int uid, int pid)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            Users user = db.Users.FirstOrDefault(m => m.Id == uid);
+            if (user != null)
+            {
+                return MakeReferenceQrCodeService.Instance.MergeQrCode(user, pid);
+            }
+            db.Dispose();
+            return "fail";
+        }
+
         private void th1()
         {
             Thread th = new Thread(th1do);
@@ -669,20 +681,17 @@ namespace MySystem.Controllers
 
         public string test()
         {
-            string result = "";
-            OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
-            DataTable dt = OtherMySqlConn.dtable("select PosSn,UserId from PosMachinesTwo where UserId in (select Id from Users where MerchantType=1);");
-            foreach (DataRow dr in dt.Rows)
-            {
-                string PosSn = dr["PosSn"].ToString();
-                string UserId = dr["UserId"].ToString();
-                DataTable subdt = OtherMySqlConn.dtable("select Id from TradeRecord where SnNo='" + PosSn + "' and CreateDate>='2022-04-01 00:00:00'");
-                foreach (DataRow subdr in subdt.Rows)
-                {
-                    result += "update TradeRecord set UserId=" + UserId + " where Id=" + subdr["Id"].ToString() + ";\n";
-                }
-            }
-            OtherMySqlConn.connstr = "";
+            string result = "ok";
+            // result = CashBase.Instance.QuerySignStatus("523698138812123669");
+            result = CashBase.Instance.CreateInfo("李春雷", "513001198312090419", "13880789833", function.imageToBase64String(function.getPath("/static/1.jpg")), function.imageToBase64String(function.getPath("/static/2.jpg")));
+            //{"code":"000000","msg":"成功"}
+            return result;
+        }
+
+        public string test2()
+        {
+            string result = "ok";
+            result = CashBase.Instance.ConfirmSign("513001198312090419");
             return result;
         }
     }

SpModels/ActivateRecord.cs

@@ -31,5 +31,10 @@ namespace MySystem.SpModels
         public string MerName { get; set; }
         public string MerNo { get; set; }
         public string ChannelSerial { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/BindRecord.cs

@@ -27,5 +27,10 @@ namespace MySystem.SpModels
         public string MerName { get; set; }
         public string AgentName { get; set; }
         public string MerNo { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/Merchants.cs

@@ -31,5 +31,10 @@ namespace MySystem.SpModels
         public string AgentName { get; set; }
         public string MerName { get; set; }
         public string MerNo { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/TradeRecord.cs

@@ -43,5 +43,10 @@ namespace MySystem.SpModels
         public string MerName { get; set; }
         public string MerNo { get; set; }
         public string TradeSerialNo { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/WebCMSEntities.cs

@@ -54,7 +54,7 @@ namespace MySystem.SpModels
                 entity.Property(e => e.ActivateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.ActivateStatus)
-                    .HasColumnType("varchar(2)")
+                    .HasColumnType("varchar(20)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -90,6 +90,31 @@ namespace MySystem.SpModels
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MerIdcardNo)
                     .HasColumnType("varchar(18)")
                     .HasCharSet("utf8")
@@ -174,6 +199,31 @@ namespace MySystem.SpModels
 
                 entity.Property(e => e.CreateTime).HasColumnType("datetime");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MerName)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
@@ -1307,6 +1357,31 @@ namespace MySystem.SpModels
 
                 entity.Property(e => e.CreateTime).HasColumnType("datetime");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MerAuditDate).HasColumnType("datetime");
 
                 entity.Property(e => e.MerIdcardNo)
@@ -1794,6 +1869,31 @@ namespace MySystem.SpModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IsStoreCashier)
                     .HasColumnType("varchar(16)")
                     .HasCharSet("utf8")

Startup.cs

@@ -231,7 +231,7 @@ namespace MySystem
             //必须打开的
 
             // StatService.Instance.StatUserLevel();
-            ProfitHelper.Instance.StatProfit("202204"); //统计分润
+            // ProfitHelper.Instance.StatProfit("202204"); //统计分润
             // StatService.Instance.ListenFluxRecord();
             // StatService.Instance.StartEverDay2();
             // TestHelper.Instance.Start();