推送好哒绑定和押金数据

AppStart/GetHaoDaFTPInfoService.cs

@@ -191,7 +191,7 @@ namespace MySystem
                                     if(PosKind == "好哒S312") ProductType = "21";
                                     if(PosKind == "好哒扫码通M837") ProductType = "29";
 
-                                    db.BindRecord.Add(new BindRecord()
+                                    BindRecord mer = db.BindRecord.Add(new BindRecord()
                                     {
                                         CreateDate = DateTime.Now,
                                         UpdateTime = DateTime.Now, //机具绑定、解绑时间
@@ -208,7 +208,7 @@ namespace MySystem
                                         Field4 = PassDate,
                                         Field5 = MerKind,
                                         Status = 1,
-                                    });
+                                    }).Entity;
 
                                     db.Merchants.Add(new Merchants()
                                     {
@@ -226,7 +226,7 @@ namespace MySystem
 
                                     Thread.Sleep(1000);
 
-                                    db.ActivateRecord.Add(new ActivateRecord()
+                                    ActivateRecord act = db.ActivateRecord.Add(new ActivateRecord()
                                     {
                                         SnNo = SnNo,
                                         CreateDate = DateTime.Now,
@@ -241,7 +241,7 @@ namespace MySystem
                                         Status = 1,
                                         Field1 = PassDate,
                                         Field2 = MerKind,
-                                    });
+                                    }).Entity;
                                     db.SaveChanges();
 
                                     //推送MQ给创业帮
@@ -256,6 +256,9 @@ namespace MySystem
                                         obj.Add("merch_no", merchantAddInfo.MchtNo);
                                         obj.Add("maker_code", merchantAddInfo.CybMakerCode);
                                         PushHelper.Instance.Do(obj, "cashNotify");
+
+                                        PosPushDataNewHelper.Bind(mer);
+                                        PosPushDataNewHelper.Deposit(act);
                                     }
                                 }
                             }
@@ -592,7 +595,7 @@ namespace MySystem
                                             }
                                             OrderMessageHelper.SendOrderMsg(query);
                                             
-                                            PosPushDataNewHelper.Trade(query, DeviceKind);
+                                            // PosPushDataNewHelper.Trade(query, DeviceKind);
                                         }
                                     }
                                 }

AppStart/PosPushDataNewHelper.cs

@@ -12,6 +12,51 @@ namespace MySystem
         private PosPushDataNewHelper()
         { }
 
+        //绑定数据
+        public static void Bind(SpModels.BindRecord mer)
+        {
+            try
+            {
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", mer.MerSnNo); //机具sn
+                dataContent.Add("mer_no", mer.MerNo); //商户号
+                dataContent.Add("id_card", ""); //商户身份证
+                dataContent.Add("mer_name", mer.MerName); //商户姓名
+                dataContent.Add("mer_mobile", ""); //商户手机号
+                dataContent.Add("request_id", getRequestId(mer.Id, "bind")); //流水号
+                dataContent.Add("bind_time", mer.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
+                dataContent.Add("brand", int.Parse(function.CheckInt(mer.ProductType))); //品牌
+                Push("bind", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送绑定数据异常");
+            }
+        }
+
+        //押金数据
+        public static void Deposit(SpModels.ActivateRecord act)
+        {
+            try
+            {
+                List<string> BrandIds = new List<string>();
+                decimal TradeAmount = decimal.Parse(function.CheckNum(act.SeoTitle));
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", act.SnNo); //机具sn
+                dataContent.Add("mer_no", act.MerNo); //商户号
+                dataContent.Add("request_id", getRequestId(act.Id, "deposit")); //流水号
+                dataContent.Add("deposit_amount", TradeAmount); //押金金额
+                dataContent.Add("trade_time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
+                dataContent.Add("card_type", 1); //卡类型
+                dataContent.Add("brand", int.Parse(function.CheckInt(act.ProductType))); //品牌
+                Push("deposit", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送押金数据异常");
+            }
+        }
+
         //交易数据
         public static void Trade(ConsumerOrders trade, string kind)
         {