测试拉卡拉数据

AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -109,18 +109,21 @@ namespace MySystem
                                     {
                                         MerNo = Bind.MerSnNo;
                                     }
-                                    PxcModels.MachineForMerNo merFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
-                                    if (merFor == null)
+                                    if(!string.IsNullOrEmpty(MerNo))
                                     {
-                                        merFor = db.MachineForMerNo.Add(new PxcModels.MachineForMerNo()
+                                        PxcModels.MachineForMerNo merFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
+                                        if (merFor == null)
                                         {
-                                            MerNo = MerNo,
-                                            SnId = pos.Id,
-                                        }).Entity;
-                                    }
-                                    else
-                                    {
-                                        merFor.SnId = pos.Id;
+                                            merFor = db.MachineForMerNo.Add(new PxcModels.MachineForMerNo()
+                                            {
+                                                MerNo = MerNo,
+                                                SnId = pos.Id,
+                                            }).Entity;
+                                        }
+                                        else
+                                        {
+                                            merFor.SnId = pos.Id;
+                                        }
                                     }
                                     db.SaveChanges();
 
@@ -163,18 +166,21 @@ namespace MySystem
                                         if (pos != null)
                                         {
                                             string MerNo = Bind.MerNo;
-                                            PxcModels.MachineForMerNo merFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
-                                            if (merFor == null)
+                                            if(!string.IsNullOrEmpty(MerNo))
                                             {
-                                                merFor = db.MachineForMerNo.Add(new PxcModels.MachineForMerNo()
+                                                PxcModels.MachineForMerNo merFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
+                                                if (merFor == null)
                                                 {
-                                                    MerNo = MerNo,
-                                                    SnId = pos.Id,
-                                                }).Entity;
-                                            }
-                                            else
-                                            {
-                                                merFor.SnId = pos.Id;
+                                                    merFor = db.MachineForMerNo.Add(new PxcModels.MachineForMerNo()
+                                                    {
+                                                        MerNo = MerNo,
+                                                        SnId = pos.Id,
+                                                    }).Entity;
+                                                }
+                                                else
+                                                {
+                                                    merFor.SnId = pos.Id;
+                                                }
                                             }
                                             db.SaveChanges();
 

AppStart/Helper/SycnSpServer/SycnSpMerchantRecordService.cs

@@ -38,7 +38,28 @@ namespace MySystem
                         try
                         {
                             PosPushDataNewHelper.Bind(Mer);
-                            PxcModels.MachineForMerNo machineForMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == Mer.MerNo) ?? new PxcModels.MachineForMerNo();
+                            int PosId = 0;
+                            PxcModels.MachineForMerNo machineForMerNo = new PxcModels.MachineForMerNo();
+                            if(Mer.ProductType == "12")
+                            {
+                                machineForMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == Mer.MerNo) ?? new PxcModels.MachineForMerNo();
+                                PosId = machineForMerNo.SnId;
+                            }
+                            else
+                            {
+                                machineForMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == Mer.Field3);
+                                if (machineForMerNo != null)
+                                {
+                                    PosId = machineForMerNo.SnId;
+                                    db.MachineForMerNo.Remove(machineForMerNo);
+                                    db.MachineForMerNo.Add(new PxcModels.MachineForMerNo()
+                                    {
+                                        MerNo = Mer.MerNo,
+                                        SnId = PosId,
+                                    });
+                                }
+                                db.SaveChanges();
+                            }
                             PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForMerNo.SnId) ?? new PxcModels.PosMachinesTwo();
                             
                             PxcModels.PosMerchantInfo merinfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
@@ -46,6 +67,11 @@ namespace MySystem
                             {
                                 merinfo.MerIdcardNo = Mer.LegalIdCard;
                                 merinfo.MerchantName = Mer.LegalName;
+                                if(Mer.ProductType == "30")
+                                {
+                                    merinfo.KqMerNo = Mer.MerNo;
+                                    merinfo.MerchantNo = Mer.MerNo.Length > 16 ? Mer.MerNo.Substring(0, 16) : Mer.MerNo;
+                                }
                                 merinfo.MgrNo = Mer.AgentNo; //代理商号
                                 merinfo.MgrName = Mer.Field2; //终端类型
                                 db.SaveChanges();

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -116,11 +116,17 @@ namespace MySystem
                                             RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                         }
                                     }
+                                    string KqMerNo = Mer.MerNo;
+                                    string MerchantNo = "";
+                                    if(!string.IsNullOrEmpty(KqMerNo))
+                                    {
+                                        MerchantNo = KqMerNo.Length > 16 ? KqMerNo.Substring(0, 16) : KqMerNo;
+                                    }
                                     add = db.PosMerchantInfo.Add(new PxcModels.PosMerchantInfo()
                                     {
                                         CreateDate = Mer.CreateTime,
-                                        KqMerNo = Mer.MerNo,
-                                        MerchantNo = Mer.MerNo.Length > 16 ? Mer.MerNo.Substring(0, 16) : Mer.MerNo,
+                                        KqMerNo = KqMerNo,
+                                        MerchantNo = MerchantNo,
                                     }).Entity;
                                     //查询商户备份表，如果有记录则继承之前的商户Id
                                     if(Mer.ProductType == "1") //判断是否金控

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -428,6 +428,19 @@ namespace MySystem
                                             }
                                             // if (trade.SerEntryMode == "1") QrPayFlag = 1;
                                         }
+                                        else if (pos.BrandId == 30 || pos.BrandId == 31) //拉卡拉
+                                        {
+                                            TradeAmount = TradeAmount / 100;
+                                            if (trade.BankCardType == "01" || trade.BankCardType == "61")
+                                            {
+                                                BankCardType = 1;
+                                            }
+                                            else
+                                            {
+                                                BankCardType = 0;
+                                            }
+                                            // if (trade.SerEntryMode == "1") QrPayFlag = 1;
+                                        }
                                         int BrandId = pos.BrandId;
                                         // int BrandId = int.Parse(trade.ProductType);
                                         // if (BrandId == 1 && trade.MerNo.StartsWith("M900"))
@@ -499,6 +512,11 @@ namespace MySystem
                                         {
                                             pos.CreditTrade += SourceTradeAmount;
                                         }
+                                        //拉卡拉
+                                        else if(BankCardType == 1 && (pos.BrandId == 30 || pos.BrandId == 31))
+                                        {
+                                            pos.CreditTrade += SourceTradeAmount;
+                                        }
                                         //广电卡
                                         else if(pos.BrandId == 14)
                                         {

appsettings.json

@@ -21,7 +21,7 @@
     "Pxc1SqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;DefaultCommandTimeout=600;",
     "ReadSqlConnStr": "server=rr-2vc53lrwpwm1ewscogo.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;DefaultCommandTimeout=600;",
     "MainSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsStatServer;charset=utf8;",
-    "SpSqlConnStr": "server=jumpserver.kexiaoshuang.com;port=33061;user=8b2a536a-add6-4b6a-a1bc-4133e76c6095;password=nnUhPjQTazEctXDp;database=KxsSpServer;charset=utf8;",
+    "SpSqlConnStr": "server=jumpserver.kexiaoshuang.com;port=33061;user=f4471a87-e54a-4ac0-bb0f-91717bf4ad1d;password=XNZapjhSzb73PbQt;database=KxsSpServer;charset=utf8;",
     "OpSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsOpServer;charset=utf8;",
     "MpSqlConnStr": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "MpSqlConnStr2": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",