好哒获取激活数据逻辑改造

AppStart/GetHaoDaFTPInfoService.cs

@@ -58,10 +58,8 @@ namespace MySystem
                         Thread.Sleep(600000);
                     }
                 }
-                else
-                {
-                    Thread.Sleep(1800000);
-                }
+                GetDepositData(DateTime.Now.ToString("yyyyMMdd"));
+                Thread.Sleep(7200000);
             }
         }
         public void StartListen()
@@ -130,10 +128,12 @@ namespace MySystem
                             string PrizeAmt = DataListInfo[5]; //奖励金额
                             string PrizeDate = DataListInfo[6]; //奖励发放时间
                             string Name = DataListInfo[7]; //发放人姓名
+                            string MerName = DataListInfo[8]; //商户名称
+                            string PassDate = DataListInfo[9]; //审核通过时期
 
-                            if(ActDate == Date)
+                            string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.Substring(6, 2);
+                            if(DateTime.Parse(ActDateString) >= DateTime.Parse(DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd")))
                             {
-                                string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.Substring(6, 2);
                                 string PrizeDateString = "";
                                 if(PrizeDate == "None")
                                 {
@@ -144,72 +144,79 @@ namespace MySystem
                                     PrizeDateString = PrizeDate.Substring(0, 4) + "-" + PrizeDate.Substring(4, 2) + "-" + PrizeDate.Substring(6, 2);
                                 }
 
-                                string ProductType = "0";
-                                if(PosKind == "好哒语音王Y512") ProductType = "18";
-                                if(PosKind == "4G收款王M820") ProductType = "19";
-                                if(PosKind == "4G收款王M826") ProductType = "20";
-                                if(PosKind == "好哒S312") ProductType = "21";
-
-                                db.BindRecord.Add(new BindRecord()
+                                if(!db.BindRecord.Any(m => m.MerSnNo == SnNo))
                                 {
-                                    CreateDate = DateTime.Now,
-                                    UpdateTime = DateTime.Now, //机具绑定、解绑时间
-                                    CreateTime = DateTime.Now, //商户操作时间
-                                    MerSnNo = SnNo, //序列号
-                                    MerNo = MerNo, //商户编号
-                                    MerName = Name,
-                                    SeoTitle = PrizeAmt,
-                                    SeoKeyword = ActDateString,
-                                    ProductType = ProductType,
-                                    Field1 = Deposit,
-                                    Field2 = PrizeDate,
-                                    Status = 1,
-                                });
-
-                                db.Merchants.Add(new Merchants()
-                                {
-                                    SnNo = SnNo,
-                                    CreateTime = DateTime.Now,
-                                    UpdateTime = DateTime.Now,
-                                    AgentName = Name,
-                                    MerRealName = Name,
-                                    MerNo = MerNo,
-                                    MerName = Name,
-                                    ProductType = ProductType,
-                                    Status = 1,
-                                });
-                                db.SaveChanges();
-
-                                Thread.Sleep(1000);
-
-                                db.ActivateRecord.Add(new ActivateRecord()
-                                {
-                                    SnNo = SnNo,
-                                    CreateDate = DateTime.Now,
-                                    SeoTitle = Deposit,
-                                    ActivateDate = DateTime.Now,
-                                    AgentNo = MerNo,
-                                    MerRealName = Name,
-                                    MerNo = MerNo,
-                                    MerName = Name,
-                                    ProductType = ProductType,
-                                    ChannelSerial = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8),
-                                    Status = 1,
-                                });
-                                db.SaveChanges();
-
-                                //推送MQ给创业帮
-                                var merchantAddInfo = mpdb2.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
-                                if (merchantAddInfo.BrandId == 1 && !string.IsNullOrEmpty(merchantAddInfo.CybMakerCode))
-                                {
-                                    SortedList<string, string> obj = new SortedList<string, string>();
-                                    obj.Add("create_time", ActDateString);
-                                    obj.Add("sn", SnNo);
-                                    obj.Add("deposit", Deposit);
-                                    obj.Add("subject_type", merchantAddInfo.SubjectType);
-                                    obj.Add("merch_no", merchantAddInfo.MchtNo);
-                                    obj.Add("maker_code", merchantAddInfo.CybMakerCode);
-                                    PushHelper.Instance.Do(obj, "cashNotify");
+                                    string ProductType = "0";
+                                    if(PosKind == "好哒语音王Y512") ProductType = "18";
+                                    if(PosKind == "4G收款王M820") ProductType = "19";
+                                    if(PosKind == "4G收款王M826") ProductType = "20";
+                                    if(PosKind == "好哒S312") ProductType = "21";
+                                    if(PosKind == "好哒扫码通M837") ProductType = "29";
+
+                                    db.BindRecord.Add(new BindRecord()
+                                    {
+                                        CreateDate = DateTime.Now,
+                                        UpdateTime = DateTime.Now, //机具绑定、解绑时间
+                                        CreateTime = DateTime.Now, //商户操作时间
+                                        MerSnNo = SnNo, //序列号
+                                        MerNo = MerNo, //商户编号
+                                        MerName = MerName,
+                                        SeoTitle = PrizeAmt,
+                                        SeoKeyword = ActDateString,
+                                        ProductType = ProductType,
+                                        Field1 = Deposit,
+                                        Field2 = PrizeDate,
+                                        Field3 = Name,
+                                        Field4 = PassDate,
+                                        Status = 1,
+                                    });
+
+                                    db.Merchants.Add(new Merchants()
+                                    {
+                                        SnNo = SnNo,
+                                        CreateTime = DateTime.Now,
+                                        UpdateTime = DateTime.Now,
+                                        AgentName = Name,
+                                        MerRealName = Name,
+                                        MerNo = MerNo,
+                                        MerName = Name,
+                                        ProductType = ProductType,
+                                        Status = 1,
+                                    });
+                                    db.SaveChanges();
+
+                                    Thread.Sleep(1000);
+
+                                    db.ActivateRecord.Add(new ActivateRecord()
+                                    {
+                                        SnNo = SnNo,
+                                        CreateDate = DateTime.Now,
+                                        SeoTitle = Deposit,
+                                        ActivateDate = DateTime.Now,
+                                        AgentNo = MerNo,
+                                        MerRealName = Name,
+                                        MerNo = MerNo,
+                                        MerName = Name,
+                                        ProductType = ProductType,
+                                        ChannelSerial = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8),
+                                        Status = 1,
+                                        Field1 = PassDate,
+                                    });
+                                    db.SaveChanges();
+
+                                    //推送MQ给创业帮
+                                    var merchantAddInfo = mpdb2.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
+                                    if (merchantAddInfo.BrandId == 1 && !string.IsNullOrEmpty(merchantAddInfo.CybMakerCode))
+                                    {
+                                        SortedList<string, string> obj = new SortedList<string, string>();
+                                        obj.Add("create_time", ActDateString);
+                                        obj.Add("sn", SnNo);
+                                        obj.Add("deposit", Deposit);
+                                        obj.Add("subject_type", merchantAddInfo.SubjectType);
+                                        obj.Add("merch_no", merchantAddInfo.MchtNo);
+                                        obj.Add("maker_code", merchantAddInfo.CybMakerCode);
+                                        PushHelper.Instance.Do(obj, "cashNotify");
+                                    }
                                 }
                             }
                         }