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

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 SourceMakerCode, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(LeaderReserveRecord data, string UserIdMakerCode, string SourceMakerCode, string RemarkSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -70,6 +70,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SourceUserId in (select UserId from UserForMakerCode where MakerCode='" + SourceMakerCode + "')";
             }
+            //变动类型
+            if (!string.IsNullOrEmpty(RemarkSelect))
+            {
+                condition += " and Remark='" + RemarkSelect + "'";
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -101,14 +106,14 @@ namespace MySystem.Areas.Admin.Controllers
                     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");
-                }
+                // 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");
+                // }
 
                 // //购券创客
                 // int SourceUserId = int.Parse(function.CheckInt(dic["SourceUserId"].ToString()));
@@ -116,7 +121,7 @@ namespace MySystem.Areas.Admin.Controllers
                 // dic["SourceMakerCode"] = sourceUser.MakerCode;
                 // dic.Remove("SourceUserId");
 
-                // //来源创客
+                // //订单来源创客
                 // int OrderId = int.Parse(function.CheckInt(dic["OrderId"].ToString()));
                 // var order = db.Orders.FirstOrDefault(m => m.Id == OrderId) ?? new Orders();
                 // Users sourceOrderUser = db.Users.FirstOrDefault(m => m.Id == order.UserId) ?? new Users();

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

@@ -56,6 +56,20 @@
                             <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">
+                            <select id="RemarkSelect" name="RemarkSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="储备金购买">储备金购买</option>
+                                <option value="兑换机具券">兑换机具券</option>
+                                <option value="商城购机">商城购机</option>
+                                <option value="推荐小盟主">推荐小盟主</option>
+                                <option value="机具券兑换">机具券兑换</option>
+                                <option value="系统增加(盟主储蓄金)">系统增加(盟主储蓄金)</option>
+                                <option value="购机奖励">购机奖励</option>
+                            </select>
+                        </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">订单编号</label>
                         <div class="layui-input-inline">