Merge branch 'DuGuYang'

AppStart/Alipay/AlipayFunction.cs

@@ -159,14 +159,14 @@ namespace MySystem
             }
             if (!string.IsNullOrEmpty(BusinessLicensePicPath))
             {
-                FileItem BusinessLicensePic = new FileItem(function.getPath(BusinessLicensePicPath));
+                FileItem BusinessLicensePic = PublicFunction.GetNetFileItem(AppConfig.Base.OssHost + BusinessLicensePicPath);
                 request.BusinessLicensePic = BusinessLicensePic; //营业执照图片。被代创建商户运营主体为个人账户必填，企业账户无需填写
-                FileItem BusinessLicenseAuthPic = new FileItem(function.getPath(BusinessLicensePicPath));
+                FileItem BusinessLicenseAuthPic = PublicFunction.GetNetFileItem(AppConfig.Base.OssHost + BusinessLicensePicPath);
                 request.BusinessLicenseAuthPic = BusinessLicenseAuthPic;
             }
             if (!string.IsNullOrEmpty(SpecialLicensePicPath))
             {
-                FileItem SpecialLicensePic = new FileItem(function.getPath(SpecialLicensePicPath));
+                FileItem SpecialLicensePic = PublicFunction.GetNetFileItem(AppConfig.Base.OssHost + SpecialLicensePicPath);
                 request.SpecialLicensePic = SpecialLicensePic;
             }
             if (!string.IsNullOrEmpty(ShopScenePicPath))
@@ -175,7 +175,7 @@ namespace MySystem
                 {
                     ShopScenePicPath = ShopScenePicPath.Split(',')[0];
                 }
-                FileItem ShopScenePic = new FileItem(function.getPath(ShopScenePicPath));
+                FileItem ShopScenePic = PublicFunction.GetNetFileItem(AppConfig.Base.OssHost + ShopScenePicPath);
                 request.ShopScenePic = ShopScenePic;
             }
             if (!string.IsNullOrEmpty(ShopSignBoardPicPath))
@@ -184,7 +184,7 @@ namespace MySystem
                 {
                     ShopSignBoardPicPath = ShopSignBoardPicPath.Split(',')[0];
                 }
-                FileItem ShopSignBoardPic = new FileItem(function.getPath(ShopSignBoardPicPath));
+                FileItem ShopSignBoardPic = PublicFunction.GetNetFileItem(AppConfig.Base.OssHost + ShopSignBoardPicPath);
                 request.ShopSignBoardPic = ShopSignBoardPic;
             }
             // FileItem SpecialLicensePic = new FileItem("C:/Downloads/ooopic_963991_7eea1f5426105f9e6069/16365_1271139700.jpg");

AppStart/Helper/Profit/ProfitHelper.cs

@@ -358,9 +358,16 @@ namespace MySystem
         {
             while(true)
             {
-                if(DateTime.Now.Day < 10 && DateTime.Now.Hour > 2 && DateTime.Now.Hour < 5)
+                if(DateTime.Now.Day < 10 && DateTime.Now.Hour > 2 && DateTime.Now.Hour < 23)
                 {
-                    DoProfit();
+                    try
+                    {
+                        DoProfit();
+                    }
+                    catch(Exception ex)
+                    {
+                        LogHelper.Instance.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "来客吧分润异常");
+                    }
                     Thread.Sleep(600000);
                 }
                 else
@@ -781,7 +788,7 @@ namespace MySystem
                         user = users[curFloor - 1];
                     }
                     SubUser selfUser = GetUser(user.UserId, Month) ?? new SubUser();
-                    int UserLevel = selfUser.PreUserLevel > selfUser.UserLevel ? selfUser.PreUserLevel : selfUser.UserLevel; //当前会员等级
+                    int UserLevel = GetUserLevel(selfUser); //当前会员等级
                     //判断当前创客是否有直推的激活机具，并且在活动时间内
                     if (curLevel == maxLevel)
                     {
@@ -847,10 +854,21 @@ namespace MySystem
                 user.ParentNav = dt.Rows[0]["ParentNav"].ToString();
                 user.UserLevel = int.Parse(dt.Rows[0]["UserLevel"].ToString());
                 user.PreUserLevel = int.Parse(dt.Rows[0]["PreUserLevel"].ToString());
+                user.PreLeaderLevel = int.Parse(dt.Rows[0]["PreLeaderLevel"].ToString());
+                user.PreOpLevel = int.Parse(dt.Rows[0]["PreOpLevel"].ToString());
             }
             return user;
         }
 
