拉取合并develop

Controllers/HomeController.cs

@@ -216,7 +216,73 @@ namespace MySystem.Controllers
             }
             return result;
         }
-    
-    
+
+
+
+        public string cash()
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            List<int> ids = new List<int>();
+            ids.Add(179761);
+            ids.Add(180213);
+            ids.Add(180651);
+            ids.Add(180810);
+            ids.Add(181026);
+            ids.Add(181187);
+            ids.Add(181300);
+            ids.Add(181376);
+            ids.Add(181428);
+            ids.Add(181468);
+            ids.Add(181601);
+            ids.Add(181814);
+            foreach(int Id in ids)
+            {
+                UserCashRecord edit = db.UserCashRecord.FirstOrDefault(m => m.Id == Id && m.Status == 0);
+                if (edit != null)
+                {
+                    edit.Status = 2;
+                    edit.Remark = "出款银行故障，请重试";
+                    edit.UpdateMan = "系统";
+                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                    if (account != null)
+                    {
+                        decimal TradeAmount = edit.TradeAmount;
+                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                        account.BalanceAmount += TradeAmount;
+                        // if (account.FreezeAmount >= TradeAmount)
+                        // {
+                            account.FreezeAmount -= TradeAmount;
+                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                            db.UserAccountRecord.Add(new UserAccountRecord()
+                            {
+                                CreateDate = DateTime.Now,
+                                UpdateDate = DateTime.Now,
+                                UserId = edit.UserId, //创客
+                                ChangeType = 6, //变动类型
+                                ProductType = 99, //产品类型
+                                ChangeAmount = TradeAmount, //变更金额
+                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                            });
+                            db.SaveChanges();
+                        // }
+                        // else
+                        // {
+                        //     function.WriteLog(Id.ToString(), "冻结金额不足");
+                        // }
+                    }
+                }
+            }
+            db.Dispose();
+            return "ok";
+        }
     }
 }

appsettings.Development.json

@@ -0,0 +1,42 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "Setting": {
+    "AppKey": "",
+    "AppId": "",
+    "CheckUrl": "",
+    "ConnectionStrings": "",
+    "WebServiceUrl": "",
+    "DbSchemeUrl": "",
+    "OpHost": "http://operateadmin.kexiaoshuang.com/",
+    "Host": "http://test.bs.kexiaoshuang.com/",
+    "OssHost": "http://oss.kexiaoshuang.com",
+    "Database": "KxsMainServer",
+    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
+    "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
+    "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
+    "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
+    "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
+    "CashSqlConnStr": "server=47.109.31.237;port=3306;user=KxsCashServer;password=LNGvM18W6SaIGKBC;database=KxsCashServer;charset=utf8;",
+    "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
+    "IOSAppVersion": "1.0.0",
+    "AndroidAppVersion": "1.0.0",
+    "OSSKey": "",
+    "OSSSecret": "",
+    "OSSEndpoint": "",
+    "OSSBucketName": "",
+    "AppSource": "/skin/app/default/",
+    "JwtSecret": "JvDHuowbOnWiyxMIFc9gG5rw1LSSc0xx68L31oRfxS0",
+    "JwtIss": "KxsMainServer",
+    "JwtAud": "api",
+    "MqUserName": "guest",
+    "MqPassword": "123456",
+    "MqHostName": "localhost:5672"
+  }
+}