小蓝环逻辑调整

AppStart/HaoDa/GetHaoDaFTPInfoService.cs

@@ -895,32 +895,38 @@ namespace MySystem
                             if(TradeAmount >= 2)
                             {
                                 //小蓝环奖励
-                                MpMainModels2.HdBlueCircleTmp blueCircleTmp = db.HdBlueCircleTmp.FirstOrDefault(m => m.SnNo == BaseNo && m.PrizeFlag == 0);
-                                if(blueCircleTmp != null)
+                                bool PrizeFlag = db.HdBlueCircleTmp.Any(m => m.MchtNo == MerchantNo);
+                                if(!PrizeFlag)
                                 {
-                                    string BindDateDetail = blueCircleTmp.BindDateDetail;
-                                    DateTime BindTime = DateTime.Parse(BindDateDetail.Substring(0, 4) + "-" + BindDateDetail.Substring(4, 2) + "-" + BindDateDetail.Substring(6, 2) + " " + BindDateDetail.Substring(8, 2) + ":" + BindDateDetail.Substring(10, 2) + ":" + BindDateDetail.Substring(12, 2));
-                                    if(BindTime > DateTime.Now.AddDays(-30))
+                                    MpMainModels2.HdBlueCircleTmp blueCircleTmp = db.HdBlueCircleTmp.FirstOrDefault(m => m.SnNo == BaseNo && m.PrizeFlag == 0);
+                                    if(blueCircleTmp != null)
                                     {
-                                        blueCircleTmp.PrizeFlag = 1;
-                                        db.SaveChanges();
-                                        // RedisDbconn.Instance.AddList("HaoDaPrizeDataQueue",);
+                                        string BindDateDetail = blueCircleTmp.BindDateDetail;
+                                        DateTime BindTime = DateTime.Parse(BindDateDetail.Substring(0, 4) + "-" + BindDateDetail.Substring(4, 2) + "-" + BindDateDetail.Substring(6, 2) + " " + BindDateDetail.Substring(8, 2) + ":" + BindDateDetail.Substring(10, 2) + ":" + BindDateDetail.Substring(12, 2));
+                                        if(BindTime > DateTime.Now.AddDays(-30))
+                                        {
+                                            blueCircleTmp.PrizeFlag = 1;
+                                            db.SaveChanges();
+                                            MpMainModels2.MerchantAddInfo addInfo = db.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerchantNo) ?? new MpMainModels2.MerchantAddInfo();
+                                            MpMainModels2.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == addInfo.Id) ?? new MpMainModels2.MerchantInfo();
+                                            RedisDbconn.Instance.AddList("HaoDaPrizeDataQueue", "{\"brand_id\":29,\"ext_field\":\"xlh\",\"pos_sn\":\"" + BaseNo + "\",\"user_id\":" + merchant.UserId + "}");
+                                        }
                                     }
                                 }
 
                                 //点餐码奖励
-                                MpMainModels2.HdOrderCodeTmp orderCodeTmp = db.HdOrderCodeTmp.FirstOrDefault(m => m.Sn == BaseNo && m.PrizeFlag == 0);
-                                if(orderCodeTmp != null)
-                                {
-                                    MpMainModels2.HdPrizeFlag flag = db.HdPrizeFlag.FirstOrDefault(m => m.MchtNo == orderCodeTmp.MchtNo) ?? new MpMainModels2.HdPrizeFlag();
-                                    DateTime BindTime = orderCodeTmp.CreateTime.Value;
-                                    if(BindTime > DateTime.Now.AddDays(-30) && flag.OrderCodePrize <= 10)
-                                    {
-                                        orderCodeTmp.PrizeFlag = 1;
-                                        flag.OrderCodePrize += 1;
-                                        db.SaveChanges();
-                                    }
-                                }
+                                // MpMainModels2.HdOrderCodeTmp orderCodeTmp = db.HdOrderCodeTmp.FirstOrDefault(m => m.Sn == BaseNo && m.PrizeFlag == 0);
+                                // if(orderCodeTmp != null)
+                                // {
+                                //     MpMainModels2.HdPrizeFlag flag = db.HdPrizeFlag.FirstOrDefault(m => m.MchtNo == orderCodeTmp.MchtNo) ?? new MpMainModels2.HdPrizeFlag();
+                                //     DateTime BindTime = orderCodeTmp.CreateTime.Value;
+                                //     if(BindTime > DateTime.Now.AddDays(-30) && flag.OrderCodePrize <= 10)
+                                //     {
+                                //         orderCodeTmp.PrizeFlag = 1;
+                                //         flag.OrderCodePrize += 1;
+                                //         db.SaveChanges();
+                                //     }
+                                // }
                             }
                         }
                         else