添加创客月费和软件服务费统计和显示

创客/盟主提现添加备注显示
运营中心提现添加发放时间

AppStart/RelationClassForConst.cs

@@ -127,7 +127,7 @@ namespace MySystem
                     result = "机具过期";
                     break;
                 case 125:
-                    result = "创客月费";
+                    result = "软件服务费";
                     break;
             }
             return result;

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -3790,13 +3790,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入商户手机号";
             }
-            var posMerchant = db.PosMerchantInfo.FirstOrDefault(m => m.MerchantNo == MerchantNo && m.KqSnNo == PosSn) ?? new PosMerchantInfo();
+            var posMerchant = db.PosMerchantInfo.FirstOrDefault(m => m.MerchantNo == MerchantNo && m.KqSnNo == PosSn && !function.CheckNull(m.MerIdcardNo).Contains("*") && m.MerchantName.StartsWith(MerchantName.Substring(0, 1))) ?? new PosMerchantInfo();
             var query = "";
             query += "修改前：" + posMerchant.KqSnNo + "," + posMerchant.MerchantNo + "," + posMerchant.MerchantName + "," + posMerchant.MerIdcardNo + "," + posMerchant.MerchantMobile;
             query += "修改后：" + PosSn + "," + MerchantNo + "," + MerchantName + "," + MerIdcardNo + "," + MerchantMobile;
             if (posMerchant.Id == 0)
             {
-                return "商户" + MerchantNo + "不存在";
+                return "商户" + MerchantNo + "不存在或不在" + MerchantName + "名下";
             }
             else
             {

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -170,8 +170,8 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
 
-            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount31 = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)) + sum(if(ChangeType=112 and ProductType=101, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=31, ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
+            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount31 = "0.00", ChangeTypeAmount124 = "0.00", ChangeTypeAmount125 = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)) + sum(if(ChangeType=112 and ProductType=101, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=31, ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)),sum(if(ChangeType=124, ChangeAmount, 0)),sum(if(ChangeType=125, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 ChangeTypeAmount0 = dt.Rows[0][0].ToString();
@@ -190,6 +190,8 @@ namespace MySystem.Areas.Admin.Controllers
                 ChangeTypeAmount112 = dt.Rows[0][10].ToString();
                 ChangeTypeAmount60 = dt.Rows[0][11].ToString();
                 ChangeTypeAmount31 = dt.Rows[0][12].ToString();
+                ChangeTypeAmount124 = dt.Rows[0][13].ToString();
+                ChangeTypeAmount125 = dt.Rows[0][14].ToString();
             }
             other.Add("ChangeTypeAmount0", ChangeTypeAmount0); //激活奖励
             other.Add("ChangeTypeAmount1", ChangeTypeAmount1); //交易分润
@@ -207,6 +209,8 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("ChangeTypeAmount112", ChangeTypeAmount112); //推荐奖励
             other.Add("ChangeTypeAmount60", ChangeTypeAmount60); //流量卡分佣
             other.Add("ChangeTypeAmount31", ChangeTypeAmount31); //红包奖励
+            other.Add("ChangeTypeAmount124", ChangeTypeAmount124); //机具过期
+            other.Add("ChangeTypeAmount125", ChangeTypeAmount125); //软件服务费
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -26,6 +26,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public UserCashRecordOperateController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 提现记录列表
@@ -344,6 +345,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);//设置提现记录为成功
+                Fields.Add("SeoTitle", DateTime.Now);
                 new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);                
             }
             opdb.SaveChanges();

Areas/Admin/Views/MainServer/SysTools/TransferPosCoupon.cshtml

@@ -57,7 +57,7 @@
                                     <div class="layui-input-inline">
                                         <input class="layui-input" type="text" id="LeaderMakerCode" name="LeaderMakerCode"
                                             maxlength="50" autocomplete="off"
-                                            placeholder="请输入大盟主创客编号，不填不设置">
+                                            placeholder="大盟主创客编号,不填不设置">
                                     </div>
                                 </div>
                             </div>

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

@@ -110,6 +110,8 @@
                                 <option value="111">分润补贴</option>
                                 <option value="112">直推奖励</option>
                                 <option value="116">大盟主奖励</option>