+        public int GetUserLevel(SubUser user)
+        {
+            int level = user.UserLevel;
+            if(user.PreUserLevel > level) level = user.PreUserLevel;
+            if(user.PreLeaderLevel > level) level = user.PreLeaderLevel;
+            if(user.PreOpLevel > level) level = user.PreOpLevel;
+            return level;
+        }
+
         public DataTable GetDataTable(string sqlstr)
         {
             DataTable dt = CustomerSqlConn.dtable(sqlstr, Library.ConfigurationManager.AppSettings["KxsStatSqlConnStr"].ToString());

AppStart/Helper/ProfitShareService.cs

@@ -58,7 +58,7 @@ namespace MySystem
                         if (order != null)
                         {
                             order.DivideLog = "分账审核结果：" + result;
-                            order.DivideFlag = 1;
+                            order.DivideFlag = 2;
                             db.SaveChanges();
                             RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + order.PayMode + ":List", order.Id.ToString());
                             // RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.PayMode + ":" + order.MerchantId, order);

AppStart/Helper/TestHaoDaService.cs

@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using MySystem.Models;
+using Library;
+using LitJson;
+using System.Threading;
+
+namespace MySystem
+{
+    /// <summary>
+    /// 好哒测试服务
+    /// </summary>
+    public class TestHaoDaService
+    {
+        public readonly static TestHaoDaService Instance = new TestHaoDaService();
+        private TestHaoDaService()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(StartListen);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void StartListen()
+        {
+            // StartProfitShareListen(152455);//提交分账
+            StartProfitShareListen(153249);//提交分账
+        }
+
+        public void StartProfitShareListen(int OrderId)
+        {
+
+            try
+            {
+                WebCMSEntities db = new WebCMSEntities();
+                DateTime checkDate = DateTime.Now.AddMinutes(-1);
+                // var list = db.ConsumerOrders.Select(m => new { m.Id, m.CreateDate, m.Status, m.IsAct, m.PayMode }).Where(m => m.Status == 1 && m.PayMode == 2 && m.IsAct == 1 && m.CreateDate < checkDate).OrderBy(m => m.Id).Take(10).ToList();
+                var list = db.ConsumerOrders.Select(m => new { m.Id, m.CreateDate, m.Status, m.IsAct, m.PayMode }).Where(m => m.Id == OrderId).OrderBy(m => m.Id).Take(10).ToList();
+                foreach (var sub in list)
+                {
+                    LogHelper.Instance.WriteLog(DateTime.Now.ToString(), "微信分账队列异常");
+                    LogHelper.Instance.WriteLog("Id:" + sub.Id, "微信分账队列异常");
+                    ConsumerOrders order = db.ConsumerOrders.FirstOrDefault(m => m.Id == sub.Id);
+                    if (order != null)
+                    {
+                        order.Status = 2;
+                        MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantInfo();
+                        MerchantParamSet set = db.MerchantParamSet.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantParamSet();
+                        LogHelper.Instance.WriteLog("IsAct:" + order.IsAct, "微信分账队列监听");
+                        LogHelper.Instance.WriteLog("PayMoney:" + order.PayMoney, "微信分账队列监听");
+                        LogHelper.Instance.WriteLog("MinPayMoney:" + set.MinPayMoney, "微信分账队列监听");
+                        if (order.IsAct == 1 && order.PayMoney >= set.MinPayMoney)
+                        {
+                            MerchantAddInfo merchantAdd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantAddInfo();
+                            //添加分账接收方
+                            if (merchant.Version == 0)
+                            {
+                                WeChatFunction.Instance.AddReceive(merchantAdd.SubMchid, "MERCHANT_ID", WeChatFunction.Instance.MchId, WeChatFunction.Instance.MchName, "PARTNER");
+                                merchant.Version = 1;
+                                db.SaveChanges();
+                            }
+                            LogHelper.Instance.WriteLog("准备分账", "微信分账队列监听");
+                            //发起分账
+                            decimal fee = order.PayMoney; //单位：分
+                            if (fee >= 1)
+                            {
+                                string TradeNo = order.SeoTitle;
+                                string OrderNo = order.OrderNo;
+                                decimal hdfee = 0.0038M * order.PayMoney * (1 - set.GetPercent - 0.01M);
+                                hdfee = decimal.Parse(hdfee.ToString("f2"));
+                                decimal servicefee = 0.01M * order.PayMoney - hdfee;
+                                servicefee = servicefee * 100;
+                                int servicefeeNum = int.Parse(servicefee.ToString("f0"));
+                                List<ReceiverList> Receivers = new List<ReceiverList>();
+                                Receivers.Add(new ReceiverList()
+                                {
+                                    type = "MERCHANT_ID",  //分账接收方类型
+                                    account = WeChatFunction.Instance.MchId,  //分账接收方账号
+                                    amount = servicefeeNum,  //分账金额
+                                    description = "服务费",  //分账描述
+                                });
+                                LogHelper.Instance.WriteLog("TradeNo:" + TradeNo, "微信分账队列监听");
+                                LogHelper.Instance.WriteLog("OrderNo:" + OrderNo, "微信分账队列监听");
+                                LogHelper.Instance.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(Receivers), "微信分账队列监听");
+                                string ProfitShareResult = WeChatFunction.Instance.ProfitShare(merchantAdd.SubMchid, TradeNo, OrderNo, Receivers);
+                                LogHelper.Instance.WriteLog("分账结果:" + ProfitShareResult, "微信分账队列监听");
+                                order.DivideLog = "请求分账日志：" + ProfitShareResult;
+                                db.SaveChanges();
+
+                                //开始监听分账状态
+                                Dictionary<string, object> req = new Dictionary<string, object>();
+                                req.Add("SubMchid", merchantAdd.SubMchid); //子商户号
+                                req.Add("TradeNo", TradeNo); //微信订单号
+                                req.Add("OrderNo", OrderNo); //商户订单号
+                                RedisDbconn.Instance.AddList("ProfitShareQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+                            }
+                            else
+                            {
+                                RedisDbconn.Instance.AddList("ConsumerOrders:Divi:2:List", order.Id.ToString());
+                                // RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:2:" + order.MerchantId, order);
+                            }
+                        }
+                    }
+                    LogHelper.Instance.WriteLog("\n\n", "微信分账队列监听");
+                }
+                db.SaveChanges();
+                db.Dispose();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Instance.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "微信分账队列异常");
+            }
+            Thread.Sleep(2000);
+
+        }
+
+    }
+}

AppStart/PublicFunction.cs

@@ -5,6 +5,7 @@ using System.Data;
 using System.Text.RegularExpressions;
 using MySystem.Models;
 using Library;
+using Aop.Api.Util;
 
 namespace MySystem
 {
@@ -37,5 +38,56 @@ namespace MySystem
             }
             return "";
         }
