Merge branch 'feat-lcl-推送机具数据' into test-mainserver

AppStart/Helper/PosPushDataHelper.cs

@@ -93,6 +93,25 @@ namespace MySystem
             }
         }
 
+        //激活数据
+        public static void Active(PosMerchantInfo mer)
+        {
+            try
+            {
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", mer.KqSnNo); //机具sn
+                dataContent.Add("mobile", mer.KqMerNo); //商户号
+                dataContent.Add("request_id", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8)); //流水号
+                dataContent.Add("activation_time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                dataContent.Add("brand", mer.BrandId); //品牌
+                Push("active", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送激活数据异常");
+            }
+        }
+
         //交易数据
         public static void Trade(TradeRecord trade)
         {

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -241,6 +241,8 @@ namespace MySystem
 
                                         //发放奖励MQ
                                         PrizeSetHelper.Do("6", pos.PosSn);
+
+                                        PosPushDataHelper.Active(add);
                                     }
                                 }
 

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -964,6 +964,10 @@ namespace MySystem
 
                 //推送激活数据
                 if(Deposit == 0) Utils.Instance.SendActData(pos);
+                if(pos.BrandId == 14 && merchant != null)
+                {
+                    PosPushDataHelper.Active(merchant);
+                }
             }
             else if (pos.ActivationState == 1 && pos.BrandId == 14)
             {