Merge branch 'feature-dgy-后台优化' into feature-dgy-后台测试

# Conflicts:
#	wwwroot/users/退押结果模版.xlsx

Areas/Admin/Controllers/MainServer/LeaderReserveRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 根据条件查询盟主兑换机具券列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(LeaderReserveRecord data, string UserIdMakerCode, string LeaderLevelSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(LeaderReserveRecord data, string UserIdMakerCode, string SourceMakerCode, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -65,6 +65,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
+            //购券创客
+            if (!string.IsNullOrEmpty(SourceMakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + SourceMakerCode + "')";
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -88,6 +93,23 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic.Remove("UserId");
 
+                //购券创客创客
+                int SourceUserId = int.Parse(function.CheckInt(dic["SourceUserId"].ToString()));
+                if (SourceUserId > 0)
+                {
+                    Users sourceUser = db.Users.FirstOrDefault(m => m.Id == SourceUserId) ?? new Users();
+                    dic["SourceMakerCode"] = sourceUser.MakerCode;
+                    dic.Remove("SourceUserId");
+                }
+                else
+                {
+                    int OrderId = int.Parse(function.CheckInt(dic["OrderId"].ToString()));
+                    var order = db.Orders.FirstOrDefault(m => m.Id == OrderId) ?? new Orders();
+                    Users sourceUser = db.Users.FirstOrDefault(m => m.Id == order.UserId) ?? new Users();
+                    dic["SourceMakerCode"] = sourceUser.MakerCode;
+                    dic.Remove("OrderId");
+                }
+
                 //订单信息
                 JsonData ApplyList = JsonMapper.ToObject(dic["SeoTitle"].ToString());//申请数据
                 dic["dPosCoupons"] = "";

Areas/Admin/Views/MainServer/LeaderReserveRecord/Index.cshtml

@@ -50,6 +50,12 @@
                             <input class="layui-input" type="text" name="UserIdMakerCode" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">购券创客</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="SourceMakerCode" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">订单编号</label>
                         <div class="layui-input-inline">

wwwroot/layuiadmin/modules_main/LeaderReserveRecord_Admin.js

@@ -95,7 +95,8 @@ layui.config({
             , { field: 'UserIdMakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'UserIdRealName', width: 200, title: '真实姓名', sort: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
-            , { field: 'Remark', width: 200, title: '备注', sort: true }
+            , { field: 'Remark', width: 200, title: '变动类型', sort: true }
+            , { field: 'SourceMakerCode', width: 200, title: '购券创客', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '订单编号', sort: true }
             , { field: 'dPosCoupons', width: 200, title: '电签兑换券', sort: true }
             , { field: 'bPosCoupons', width: 200, title: '大POS兑换券', sort: true }