暂存

Areas/Admin/Controllers/MainServer/SysRechargeRecordController.cs

@@ -125,7 +125,8 @@ namespace MySystem.Areas.Admin.Controllers
             string BizAmount114 = "0.00";//私董会分红
             string BizAmount115 = "0.00";//分仓奖励
             string BizAmount126 = "0.00";//机具货款退还
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(BizType=30,Amount,0)),SUM(if(BizType=31,Amount,0)),SUM(if(BizType=114,Amount,0)),SUM(if(BizType=115,Amount,0)),SUM(if(BizType=126,Amount,0)) FROM SysRechargeRecord where 1=1 " + condition);
+            string BizAmount135 = "0.00";//大盘分红
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(BizType=30,Amount,0)),SUM(if(BizType=31,Amount,0)),SUM(if(BizType=114,Amount,0)),SUM(if(BizType=115,Amount,0)),SUM(if(BizType=126,Amount,0)),SUM(if(BizType=135,Amount,0)) FROM SysRechargeRecord where 1=1 " + condition);
             if (dt.Rows.Count > 0)
             {
                 BizAmount30 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
@@ -133,12 +134,14 @@ namespace MySystem.Areas.Admin.Controllers
                 BizAmount114 = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
                 BizAmount115 = decimal.Parse(function.CheckNum(dt.Rows[0][3].ToString())).ToString("f2");
                 BizAmount126 = decimal.Parse(function.CheckNum(dt.Rows[0][4].ToString())).ToString("f2");
+                BizAmount135 = decimal.Parse(function.CheckNum(dt.Rows[0][5].ToString())).ToString("f2");
             }
             other.Add("BizAmount30", BizAmount30);
             other.Add("BizAmount31", BizAmount31);
             other.Add("BizAmount114", BizAmount114);
             other.Add("BizAmount115", BizAmount115);
             other.Add("BizAmount126", BizAmount126);
+            other.Add("BizAmount135", BizAmount135);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/OperateServer/AmountRecordOperateController.cs

@@ -127,14 +127,12 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["OpCode"] = sysAdmin.OpCode;
                 dic["MakerCode"] = sysAdmin.MakerCode;
                 dic["MakerName"] = sysAdmin.MakerName;
-                var SourceUserId = 0;
+                dic["SourceInfo"] = "";
                 if (int.Parse(dic["QueryCount"].ToString()) > 0)
                 {
                     var Id = int.Parse(dic["QueryCount"].ToString());
                     var orderInfo = db.Orders.FirstOrDefault(m => m.Id == Id) ?? new Models.Orders();
-                    SourceUserId = orderInfo.UserId;
-                    if (dic["OperateType"].ToString() == "购买运营中心") SourceUserId = Id;
-                    var userInfo = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Models.Users();
+                    var userInfo = db.Users.FirstOrDefault(m => m.Id == orderInfo.UserId) ?? new Models.Users();
                     dic["SourceInfo"] = userInfo.MakerCode + "<br />" + userInfo.RealName;
                 }
                 int OperateType = int.Parse(dic["OperateType"].ToString());

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -687,7 +687,7 @@ namespace MySystem.Areas.Admin.Controllers
         #region 修改运营中心可提现额度
 
         [HttpPost]
-        public string EditBalance(SysAdmin data, string OperationAmount, string Note, int Kind)
+        public string EditBalance(SysAdmin data, string OperationAmount, string Note, int Kind, int ReturnFlag)
         {
             var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
             var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.UserId);
@@ -710,6 +710,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else if (Kind == 2)
             {
+                sysAdmin.ReturnAmount = decimal.Parse(OperationAmount);
                 account.ValidForGetAmount += decimal.Parse(OperationAmount);
                 OperateType = 1;
                 description = "系统增加";
@@ -731,6 +732,11 @@ namespace MySystem.Areas.Admin.Controllers
                 OperateType = OperateType,//操作类别
             }).Entity;
             opdb.SaveChanges();
+            // if(Kind == 2 && ReturnFlag == "1")
+            if (Kind == 2 && ReturnFlag == 1)
+            {
+                RedisDbconn.Instance.AddList("OperateAddServiceQueue", sysAdmin.Id.ToString());
+            }
             AddSysLog(data.Id.ToString(), "SysAdmin", "EditBalance");
             opdb.SaveChanges();
             return "success";

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

@@ -74,6 +74,7 @@
                                 <option value="114">私董会分红</option>
                                 <option value="115">分仓奖励</option>
                                 <option value="126">机具货款退还</option>