+
+
+
+        #region 获取网络文件内容
+
+        public static string GetNetFileContent(string url)
+        {
+            string textContent = "";     
+            using (var client = new System.Net.WebClient())
+            {
+                try
+                {
+                    textContent = client.DownloadString(url); // 通过 DownloadString 方法获取网页内容
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "获取网络文件内容异常");
+                }
+            }
+            return textContent;
+        }
+
+        public static byte[] GetNetFileData(string url)
+        {
+            byte[] textContent = new byte[] { };
+            using (var client = new System.Net.WebClient())
+            {
+                try
+                {
+                    textContent = client.DownloadData(url); // 通过 DownloadString 方法获取网页内容
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "获取网络文件流异常");
+                }
+            }
+            return textContent;
+        }
+
+        public static FileItem GetNetFileItem(string url)
+        {
+            string fileName = url;
+            if(fileName.Contains("/"))
+            {
+                fileName = fileName.Substring(fileName.LastIndexOf("/") + 1);
+            }
+            FileItem item = new FileItem(fileName, GetNetFileData(url));
+            return item;
+        }
+
+        #endregion
     }
 }

AppStart/Tables/SubUser.cs

@@ -9,5 +9,7 @@ namespace MySystem
         public string ParentNav { get; set; }
         public int UserLevel { get; set; }
         public int PreUserLevel { get; set; }
+        public int PreLeaderLevel { get; set; }
+        public int PreOpLevel { get; set; }
     }
 }

AppStart/WeChatFunction.cs

@@ -540,10 +540,11 @@ namespace MySystem
             }
             string filePath = function.getPath(imgPath);
             var filename = Path.GetFileName(filePath);
-            FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read);
-            Byte[] imgBytesIn = new Byte[fs.Length];
-            fs.Read(imgBytesIn, 0, imgBytesIn.Length);
-            fs.Close();
+            // FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read);
+            // Byte[] imgBytesIn = new Byte[fs.Length];
+            // fs.Read(imgBytesIn, 0, imgBytesIn.Length);
+            // fs.Close();
+            byte[] imgBytesIn = PublicFunction.GetNetFileData(AppConfig.Base.OssHost + imgPath);
 
             byte[] hash = SHA256Managed.Create().ComputeHash(imgBytesIn);
 

Config/Base.cs

@@ -0,0 +1,9 @@
+using Library;
+
+namespace AppConfig
+{
+    public class Base
+    {
+        public static string OssHost = ConfigurationManager.AppSettings["OssHost"].ToString();
+    }
+}

appsettings.json

@@ -16,6 +16,7 @@
     "DbSchemeUrl": "",
     "Host": "http://localhost:5303/",
     "SourceHost": "http://main.qrcodeplate.com/",
+    "OssHost": "http://oss.kxssaas.com",
     "Database": "QrCodePlateMainServer",
     "SqlConnStr": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "SqlConnStr2": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",