押金和交易的队列分开

AppStart/GetHaoDaFTPInfoService.cs

@@ -527,59 +527,62 @@ namespace MySystem
 
                             TradeDate = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2) + " " + TradeDate.Substring(8, 2) + ":" + TradeDate.Substring(10, 2) + ":" + TradeDate.Substring(12, 2);
 
-                            function.WriteLog("OrderNo:" + OrderNo, "获取好哒FTP文件交易数据");
-                            function.WriteLog("MerchantNo:" + MerchantNo, "获取好哒FTP文件交易数据");
+                            if(DateTime.Parse(TradeDate) > DateTime.Parse(DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd") + " 00:00:00"))
+                            {
+                                function.WriteLog("OrderNo:" + OrderNo, "获取好哒FTP文件交易数据");
+                                function.WriteLog("MerchantNo:" + MerchantNo, "获取好哒FTP文件交易数据");
 
-                            var PayMode = 0;
-                            if (PayWay.Contains("支付宝")) PayMode = 1;
-                            if (PayWay.Contains("微信")) PayMode = 2;
+                                var PayMode = 0;
+                                if (PayWay.Contains("支付宝")) PayMode = 1;
+                                if (PayWay.Contains("微信")) PayMode = 2;
 
-                            var merchantAddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerchantNo) ?? new MpMainModels2.MerchantAddInfo();
-                            if (merchantAddInfo.Id > 0)
-                            {
-                                function.WriteLog("找到商户", "获取好哒FTP文件交易数据");
-                                var merchantInfo = db.MerchantInfo.FirstOrDefault(m => m.Id == merchantAddInfo.Id) ?? new MpMainModels2.MerchantInfo();
-                                if(merchantInfo.IsAct == 0)
+                                var merchantAddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerchantNo) ?? new MpMainModels2.MerchantAddInfo();
+                                if (merchantAddInfo.Id > 0)
                                 {
-                                    merchantInfo.IsAct = 1;
-                                }
-                                var orders = db.ConsumerOrders.FirstOrDefault(m => m.SeoTitle == OrderNo && m.OrderNo == OrderNo) ?? new MpMainModels2.ConsumerOrders();
-                                if (orders.Id == 0)
-                                {
-                                    function.WriteLog("订单号不存在，开始入库", "获取好哒FTP文件交易数据");
-                                    var query = db.ConsumerOrders.Add(new MpMainModels2.ConsumerOrders()
+                                    function.WriteLog("找到商户", "获取好哒FTP文件交易数据");
+                                    var merchantInfo = db.MerchantInfo.FirstOrDefault(m => m.Id == merchantAddInfo.Id) ?? new MpMainModels2.MerchantInfo();
+                                    if(merchantInfo.IsAct == 0)
                                     {
-                                        Status = 1,
-                                        CreateDate = DateTime.Parse(TradeDate),
-                                        UpdateDate = DateTime.Parse(TradeDate),
-                                        SnNo = BaseNo,
-                                        PayMoney = decimal.Parse(TradeAmount),
-                                        PayMode = PayMode,
-                                        SeoTitle = OrderNo,
-                                        OrderNo = OrderNo,
-                                        MerchantId = merchantAddInfo.Id,
-                                        UserId = merchantInfo.UserId,
-                                        SeoKeyword = merchantAddInfo.CybMakerCode,
-                                    }).Entity;
-                                    db.SaveChanges();
-                                    function.WriteLog("入库完毕", "获取好哒FTP文件交易数据");
-
-                                    //推送MQ给创业帮
-                                    if (merchantAddInfo.BrandId == 1)
+                                        merchantInfo.IsAct = 1;
+                                    }
+                                    var orders = db.ConsumerOrders.FirstOrDefault(m => m.SeoTitle == OrderNo && m.OrderNo == OrderNo) ?? new MpMainModels2.ConsumerOrders();
+                                    if (orders.Id == 0)
                                     {
-                                        if(!string.IsNullOrEmpty(merchantAddInfo.CybMakerCode))
+                                        function.WriteLog("订单号不存在，开始入库", "获取好哒FTP文件交易数据");
+                                        var query = db.ConsumerOrders.Add(new MpMainModels2.ConsumerOrders()
+                                        {
+                                            Status = 1,
+                                            CreateDate = DateTime.Parse(TradeDate),
+                                            UpdateDate = DateTime.Parse(TradeDate),
+                                            SnNo = BaseNo,
+                                            PayMoney = decimal.Parse(TradeAmount),
+                                            PayMode = PayMode,
+                                            SeoTitle = OrderNo,
+                                            OrderNo = OrderNo,
+                                            MerchantId = merchantAddInfo.Id,
+                                            UserId = merchantInfo.UserId,
+                                            SeoKeyword = merchantAddInfo.CybMakerCode,
+                                        }).Entity;
+                                        db.SaveChanges();
+                                        function.WriteLog("入库完毕", "获取好哒FTP文件交易数据");
+
+                                        //推送MQ给创业帮
+                                        if (merchantAddInfo.BrandId == 1)
                                         {
-                                            SortedList<string, string> obj = new SortedList<string, string>();
-                                            obj.Add("create_time", TradeDate);
-                                            obj.Add("sn", BaseNo);
-                                            obj.Add("pay_money", TradeAmount);
-                                            obj.Add("pay_mode", PayMode.ToString());
-                                            obj.Add("order_no", OrderNo);
-                                            obj.Add("merch_no", merchantAddInfo.MchtNo);
-                                            obj.Add("maker_code", merchantAddInfo.CybMakerCode);
-                                            PushHelper.Instance.Do(obj);
+                                            if(!string.IsNullOrEmpty(merchantAddInfo.CybMakerCode))
+                                            {
+                                                SortedList<string, string> obj = new SortedList<string, string>();
+                                                obj.Add("create_time", TradeDate);
+                                                obj.Add("sn", BaseNo);
+                                                obj.Add("pay_money", TradeAmount);
+                                                obj.Add("pay_mode", PayMode.ToString());
+                                                obj.Add("order_no", OrderNo);
+                                                obj.Add("merch_no", merchantAddInfo.MchtNo);
+                                                obj.Add("maker_code", merchantAddInfo.CybMakerCode);
+                                                PushHelper.Instance.Do(obj);
+                                            }
+                                            OrderMessageHelper.SendOrderMsg(query);
                                         }
-                                        OrderMessageHelper.SendOrderMsg(query);
                                     }
                                 }
                             }