提交修改收款财务创建人

Mall.Common/Config.cs

@@ -373,6 +373,48 @@ namespace Mall.Common
                 return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("NetworkDirector").Value;
             }
         }
+        /// <summary>
+        /// 收款创建人的id，用于新建供应商账户的时候的创建人
+        /// </summary>
+        public static string IncomeDirector
+        {
+            get
+            {
+                return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IncomeDirector").Value;
+            }
+        }
+
+        /// <summary>
+        /// 收款创建人公司id
+        /// </summary>
+        public static string IncomeBranchId
+        {
+            get
+            {
+                return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IncomeBranchId").Value;
+            }
+        }
+        /// <summary>
+        /// 付款创建人的id，用于新建供应商账户的时候的创建人
+        /// </summary>
+        public static string ExpendDirector
+        {
+            get
+            {
+                return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("ExpendDirector").Value;
+            }
+        }
+
+        /// <summary>
+        /// 付款创建人公司id
+        /// </summary>
+        public static string ExpendBranchId
+        {
+            get
+            {
+                return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("ExpendBranchId").Value;
+            }
+        }
 
         /// <summary>
         /// 数据库地址

Mall.WebApi/appsettings.json

@@ -22,6 +22,7 @@
   "ImKey": "b612b31e837c79c68f141aeb719d2b20",
   "ImSecret": "66000451fb72",
   "Mongo": "mongodb://192.168.2.214:27017",
+  //"Mongo": "mongodb://47.96.25.130:27017",
   "MongoDBName": "Mall",
   "ProjectUrl": "D:/project/GitProject/mallapp",
   "DeveloperKitsPort": "15720",
@@ -29,8 +30,14 @@
   "ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
   "sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信商品回调地址
   "sTenpayRechargeNotify": "http://mallapi.oytour.com/api/WeChatNotify/RechargeNotify", //微信充值回调地址
+  "sTenpayMemberBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/MemberBuyNotify", //微信充值回调地址
   "NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
   "RB_Branch_Id": 49, //所属公司id
+  "IncomeDirector": 1756, //财务收入创建人
+  "IncomeBranchId": 49, //财务收入创建人公司
+
+  "ExpendDirector": 1756, //财务支出创建人
+  "ExpendBranchId": 49, //财务支出创建人公司
   "RebornDMC": "reborn_dmc",
   "IncomeFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn",
   "PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
@@ -41,6 +48,11 @@
     "RedisPort": "6379",
     "RedisPwd": "123456"
   },
+  //"RedisSetting": {
+  //  "RedisServer": "47.96.23.199",
+  //  "RedisPort": "6379",
+  //  "RedisPwd": "Viitto2018"
+  //},
   "VirtualDirectory": "WebFile",
   "FileService": "2",
   "IsNormalServer": 2,

Mall.WindowsService/Module/FinanceModule.cs

@@ -245,12 +245,12 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                     });
                                     var financeObj = new
                                     {
-                                        CreateBy = Config.NetworkDirector,
+                                        CreateBy = Config.IncomeDirector,
                                         item.IsPublic,
                                         BType = item.AccountType,
                                         AccountId = item.AccountId,
                                         WBMoney = (result.Sum(x => x.FinanceType == 1 ? (x.Final_Price ?? 0) : (x.FreightMoney ?? 0)))- OriginalFee,
-                                        RB_Branch_Id = Config.RB_Branch_Id,
+                                        RB_Branch_Id = Config.IncomeBranchId,
                                         RemitterName = item.RemitterName,
                                         TradeDate = System.DateTime.Now.ToString("yyyy-MM-dd"),
                                         AccountNumber = System.DateTime.Now.ToString("yyyyMMdd"),

Mall.WindowsService/appsettings.json

@@ -28,6 +28,10 @@
   "FirstPage": "pages/index/index.html",
   "ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
   "sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信回调地址
+  "IncomeDirector": 1756, //财务收入创建人
+  "IncomeBranchId": 49, //财务收入创建人公司
+  "ExpendDirector": 1756, //财务支出创建人
+  "ExpendBranchId": 49, //财务支出创建人公司
   "NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
   "RB_Branch_Id": 49, //所属公司id
   "RebornDMC": "reborn_dmc",