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

Mall.Common/Config.cs

@@ -342,7 +342,16 @@ namespace Mall.Common
             }
         }
 
-
+        /// <summary>
+        /// 网络主管的id，用于新建供应商账户的时候的创建人
+        /// </summary>
+        public static string NetworkDirector
+        {
+            get
+            {
+                return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("NetworkDirector").Value;
+            }
+        }
 
     }
 }
\ No newline at end of file

Mall.Repository/Product/RB_Goods_OrderAfterSaleRepository.cs

@@ -162,6 +162,10 @@ INNER JOIN rb_member_user mu on mu.Id=oas.UserId
             {
                 where += $" and oas.{nameof(RB_Goods_OrderAfterSale.OrderDetialId)}={dmodel.OrderDetialId}";
             }
+            if (dmodel.Type > 0) 
+            {
+                where += $" and oas.{nameof(RB_Goods_OrderAfterSale.Type)}={dmodel.Type}";
+            }
             if (!string.IsNullOrEmpty(dmodel.ReOrderNo))
             {
                 where += $" and oas.{nameof(RB_Goods_OrderAfterSale.ReOrderNo)} like '%{dmodel.ReOrderNo}%'";

Mall.WebApi/Controllers/MarketingCenter/AppletCouponController.cs

@@ -189,21 +189,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                 x.MaxDiscountsPrice,
                 x.UseType
             });
-
-
-            //var result = list.Select(x => new
-            //{
-            //    x.ID,
-            //    StartDate = x.StartDate.HasValue ? x.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-            //    EndDate = x.EndDate.HasValue ? x.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-            //    x.Name,
-            //    x.Describe,
-            //    x.MinConsumePrice,
-            //    x.CouponType,
-            //    x.MaxDiscountsPrice,
-            //    x.UseType
-            //});
-            return ApiResult.Success("", data: JsonHelper.GetCamelCaseResultJson(result));
+            return ApiResult.Success("", result);
 
         }
     }

Mall.WebApi/Controllers/User/SupplierController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Mall.WebApi.Controllers.User
+{
+    public class SupplierController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file

Mall.WebApi/appsettings.json

 {
   "ConnectionStrings": {
     "DefaultConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; ",
-    "DefaultConnectionPName": "MySql.Data.MySqlClient"
+    "DefaultConnectionPName": "MySql.Data.MySqlClient",
+    "FinanceConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ",
+    "FinanceConnectionPName": "MySql.Data.MySqlClient"
   },
   "Logging": {
     "LogLevel": {
@@ -26,6 +28,7 @@
   "FirstPage": "pages/index/index.html",
   "ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
   "sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信回调地址
+  "NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
   "RedisSetting": {
     "RedisServer": "192.168.2.214",
     "RedisPort": "6379",