广电卡导入数据，判断是否基础套餐，是才添加商户信息

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -421,41 +421,44 @@ namespace MySystem.Areas.Admin.Controllers
                 string AccountName = dr["账号姓名"].ToString();
                 string SimNo = dr["Sim卡卡号（ICCID）"].ToString();
 
-                bool checkMer = db.PosMerchantInfo.Any(m => m.KqMerNo == PhoneNumber);
-                if (!checkMer)
+                if(ProductType == "基础套餐")
                 {
-                    spdb.BindRecord.Add(new SpModels.BindRecord()
+                    bool checkMer = db.PosMerchantInfo.Any(m => m.KqMerNo == PhoneNumber);
+                    if (!checkMer)
                     {
-                        CreateDate = DateTime.Parse(CreateDate),
-                        UpdateTime = DateTime.Parse(CreateDate), //机具绑定、解绑时间
-                        CreateTime = DateTime.Parse(CreateDate), //商户操作时间
-                        MerNewSnNo = PhoneNumber, //商户手机号
-                        MerSnNo = SimNo, //序列号
-                        MerName = AccountName, //商户名称
-                        MerNo = PhoneNumber, //商户编号
-                        Remark = ProductType,
-                        Field1 = Province,
-                        Field2 = City,
-                        Field3 = ProductName,
-                        Field4 = WorkNo,
-                        Field5 = ActStatus,
-                        ProductType = "14",
-                        Status = 1,
-                    });
-
-                    spdb.Merchants.Add(new SpModels.Merchants()
-                    {
-                        SnNo = SimNo,
-                        CreateTime = DateTime.Parse(CreateDate),
-                        UpdateTime = DateTime.Parse(CreateDate),
-                        AgentName = AccountName,
-                        MerRealName = AccountName,
-                        MerMobile = PhoneNumber,
-                        MerNo = PhoneNumber,
-                        MerName = AccountName,
-                        ProductType = "14",
-                        Status = 1,
-                    });
+                        spdb.BindRecord.Add(new SpModels.BindRecord()
+                        {
+                            CreateDate = DateTime.Parse(CreateDate),
+                            UpdateTime = DateTime.Parse(CreateDate), //机具绑定、解绑时间
+                            CreateTime = DateTime.Parse(CreateDate), //商户操作时间
+                            MerNewSnNo = PhoneNumber, //商户手机号
+                            MerSnNo = SimNo, //序列号
+                            MerName = AccountName, //商户名称
+                            MerNo = PhoneNumber, //商户编号
+                            Remark = ProductType,
+                            Field1 = Province,
+                            Field2 = ActiveName,
+                            Field3 = ProductName,
+                            Field4 = WorkNo,
+                            Field5 = ActStatus,
+                            ProductType = "14",
+                            Status = 1,
+                        });
+
+                        spdb.Merchants.Add(new SpModels.Merchants()
+                        {
+                            SnNo = SimNo,
+                            CreateTime = DateTime.Parse(CreateDate),
+                            UpdateTime = DateTime.Parse(CreateDate),
+                            AgentName = AccountName,
+                            MerRealName = AccountName,
+                            MerMobile = PhoneNumber,
+                            MerNo = PhoneNumber,
+                            MerName = AccountName,
+                            ProductType = "14",
+                            Status = 1,
+                        });
+                    }
                 }
 
                 // spdb.TradeRecord.Add(new SpModels.TradeRecord()