+                                <option value="135">大盘分红</option>
                             </select>
                         </div>
                     </div>
@@ -134,7 +135,7 @@
                     <br>
                     私董会分红(元)：<span style="color: #f00;" id="BizAmount114">0.00</span>　|　分仓奖励(元)：<span style="color: #f00;" id="BizAmount115">0.00</span>
                     <br>
-                    机具货款退还(元)：<span style="color: #f00;" id="BizAmount126">0.00</span>
+                    机具货款退还(元)：<span style="color: #f00;" id="BizAmount126">0.00</span>　|大盘分红(元)：<span style="color: #f00;" id="BizAmount135">0.00</span>
                 </blockquote>
                 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

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

@@ -37,15 +37,20 @@
                         </div>
                     </div>
                     <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">*操作类别</label>
-                            <div class="layui-input-inline">
-                                <select id="Kind" name="Kind" lay-verify="required|">
-                                    <option value="">请选择</option>
-                                    <option value="1">扣减</option>
-                                    <option value="2">增加</option>
-                                </select>
-                            </div>
+                        <label class="layui-form-label">*操作类别</label>
+                        <div class="layui-input-inline">
+                            <select id="Kind" name="Kind" lay-filter="Kind">
+                                <option value="">请选择</option>
+                                <option value="1">扣减</option>
+                                <option value="2">增加</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" id="ReturnInfo" style="display: none;>
+                        <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">
@@ -97,6 +102,19 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
+            
+            form.on('select(Kind)', function (data) {
+                if(data.value == '2') {
+                    $('#ReturnInfo').show();
+                    $('#ContentDiv').hide();
+                }
+                else
+                {
+                    $('#ReturnInfo').hide();
+                }
+                form.render();
+            });
+
             //日期
 
             //上传文件

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

@@ -65,18 +65,17 @@
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="MakerName" placeholder="" autocomplete="off">
                         </div>
-                    </div><div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">合伙人类型</label>
-                            <div class="layui-input-inline">
-                                <select id="UserType" name="UserType">
-                                    <option value="">请选择</option>
-                                    <option value="1">运营中心</option>
-                                    <option value="2">黄金合伙人</option>
-                                    <option value="3">钻石合伙人</option>
-                                    <option value="4">战略合伙人</option>
-                                </select>
-                            </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">合伙人类型</label>
+                        <div class="layui-input-inline">
+                            <select id="UserType" name="UserType">
+                                <option value="">请选择</option>
+                                <option value="1">运营中心</option>
+                                <option value="2">黄金合伙人</option>
+                                <option value="3">钻石合伙人</option>
+                                <option value="4">战略合伙人</option>
+                            </select>
                         </div>
                     </div>
                     <div class="layui-inline">

wwwroot/layuiadmin/modules_main/SysRechargeRecord_Admin.js

@@ -144,6 +144,7 @@ layui.config({
             $("#BizAmount114").text(res.other.BizAmount114);
             $("#BizAmount115").text(res.other.BizAmount115);
             $("#BizAmount126").text(res.other.BizAmount126);
+            $("#BizAmount135").text(res.other.BizAmount135);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_operate/AmountRecord_Admin.js

@@ -91,7 +91,7 @@ layui.config({
         , url: '/Admin/AmountRecordOperate/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'OpCode', width: 105, title: '运营中心编号', sort: true }
+            , { field: 'OpCode', width: 150, title: '运营中心编号', sort: true }
             , { field: 'MakerCode', width: 105, title: '创客编号', sort: true }
             , { field: 'MakerName', width: 105, title: '创客姓名', sort: true }
             , { field: 'SeoKeyword', width: 100, title: '备注', sort: true }
@@ -99,8 +99,8 @@ layui.config({
             , { field: 'UseAmount', width: 110, title: '交易金额', sort: true }
             , { field: 'BeforeAmount', width: 130, title: '交易前总金额', sort: true }
             , { field: 'AfterAmount', width: 130, title: '交易后总金额', sort: true }
-            , { field: 'CreateDate', width: 110, title: '交易时间', sort: true }
-            , { field: 'SourceInfo', width: 110, title: '来源创客信息', sort: true }
+            , { field: 'CreateDate', width: 180, title: '交易时间', sort: true }
+            , { field: 'SourceInfo', width: 150, title: '来源创客信息', sort: true }
         ]]
         , where: {
         }