好哒押金数据入库需要判断激活时间

AppStart/GetHaoDaFTPInfoService.cs

@@ -131,82 +131,85 @@ namespace MySystem
                             string PrizeDate = DataListInfo[6]; //奖励发放时间
                             string Name = DataListInfo[7]; //发放人姓名
 
-                            string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.Substring(6, 2);
-                            string PrizeDateString = "";
-                            if(PrizeDate == "None")
+                            if(ActDate == Date)
                             {
-                                PrizeDate = Date;
-                            }
-                            else
-                            {
-                                PrizeDateString = PrizeDate.Substring(0, 4) + "-" + PrizeDate.Substring(4, 2) + "-" + PrizeDate.Substring(6, 2);
-                            }
+                                string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.Substring(6, 2);
+                                string PrizeDateString = "";
+                                if(PrizeDate == "None")
+                                {
+                                    PrizeDate = Date;
+                                }
+                                else
+                                {
+                                    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";
+                                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()
-                            {
-                                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("merch_no", merchantAddInfo.MchtNo);
-                                obj.Add("maker_code", merchantAddInfo.CybMakerCode);
-                                PushHelper.Instance.Do(obj, "cashNotify");
+                                db.BindRecord.Add(new BindRecord()
+                                {
+                                    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("merch_no", merchantAddInfo.MchtNo);
+                                    obj.Add("maker_code", merchantAddInfo.CybMakerCode);
+                                    PushHelper.Instance.Do(obj, "cashNotify");
+                                }
                             }
                         }
                     }