+                                <option value="124">创客月费</option>
+                                <option value="125">软件服务费</option>
                             </select>
                         </div>
                     </div>
@@ -142,7 +144,7 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    激活奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount0">0.00</span>　|　交易分润(元)：<span style="color: #f00;" id="ChangeTypeAmount1">0.00</span>　|　创客开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　分润补贴(元)：<span style="color: #f00;" id="ChangeTypeAmount111">0.00</span>　| 直推奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>　|　流量卡分佣(元)：<span style="color: #f00;" id="ChangeTypeAmount60">0.00</span>　|　红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>
+                    激活奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount0">0.00</span>　|　交易分润(元)：<span style="color: #f00;" id="ChangeTypeAmount1">0.00</span>　|　创客开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　分润补贴(元)：<span style="color: #f00;" id="ChangeTypeAmount111">0.00</span>　| 直推奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>　|　流量卡分佣(元)：<span style="color: #f00;" id="ChangeTypeAmount60">0.00</span>　|　红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>　|　机具过期(元)：<span style="color: #f00;" id="ChangeTypeAmount4">0.00</span>　|　软件服务费(元)：<span style="color: #f00;" id="ChangeTypeAmount5">0.00</span>
                     <br />
                     提现申请(元)：<span style="color: #f00;" id="ChangeTypeAmount2">0.00</span>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　人工冻结(元)：<span style="color: #f00;" id="ChangeTypeAmount61">0.00</span>　| 人工解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount62">0.00</span>　| 人工扣减(元)：<span style="color: #f00;" id="ChangeTypeAmount63">0.00</span>　|　人工增加(元)：<span style="color: #f00;" id="ChangeTypeAmount64">0.00</span>　|　提现代付(元)：<span style="color: #f00;" id="ChangeTypeAmount3">0.00</span>　|　提现手续费(元)：<span style="color: #f00;" id="ChangeTypeAmount4">0.00</span>　|　提现税点扣除(元)：<span style="color: #f00;" id="ChangeTypeAmount5">0.00</span>
                 </blockquote>

wwwroot/layuiadmin/modules_main/UserAccountRecord_Admin.js

@@ -133,6 +133,8 @@ layui.config({
             $("#ChangeTypeAmount112").text(res.other.ChangeTypeAmount112);
             $("#ChangeTypeAmount60").text(res.other.ChangeTypeAmount60);
             $("#ChangeTypeAmount31").text(res.other.ChangeTypeAmount31);
+            $("#ChangeTypeAmount124").text(res.other.ChangeTypeAmount124);
+            $("#ChangeTypeAmount125").text(res.other.ChangeTypeAmount125);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UserCashHelpRecord_Admin.js

@@ -185,6 +185,11 @@ layui.config({
                     width: 200,
                     title: '提现服务返回信息',
                     sort: true
+                }, {
+                    field: 'SeoTitle',
+                    width: 200,
+                    title: '备注/代付返回信息',
+                    sort: true
                 }, {
                     field: 'CreateDate',
                     width: 200,

wwwroot/layuiadmin/modules_main/UserCashLeaderRecord_Admin.js

@@ -185,6 +185,11 @@ layui.config({
                     width: 200,
                     title: '提现服务返回信息',
                     sort: true
+                }, {
+                    field: 'SeoTitle',
+                    width: 200,
+                    title: '备注/代付返回信息',
+                    sort: true
                 }, {
                     field: 'CreateDate',
                     width: 200,

wwwroot/layuiadmin/modules_main/UserCashRecord_Admin.js

@@ -195,6 +195,11 @@ layui.config({
                     width: 200,
                     title: '提现服务返回信息',
                     sort: true
+                }, {
+                    field: 'SeoTitle',
+                    width: 200,
+                    title: '备注/代付返回信息',
+                    sort: true
                 }, {
                     field: 'CreateDate',
                     width: 200,

wwwroot/layuiadmin/modules_operate/UserCashRecord_Admin.js

@@ -191,6 +191,11 @@ layui.config({
                     width: 200,
                     title: '创建时间',
                     sort: true
+                }, {
+                    field: 'SeoTitle',
+                    width: 200,
+                    title: '发放时间',
+                    sort: true
                 }, { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
 
             ]