Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Repository/Point/RB_Member_PointBalanceRepository.cs

@@ -68,7 +68,7 @@ namespace Mall.Repository.Point
                 }
                 if (where.UserId > 0)
                 {
-                    sb.AppendFormat(" and ID={0}", where.UserId);
+                    sb.AppendFormat(" and UserId={0}", where.UserId);
                 }
                 if (where.Type > 0) {
                     sb.AppendFormat(" and Type ={0}", (int)where.Type);

Mall.WebApi/appsettings.json

@@ -21,7 +21,7 @@
     "accessKeyId": "LTAIwE7l9dImZSa3",
     "accessKeySecret": "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI"
   },
-  "JwtSecretKey": "@VIITTOREBORN*2018",
+  "JwtSecretKey": "@VIITTOREBORN*2018123",
   "JwtExpirTime": 2592000,
   "ApiExpirTime": 2592000,
   "AllowedHosts": "*",
@@ -51,10 +51,10 @@
   "ExpendDepartment": 331,
   "RebornDMC": "reborn_dmc",
   "PropertyDB": "test_property",
-  "IncomeFinanceApi": "http://192.168.2.13:8083/api/Mall/InsertFinanceBatchForMallIn",
-  "PaymentFinanceApi": "http://192.168.2.13:8083/api/Mall/InsertFinanceBatchForMallOut",
-  "ZYRefundFinanceApi": "http://192.168.2.13:8083/api/Mall/SetMallOrderSalesTheWayRefund",
-  "PropertyApi": "http://192.168.2.13:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
+  "IncomeFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn",
+  "PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallOut",
+  "ZYRefundFinanceApi": "http://192.168.1.13:8083/api/Mall/SetMallOrderSalesTheWayRefund",
+  "PropertyApi": "http://192.168.1.13:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
   "FinanceKey": "FinanceMallInsertToERPViitto2020",
   "SettlementRate": "0.60",
   "RabbitMqConfig": {