推送拉卡拉码牌商户号用长的

AppStart/Helper/PosPushDataNewHelper.cs

@@ -23,13 +23,18 @@ namespace MySystem
                 {
                     ProductType = GetLiShuaBrand(mer.SnNo);
                 }
+                string MerNo = mer.MerNo;
+                if(ProductType == "51")
+                {
+                    MerNo = mer.Field5;
+                }
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", mer.SnNo); //机具sn
-                dataContent.Add("mer_no", mer.MerNo); //商户号
+                dataContent.Add("mer_no", MerNo); //商户号
                 dataContent.Add("id_card", mer.MerIdcardNo); //商户身份证
                 dataContent.Add("mer_name", mer.MerName); //商户姓名
                 dataContent.Add("mer_mobile", mer.MerMobile); //商户手机号
-                dataContent.Add("request_id", getRequestId(mer.SnNo + mer.MerNo + rnd, "bind")); //流水号
+                dataContent.Add("request_id", getRequestId(mer.SnNo + MerNo + rnd, "bind")); //流水号
                 dataContent.Add("bind_time", mer.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
                 dataContent.Add("brand", int.Parse(function.CheckInt(ProductType))); //品牌
                 if(ProductType == "29")

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -74,6 +74,10 @@ namespace MySystem
                                     }
                                     if (merInfo != null)
                                     {
+                                        if(Mer.SeoTitle == "PAPER_CODE" && string.IsNullOrEmpty(Mer.Field5))
+                                        {
+                                            Mer.Field5 = Mer.MerNo;
+                                        }
                                         Mer.MerNo = merInfo.MerNo;
                                         Mer.MerIdcardNo = merInfo.LegalIdCard;
                                         Mer.MerName = merInfo.MerName;

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -68,7 +68,7 @@ namespace MySystem
         public void DoQueueTrade(PxcModels.WebCMSEntities db, JavaProductModels.WebCMSEntities pdb, TradeRecord trade)
         {
             string TradeSnNo = trade.TradeSnNo;
-            if(trade.ProductType == "30")
+            if(trade.ProductType == "30" && !trade.TradeSnNo.StartsWith("LKLYSMZCFYH"))
             {
                 trade.MerNo = trade.Field2;
             }