好哒奖励逻辑更换位置

AppStart/HaoDa/GetHaoDaFTPInfoService.cs

@@ -207,6 +207,7 @@ namespace MySystem
             {
                 WebCMSEntities db = new WebCMSEntities();
                 MpMainModels2.WebCMSEntities mpdb2 = new MpMainModels2.WebCMSEntities();
+                JavaProductModels.WebCMSEntities javauserdb = new JavaProductModels.WebCMSEntities();
                 List<MpMainModels2.HdDepositTmp> deposits = mpdb2.HdDepositTmp.Where(m => m.Status == 0).ToList();
                 if (deposits.Count > 0)
                 {
@@ -224,6 +225,7 @@ namespace MySystem
                         string PassDate = deposit.PassDate; //审核通过时期
                         string MerKind = deposit.MerKind; //商户类型
                         string DepositActCode = deposit.DepositActCode; //商户类型
+                        string PrizeKind = deposit.PrizeKind; //奖励类型
 
                         string ProductType = "0";
                         if (PosKind == "好哒语音王Y512") ProductType = "18";
@@ -341,6 +343,21 @@ namespace MySystem
                             db.SaveChanges();
                         }
 
+                        if ((PrizeKind == "830_21" || PrizeKind == "830_22" || PrizeKind == "833_01" || PrizeKind == "833_02" || PrizeKind == "995_21" || PrizeKind == "995_22" || PrizeKind == "995") && !string.IsNullOrEmpty(PrizeAmt) && decimal.Parse(function.CheckInt(PrizeAmt)) > 0)
+                        {
+                            JavaProductModels.KxsMachine pos = javauserdb.KxsMachine.FirstOrDefault(m => m.PosSn == SnNo && m.UserId > 0);
+                            if(pos != null)
+                            {
+                                Dictionary<string, object> prizeData = new Dictionary<string, object>();
+                                prizeData.Add("brand_id", 29);
+                                prizeData.Add("ext_field", PrizeKind);
+                                prizeData.Add("pos_sn", SnNo);
+                                prizeData.Add("user_id", pos.UserId);
+                                prizeData.Add("prize", PrizeAmt);
+                                RedisDbconn.Instance.AddList("HaoDaPrizeDataQueue", Newtonsoft.Json.JsonConvert.SerializeObject(prizeData));
+                            }
+                        }
+
                         MpMainModels2.HdDepositTmp edit = mpdb2.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
                         if (edit != null)
                         {
@@ -351,6 +368,7 @@ namespace MySystem
                 }
                 db.Dispose();
                 mpdb2.Dispose();
+                javauserdb.Dispose();
             }
             catch (WebException ex)
             {
@@ -702,6 +720,7 @@ namespace MySystem
                 string PassDate = ""; //审核通过时期
                 string MerKind = ""; //商户类型
                 string DepositActCode = ""; //押金活动编号
+                string PrizeKind = ""; //奖励类型
                 if(DataListInfo.Length > 9)
                 {
                     PrizeAmt = DataListInfo[5]; //奖励金额
@@ -711,6 +730,7 @@ namespace MySystem
                     PassDate = DataListInfo[9]; //审核通过时期
                     if (DataListInfo.Length > 10) MerKind = DataListInfo[10]; //商户类型
                     if (DataListInfo.Length > 11) DepositActCode = DataListInfo[11]; //押金活动编号
+                    if (DataListInfo.Length > 12) PrizeKind = DataListInfo[12]; //奖励类型
                 }
                 else
                 {
@@ -747,7 +767,10 @@ namespace MySystem
                         ActDate = ActDate,
                         DeviceKind = PosKind,
                         DepositActCode = DepositActCode,
+                        PrizeKind = PrizeKind,
                         MerNo = MerNo,
+                        CreateTime = DateTime.Now,
+                        UpdateTime = DateTime.Now
                     });
                 }
                 else
@@ -755,18 +778,23 @@ namespace MySystem
                     MpMainModels2.HdDepositTmp edit = db.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
                     if (edit != null)
                     {
-                        edit.Status = 0;
-                        edit.MerKind = MerKind;
-                        edit.PassDate = PassDate;
-                        edit.MerName = MerName;
-                        edit.SendMan = Name;
-                        edit.PrizeDate = PrizeDate;
-                        edit.PrizeAmount = decimal.Parse(function.CheckNum(PrizeAmt));
-                        edit.DepositAmount = decimal.Parse(function.CheckNum(Deposit));
-                        edit.ActDate = ActDate;
-                        edit.DeviceKind = PosKind;
-                        edit.DepositActCode = DepositActCode;
-                        edit.MerNo = MerNo;
+                        if(edit.PrizeAmount == 0 && decimal.Parse(function.CheckNum(PrizeAmt)) > 0)
+                        {
+                            edit.Status = 0;
+                            edit.MerKind = MerKind;
+                            edit.PassDate = PassDate;
+                            edit.MerName = MerName;
+                            edit.SendMan = Name;
+                            edit.PrizeDate = PrizeDate;
+                            edit.PrizeAmount = decimal.Parse(function.CheckNum(PrizeAmt));
+                            edit.DepositAmount = decimal.Parse(function.CheckNum(Deposit));
+                            edit.ActDate = ActDate;
+                            edit.DeviceKind = PosKind;
+                            edit.DepositActCode = DepositActCode;
+                            edit.PrizeKind = PrizeKind;
+                            edit.MerNo = MerNo;
+                            edit.UpdateTime = DateTime.Now;
+                        }
                         if(ActDate == DateTime.Now.AddDays(-1).ToString("yyyyMMdd"))
                         {
                             function.WriteLog(content + "-update", "监控头一天数据");

AppStart/HaoDa/GetHaoDaTouchPrizeService.cs

@@ -232,20 +232,20 @@ namespace MySystem
                         Status = 1,
                     });
 
