Merge branch 'test-mainserver' into develop

AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -249,45 +249,45 @@ namespace MySystem
                                     }).Entity;
                                     db.SaveChanges();
                                 }
-                                PxcModels.SimposMerchantInfo sim = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Bind.MerNo && m.KqSnNo == Bind.MerSnNo);
-                                if (sim == null)
+                                string json = Bind.SeoDescription;
+                                string ProductName = ""; //商品名称
+                                string ActivityName = ""; //促销活动名称
+                                string ProductTypeName = ""; //商品类型名称
+                                string ActStatusName = ""; //激活状态名称
+                                string ActAmount = ""; //实付金额
+                                string EmployeeNo = ""; //员工工号
+                                string EmployeeName = ""; //员工姓名
+                                if(!string.IsNullOrEmpty(json))
                                 {
-                                    string json = Bind.SeoDescription;
-                                    string ProductName = ""; //商品名称
-                                    string ActivityName = ""; //促销活动名称
-                                    string ProductTypeName = ""; //商品类型名称
-                                    string ActStatusName = ""; //激活状态名称
-                                    string ActAmount = ""; //实付金额
-                                    string EmployeeNo = ""; //员工工号
-                                    string EmployeeName = ""; //员工姓名
-                                    if(!string.IsNullOrEmpty(json))
-                                    {
-                                        JsonData jsonObj = JsonMapper.ToObject(json);
-                                        ProductName = jsonObj["ProductName"].ToString();
-                                        ActivityName = jsonObj["ActiveName"].ToString();
-                                        ProductTypeName = jsonObj["ProductType"].ToString();
-                                        ActAmount = jsonObj["ActualAmount"].ToString();
-                                        ActStatusName = jsonObj["ActStatus"].ToString();
-                                        EmployeeNo = jsonObj["WorkNo"].ToString();
-                                        EmployeeName = jsonObj["AccountName"].ToString();
-                                    }
+                                    JsonData jsonObj = JsonMapper.ToObject(json);
+                                    ProductName = jsonObj["ProductName"].ToString();
+                                    ActivityName = jsonObj["ActiveName"].ToString();
+                                    ProductTypeName = jsonObj["ProductType"].ToString();
+                                    ActAmount = jsonObj["ActualAmount"].ToString();
+                                    ActStatusName = jsonObj["ActStatus"].ToString();
+                                    EmployeeNo = jsonObj["WorkNo"].ToString();
+                                    EmployeeName = jsonObj["AccountName"].ToString();
+                                }
+                                PxcModels.SimposMerchantInfo sim = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Bind.MerNo);
+                                if (sim == null)
+                                {                                    
                                     sim = db.SimposMerchantInfo.Add(new PxcModels.SimposMerchantInfo()
                                     {
                                         Id = add.Id,
                                         CreateDate = Bind.CreateTime,
                                         KqMerNo = Bind.MerNo,
-                                        KqSnNo = Bind.MerSnNo,
                                         MerchantNo = Bind.MerNo.Length > 16 ? Bind.MerNo.Substring(0, 16) : Bind.MerNo,
-                                        ProductName = ProductName,
-                                        ActivityName = ActivityName,
-                                        ProductTypeName = ProductTypeName,
-                                        ActStatusName = ActStatusName,
-                                        ActAmount = decimal.Parse(ActAmount),
-                                        EmployeeNo = EmployeeNo,
-                                        EmployeeName = EmployeeName,
                                     }).Entity;
                                     db.SaveChanges();
                                 }
+                                sim.KqSnNo = Bind.MerSnNo;
+                                sim.ProductName = ProductName;
+                                sim.ActivityName = ActivityName;
+                                sim.ProductTypeName = ProductTypeName;
+                                sim.ActStatusName = ActStatusName;
+                                sim.ActAmount = decimal.Parse(ActAmount);
+                                sim.EmployeeNo = EmployeeNo;
+                                sim.EmployeeName = EmployeeName;
                                 pos.BindMerchantId = add.Id;
                                 pos.LastMerchantId = add.Id;
                                 if(pos.CardType < 2)

Startup.cs

@@ -278,7 +278,7 @@ namespace MySystem
         private void InitMain()
         {
             string conn = Configuration["Setting:SqlConnStr"];
-            string dbName = "KxsProfitServer";
+            string dbName = "KxsMainServer";
             // if(Library.ConfigurationManager.EnvironmentFlag == 2)
             // {
             //     dbName = "KxsProfitServer";

appsettings.Development.json

@@ -17,15 +17,15 @@
     "Host": "http://localhost:5047/",
     "SourceHost": "http://bs.kexiaoshuang.com/",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
-    "Pxc1SqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
-    "ReadSqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;",
-    "MainSqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsStatServer;charset=utf8;",
+    "SqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
+    "Pxc1SqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
+    "ReadSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
+    "MainSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsStatServer;charset=utf8;",
     "SpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsSpServer;charset=utf8;",
-    "OpSqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;port=3306;database=KxsOpServer;charset=utf8;",
+    "OpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;port=3306;database=KxsOpServer;charset=utf8;",
     "MpSqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "MpSqlConnStr2": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",
-    "RdsStatSqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;port=3306;database=KxsStatServer;charset=utf8;",
+    "RdsStatSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;port=3306;database=KxsStatServer;charset=utf8;",
     "RedisConnStr": "47.108.62.166:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",