添加盟主提现交易类型

修改保证金完善
直属创客交易额数据展示完善

AppStart/RelationClassForConst.cs

@@ -138,6 +138,9 @@ namespace MySystem
                 case 2:
                     result = "用户提现";
                     break;
+                case 3:
+                    result = "盟主提现";
+                    break;
             }
             return result;
         }

Areas/Admin/Controllers/MainServer/StoreHouseAmountPromissController.cs

@@ -98,6 +98,12 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ToUserIdRealName"] = touserid_Users.RealName;
                 dic.Remove("ToUserId");
 
+                //是否使用
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["StatusName"] = "确认中";
+                if (Status == 1) dic["StatusName"] = "成功";
+                if (Status == 2) dic["StatusName"] = "失败";
+
             }
             return Json(obj);
         }
@@ -204,10 +210,9 @@ namespace MySystem.Areas.Admin.Controllers
         public string Edit(StoreHouseAmountPromiss data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("FromUserId", data.FromUserId); //担保人
-            Fields.Add("ToUserId", data.ToUserId); //担保对象
             StoreHouseAmountPromiss storeHouseAmountPromiss = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == data.Id);
+            Fields.Add("FromUserId", storeHouseAmountPromiss.FromUserId); //担保人
+            Fields.Add("ToUserId", storeHouseAmountPromiss.ToUserId); //担保对象
             if (data.PromissAmount > storeHouseAmountPromiss.PromissAmount)
             {
                 return "修改保证金不可高于原保证金额度！";
@@ -217,19 +222,19 @@ namespace MySystem.Areas.Admin.Controllers
                 Fields.Add("PromissAmount", data.PromissAmount); //担保金额
             }
 
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
+            Fields.Add("SeoTitle", storeHouseAmountPromiss.SeoTitle);
+            Fields.Add("SeoKeyword", storeHouseAmountPromiss.SeoKeyword);
+            Fields.Add("SeoDescription", storeHouseAmountPromiss.SeoDescription);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouseAmountPromiss", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "StoreHouseAmountPromiss", "update");
-            UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == data.ToUserId);
+            UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == data.ToUserId) ?? new UserAccount();
             userAccount.ValidAmount = userAccount.ValidAmount - (storeHouseAmountPromiss.PromissAmount - data.PromissAmount);//减去担保金调整差额
             db.SaveChanges();
             var storeA = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == data.Id);
-            var ToUserId = db.Users.FirstOrDefault(m => m.Id == data.ToUserId);
+            var ToUserId = db.Users.FirstOrDefault(m => m.Id == storeHouseAmountPromiss.ToUserId);
             RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
             {
-                UserId = data.FromUserId, //接收创客
+                UserId = storeHouseAmountPromiss.FromUserId, //接收创客
                 Title = "仓库担保调低", //标题
                 Content = "<div class='f16'>已经为创客 <br/>" + ToUserId.RealName + ' ' + ToUserId.MakerCode + "进行分仓额度担保调低<br/>担保金额：" + storeA.PromissAmount + " </div>", //内容
                 Summary = "已经为创客" + ToUserId.RealName + ' ' + ToUserId.MakerCode + "进行分仓额度担保调低，担保金额：" + storeA.PromissAmount,
@@ -268,8 +273,8 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 UserId = storep.FromUserId, //接收创客
                 Title = "仓库担保重置", //标题
-                Content = "<div class='f16'>已经为创客 <br/>" + ToUserInfo.RealName + ' ' + ToUserInfo.MakerCode + "进行分仓额度担保重制", //内容
-                Summary = "",
+                Content = "<div class='f16'>已经为创客 <br/>" + ToUserInfo.RealName + ' ' + ToUserInfo.MakerCode + "进行分仓额度担保重置</div>", //内容
+                Summary = "已经为创客" + ToUserInfo.RealName + ' ' + ToUserInfo.MakerCode + "进行分仓额度担保重置",
                 CreateDate = DateTime.Now,
             }));
 

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -522,46 +522,78 @@ namespace MySystem.Areas.Admin.Controllers
             UserCashRecord edit = db.UserCashRecord.FirstOrDefault(m => m.Id == Id);
             if (edit != null)
             {
-                edit.Status = 2;
-                edit.Remark = Remark;
-                edit.UpdateMan = SysUserName;
-                UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
-                if (account != null)
+                if (edit.TradeType == 3)
                 {
-                    decimal TradeAmount = edit.TradeAmount;
-                    decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                    decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                    decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                    account.BalanceAmount += TradeAmount;
-                    if (account.FreezeAmount >= TradeAmount)
-                    {
-                        account.FreezeAmount -= TradeAmount;
-                    }
-                    else
+                    // edit.Status = 2;
+                    // edit.Remark = Remark;
+                    // edit.UpdateMan = SysUserName;
+                    // UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                    // if (account != null)
+                    // {
+                    //     decimal TradeAmount = edit.TradeAmount;
+                    //     account.LeaderBalanceAmount += TradeAmount;
+                    //     db.UserAccountRecord.Add(new UserAccountRecord()
+                    //     {
+                    //         CreateDate = DateTime.Now,
+                    //         UserId = edit.UserId, //创客
+                    //         ChangeType = 6, //变动类型
+                    //         ProductType = 99, //产品类型
+                    //         ChangeAmount = TradeAmount, //变更金额
+                    //         BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                    //         AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                    //         BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                    //         AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                    //         BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                    //         AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                    //     });
+                    //     db.SaveChanges();
+                    //     RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                    // }
+                }
+                else
+                {
+                    edit.Status = 2;
+                    edit.Remark = Remark;
+                    edit.UpdateMan = SysUserName;
+                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                    if (account != null)
                     {
-                        return "冻结金额不足";
+                        decimal TradeAmount = edit.TradeAmount;
+                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                        account.BalanceAmount += TradeAmount;
+                        if (account.FreezeAmount >= TradeAmount)
+                        {
+                            account.FreezeAmount -= TradeAmount;
+                        }
+                        else
+                        {
+                            return "冻结金额不足";
+                        }
+                        decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                        decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                        decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                        db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            UserId = edit.UserId, //创客
+                            ChangeType = 6, //变动类型
+                            ProductType = 99, //产品类型
+                            ChangeAmount = TradeAmount, //变更金额
+                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        });
+                        db.SaveChanges();
+                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
                     }
