Merge branch 'feature-dgy-功能优化' into DuGuYang

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -178,7 +178,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public string Add(ToChargeBackRecord data, string MakerCode)
+        public string Add(ToChargeBackRecord data, string MakerCode, string IsStop)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             var user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new Users();
@@ -186,10 +186,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "创客" + MakerCode + "不存在或编号错误";
             }
+            var Status = 0;
+            if (IsStop == "1") Status = 3;
             Fields.Add("UserId", user.Id); //创客Id
             Fields.Add("ChargeAmount", data.ChargeAmount); //待扣金额
             Fields.Add("ChargeType", 1); //待扣类型
             Fields.Add("Kind", data.Kind); //待扣别
+            Fields.Add("Status", Status); //状态
             Fields.Add("Remark", data.Remark); //备注
             Fields.Add("Field1", data.Field1); //备用字段
 
@@ -455,6 +458,9 @@ namespace MySystem.Areas.Admin.Controllers
                 string Amount = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";
                 string Remark = itemJson.Contains("\"D\"") ? dr["D"].ToString() : "";
                 string KindName = itemJson.Contains("\"E\"") ? dr["E"].ToString() : "";
+                string StatusName = itemJson.Contains("\"F\"") ? dr["F"].ToString() : "";
+                int Status = 0;
+                if (StatusName == "是") Status=3;
                 int Kind = 0;
                 var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
                 var users = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId && m.RealName == Name) ?? new Users();
@@ -492,6 +498,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var ToChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
                     {
                         CreateDate = DateTime.Now,
+                        Status = Status,
                         SeoTitle = SysUserName + "_" + SysRealName,
                         SeoDescription = Remark,
                         Remark = Remark,

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);
@@ -312,8 +314,10 @@ namespace MySystem.Areas.Admin.Controllers
                         }).Entity;
                         opdb.SaveChanges();
                     }
-
-                    RedisDbconn.Instance.AddList("OperateAddServiceQueue", Id.ToString());
+                    if (data.ReturnFlag == 1)
+                    {
+                        RedisDbconn.Instance.AddList("OperateAddServiceQueue", Id.ToString());
+                    }
                 }
                 else
                 {

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

@@ -153,7 +153,7 @@
                         <div class="layui-input-inline">
                             <select id="StoreKindSelect" name="StoreKindSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">否</option>
+                                <option value="0" selected="selected">否</option>
                                 <option value="1">是</option>
                             </select>
                         </div>

Areas/Admin/Views/MainServer/ToChargeBackRecord/Add.cshtml

@@ -64,6 +64,15 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">是否暂停扣款</label>
+                                <div class="layui-input-inline">
+                                    <select id="IsStop" name="IsStop" lay-search="">
+                                        <option value="1" selected="selected">是</option>
+                                        <option value="0">否</option>
+                                    </select>
+                                </div>
+                            </div>
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">备注</label>
                                 <div class="layui-input-block">

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/AmountChangeRecord.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.OpModels
+{
+    public partial class AmountChangeRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string Remark { get; set; }
+        public string Title { get; set; }
+        public int OperateType { get; set; }
+        public decimal ChangeAmount { get; set; }
+        public decimal AfterAmount { get; set; }
+        public decimal BeforeAmount { get; set; }
+        public int AmountType { get; set; }
+        public int UserId { get; set; }
+        public string Operater { get; set; }
+    }
+}

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

@@ -18,6 +18,7 @@ namespace MySystem.OpModels
         public virtual DbSet<ActMerDaySummary> ActMerDaySummary { get; set; }
         public virtual DbSet<ActMerMonthSummary> ActMerMonthSummary { get; set; }
         public virtual DbSet<Advertisment> Advertisment { get; set; }
+        public virtual DbSet<AmountChangeRecord> AmountChangeRecord { get; set; }
         public virtual DbSet<AmountRecord> AmountRecord { get; set; }
         public virtual DbSet<Col> Col { get; set; }
         public virtual DbSet<MachineApplyOpRecord> MachineApplyOpRecord { get; set; }
@@ -243,6 +244,75 @@ namespace MySystem.OpModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<AmountChangeRecord>(entity =>
+            {
+                entity.HasComment("合伙人额度变动记录表");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AfterAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("变更后金额");
+
+                entity.Property(e => e.AmountType)
+                    .HasColumnType("int(11)")
+                    .HasComment("额度类型");
+
+                entity.Property(e => e.BeforeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("变更前金额");
+
+                entity.Property(e => e.ChangeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("变更金额");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.OperateType)
+                    .HasColumnType("int(11)")
+                    .HasComment("变动类型");
+
+                entity.Property(e => e.Operater)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("操作人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(100)")
+                    .HasComment("备注")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.Title)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("变动分类标题")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客Id");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<AmountRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -2403,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")