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

# Conflicts:
#	Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -209,6 +209,8 @@ namespace MySystem.Areas.Admin.Controllers
                     Fields.Add("AdminName", data.AdminName); //用户名
                     Fields.Add("Password", function.MD5_32(data.Password)); //密码
                     Fields.Add("FilePath", data.FilePath); //附件
+                    Fields.Add("ReturnFlag", data.ReturnFlag); //返还标记
+                    Fields.Add("ReturnAmount", data.ReturnAmount); //返还金额
                     Fields.Add("QueryCount", 1); //是否为主账号(1是，0否)
 
                     int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("SysAdmin", Fields, 0);
@@ -318,9 +320,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         AddOpStoreHouseByUserId(item.UserId.ToString());
                     }
-
-                    // TODO: 只有运营中心发5888
-                    RedisDbconn.Instance.AddList("OperateAddServiceQueue", Id.ToString());
+                    if (data.ReturnFlag == 1)
+                    {
+                        RedisDbconn.Instance.AddList("OperateAddServiceQueue", Id.ToString());
+                    }
                 }
                 else
                 {

Areas/Admin/Views/OperateServer/SysAdminOperate/Add.cshtml

@@ -58,6 +58,21 @@
                                         lay-verify="required|" autocomplete="off" placeholder="请输入初始额度">
                                 </div>
                             </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">是否返额度</label>
+                                <div class="layui-input-block">
+                                    <input type="checkbox" id="ReturnFlag" name="ReturnFlag" value="1"
+                                        lay-skin="switch" lay-filter="ReturnFlag" title="开关">
+                                </div>
+                            </div>
+                            
+                            <div class="layui-form-item" id="ReturnAmountInfo" style="display: none;">
+                                <label class="layui-form-label">返还额度</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="ReturnAmount" name="ReturnAmount" maxlength="50"
+                                         autocomplete="off" placeholder="请输入初始额度">
+                                </div>
+                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">合伙人类型</label>
                                 <div class="layui-input-inline">
@@ -285,6 +300,17 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
+            
+            form.on('switch(ReturnFlag)', function (data) {
+                console.log(data);
+                if (this.checked) {
+                    $('#ReturnAmountInfo').css('display', 'block');
+                } else {
+                    $('#ReturnAmountInfo').css('display', 'none');
+                }
+                form.render();
+            });
+
             //日期
 
 

OpModels/SysAdmin.cs

@@ -31,5 +31,7 @@ namespace MySystem.OpModels
         public string RealName { get; set; }
         public string Password { get; set; }
         public string AdminName { get; set; }
+        public ulong ReturnFlag { get; set; }
+        public decimal ReturnAmount { get; set; }
     }
 }

OpModels/WebCMSEntities.cs

@@ -2473,6 +2473,15 @@ namespace MySystem.OpModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ReturnAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("返还额度");
+
+                entity.Property(e => e.ReturnFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'")
+                    .HasComment("是否返额度");
+
                 entity.Property(e => e.Role)
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")