-                    decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                    decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                    decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                    db.UserAccountRecord.Add(new UserAccountRecord()
-                    {
-                        CreateDate = DateTime.Now,
-                        UpdateDate = DateTime.Now,
-                        UserId = edit.UserId, //创客
-                        ChangeType = 6, //变动类型
-                        ProductType = 99, //产品类型
-                        ChangeAmount = TradeAmount, //变更金额
-                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                    });
-                    db.SaveChanges();
-                    RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
                 }
+
                 db.SaveChanges();
             }
             return "success";

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1389,6 +1389,7 @@ namespace MySystem.Areas.Admin.Controllers
             string end = "";
 
             string condition = " and Status>-1";
+            string con = " and Status>-1";
             string sort = "Id desc";
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
@@ -1404,7 +1405,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 start = datelist[0].Replace("-", "");
                 end = datelist[1].Replace("-", "");
-                condition += " and TradeDate>='" + start + " 00:00:00' and TradeDate<='" + end + " 23:59:59'";
+                con += " and TradeDate>='" + start + "' and TradeDate<='" + end + "'";
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Users", Fields, sort, "True", page, limit, condition);
@@ -1454,63 +1455,63 @@ namespace MySystem.Areas.Admin.Controllers
 
             WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> other = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 DAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
 
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '" + ParentId + "'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));

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

@@ -81,6 +81,7 @@
                                 <option value="">全部...</option>
                                 <option value="1">消费代付</option>
                                 <option value="2">用户提现</option>
+                                <option value="3">盟主提现</option>
                             </select>
                         </div>
                     </div>

Areas/Admin/Views/MainServer/Users/Children.cshtml

@@ -91,8 +91,10 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
+                    个人交易额：
+                    </br>
                     刷卡交易总额(扶)(元)：<span style="color: #f00;" id="TotalAmtfc">0.00</span>　| 贷记卡交易额(扶)(元)：<span style="color: #f00;" id="DAmtfc">0.00</span>　|　借记卡非封顶交易额(扶)(元)：<span style="color: #f00;" id="JAmtfc">0.00</span>　|　借记卡封顶交易额(扶)(元)：<span style="color: #f00;" id="JfAmtfc">0.00</span>　|　借记卡交易笔数(扶)(元)：<span style="color: #f00;" id="JCountfc">0.00</span>　|　云闪付小额交易额(扶)(元)：<span style="color: #f00;" id="YAmtfc">0.00</span>
-                    <br>
+                    </br>
                     刷卡交易总额(稳)(元)：<span style="color: #f00;" id="TotalAmtwd">0.00</span>　| 贷记卡交易额(稳)(元)：<span style="color: #f00;" id="DAmtwd">0.00</span>　|　借记卡非封顶交易额(稳)(元)：<span style="color: #f00;" id="JAmtwd">0.00</span>　|　借记卡封顶交易额(稳)(元)：<span style="color: #f00;" id="JfAmtwd">0.00</span>　|　借记卡交易笔数(稳)(元)：<span style="color: #f00;" id="JCountwd">0.00</span>　|　云闪付小额交易额(稳)(元)：<span style="color: #f00;" id="YAmtwd">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

wwwroot/layuiadmin/modules_main/StoreHouseAmountPromiss_Admin.js

@@ -98,8 +98,7 @@ layui.config({
             , { field: 'ToUserIdMakerCode', width: 200, title: '担保对象创客编号', sort: true }
             , { field: 'ToUserIdRealName', width: 200, title: '担保对象真实姓名', sort: true }
             , { field: 'PromissAmount', width: 200, title: '担保金额', sort: true }
-
-            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
+            , { field: 'StatusName', width: 80, title: '状态',  sort: true }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
@@ -156,7 +155,7 @@ layui.config({
                                 submit.click();
                             }
                         });
-                    }, 1000);
+                    }, 300);