-                    JavaProductModels.KxsMachine pos = javauserdb.KxsMachine.FirstOrDefault(m => m.PosSn == sn_no && m.UserId > 0);
-                    if(pos != null)
-                    {
-                        Dictionary<string, object> prizeData = new Dictionary<string, object>();
-                        prizeData.Add("brand_id", 29);
-                        prizeData.Add("ext_field", bonus_type);
-                        prizeData.Add("pos_sn", sn_no);
-                        prizeData.Add("user_id", pos.UserId);
-                        if (bonus_type == "830_21" || bonus_type == "830_22" || bonus_type == "995_21" || bonus_type == "995_22")
-                        {
-                            prizeData.Add("prize", reward);
-                        }
-                        RedisDbconn.Instance.AddList("HaoDaPrizeDataQueue", Newtonsoft.Json.JsonConvert.SerializeObject(prizeData));
-                    }
+                    // JavaProductModels.KxsMachine pos = javauserdb.KxsMachine.FirstOrDefault(m => m.PosSn == sn_no && m.UserId > 0);
+                    // if(pos != null)
+                    // {
+                    //     Dictionary<string, object> prizeData = new Dictionary<string, object>();
+                    //     prizeData.Add("brand_id", 29);
+                    //     prizeData.Add("ext_field", bonus_type);
+                    //     prizeData.Add("pos_sn", sn_no);
+                    //     prizeData.Add("user_id", pos.UserId);
+                    //     if (bonus_type == "830_21" || bonus_type == "830_22" || bonus_type == "833_01" || bonus_type == "833_02" || bonus_type == "995_21" || bonus_type == "995_22")
+                    //     {
+                    //         prizeData.Add("prize", reward);
+                    //     }
+                    //     RedisDbconn.Instance.AddList("HaoDaPrizeDataQueue", Newtonsoft.Json.JsonConvert.SerializeObject(prizeData));
+                    // }
                 }
                 else if(bonus_type == "995")
                 {
@@ -253,12 +253,12 @@ namespace MySystem
                     if(item.Status != 2)
                     {
                         function.WriteLog(DateTime.Now.ToString() + ":ok", "好哒碰一碰995奖励");
-                        JavaProductModels.KxsMachine pos = javauserdb.KxsMachine.FirstOrDefault(m => m.PosSn == sn_no && m.UserId > 0);
-                        if(pos != null)
-                        {
-                            function.WriteLog(DateTime.Now.ToString() + ":找到机具", "好哒碰一碰995奖励");
-                            RedisDbconn.Instance.AddList("HaoDaPrizeDataQueue", "{\"brand_id\":29,\"ext_field\":\"" + bonus_type + "\",\"pos_sn\":\"" + sn_no + "\",\"user_id\":" + pos.UserId + "}");
-                        }
+                        // JavaProductModels.KxsMachine pos = javauserdb.KxsMachine.FirstOrDefault(m => m.PosSn == sn_no && m.UserId > 0);
+                        // if(pos != null)
+                        // {
+                        //     function.WriteLog(DateTime.Now.ToString() + ":找到机具", "好哒碰一碰995奖励");
+                        //     RedisDbconn.Instance.AddList("HaoDaPrizeDataQueue", "{\"brand_id\":29,\"ext_field\":\"" + bonus_type + "\",\"pos_sn\":\"" + sn_no + "\",\"user_id\":" + pos.UserId + "}");
+                        // }
                         item.Status = 2;
                         function.WriteLog(DateTime.Now.ToString() + ":执行结束", "好哒碰一碰995奖励");
                     }

MpMainModels2/HdDepositTmp.cs

@@ -18,5 +18,8 @@ namespace MySystem.MpMainModels2
         public string MerNo { get; set; }
         public int Status { get; set; }
         public string DepositActCode { get; set; }
+        public string PrizeKind { get; set; }
+        public DateTime? CreateTime { get; set; }
+        public DateTime? UpdateTime { get; set; }
     }
 }

MpMainModels2/WebCMSEntities.cs

@@ -3496,6 +3496,12 @@ namespace MySystem.MpMainModels2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.PrizeKind)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("奖励类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.DepositAmount)
                     .HasColumnType("decimal(18,2)")
                     .HasComment("押金金额");
@@ -3549,6 +3555,10 @@ namespace MySystem.MpMainModels2
                 entity.Property(e => e.Status)
                     .HasColumnType("int(11)")
                     .HasComment("状态");
+
+                entity.Property(e => e.CreateTime).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateTime).HasColumnType("datetime");
             });
 
             modelBuilder.Entity<HdOrderCodeTmp>(entity =>