Merge branch 'feature-dgy-创客账户详细信息统计调整' into feature-dgy-后台测试

# Conflicts:
#	AppStart/RelationClassForConst.cs

AppStart/RelationClassForConst.cs

@@ -150,8 +150,9 @@ namespace MySystem
                 case 126:
                     result = "机具货款退还";
                     break;
-                case 130:
-                    result = "预发临时额度退还";
+                case 127:
+                    result = "运营中心分仓奖励";
+                    break;
                 case 201:
                     result = "分期预扣款";
                     break;

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -57,7 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客账户变动记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserAccountRecord data, int ChangeType, int ProductType, string TransRecordNo, string MakerCode, string RealName, int TopUserId, string CreateDateData, int UserId = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserAccountRecord data, string ChangeType, int ProductType, string TransRecordNo, string MakerCode, string RealName, int TopUserId, string CreateDateData, int UserId = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -127,23 +127,34 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
             }
-            if (ChangeType > 0)
+            if (!string.IsNullOrEmpty(ChangeType))
             {
-                if (ChangeType == 1)
-                {
-                    condition += " and (ChangeType=" + ChangeType + " or (ChangeType in(112,1) and ProductType=101))";
-                }
-                else if (ChangeType == 30)
+                if (int.Parse(ChangeType) > 0)
                 {
-                    condition += " and ChangeType=31 and Remark='开机抢红包活动'";
-                }
-                else if (ChangeType == 31)
-                {
-                    condition += " and (ChangeType=" + ChangeType + " and (Remark!='开机抢红包活动' or Remark IS NULL))";
+                    // if (ChangeType == 0)
+                    // {
+                    //     condition += " and ChangeType in(0,12)";
+                    // }
+                    if (int.Parse(ChangeType) == 1)
+                    {
+                        condition += " and (ChangeType=" + int.Parse(ChangeType) + " or (ChangeType in(112,1) and ProductType=101))";
+                    }
+                    else if (int.Parse(ChangeType) == 30)
+                    {
+                        condition += " and ChangeType=31 and Remark='开机抢红包活动'";
+                    }
+                    else if (int.Parse(ChangeType) == 31)
+                    {
+                        condition += " and (ChangeType=" + int.Parse(ChangeType) + " and (Remark!='开机抢红包活动' or Remark IS NULL))";
+                    }
+                    else
+                    {
+                        condition += " and ChangeType=" + int.Parse(ChangeType);
+                    }
                 }
-                else
+                if (int.Parse(ChangeType) == 0)
                 {
-                    condition += " and ChangeType=" + ChangeType;
+                    condition += " and ChangeType in(0,12)";
                 }
             }
             if (ProductType > 0)

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

@@ -161,7 +161,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="ChangeTypeAmount2">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>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　交易奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount12">0.00</span>　|　余额支付(元)：<span style="color: #f00;" id="ChangeTypeAmount20">0.00</span>　|　红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount30">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="ChangeTypeAmount2">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>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　余额支付(元)：<span style="color: #f00;" id="ChangeTypeAmount20">0.00</span>　|　红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount30">0.00</span>　|　活动奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>
                     <br/>
                     开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　流量卡分佣(元)：<span style="color: #f00;" id="ChangeTypeAmount60">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="ChangeTypeAmount111">0.00</span>　|　推荐奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>　|　私董会分红(元)：<span style="color: #f00;" id="ChangeTypeAmount114">0.00</span>　|　分仓奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount115">0.00</span>
                     <br/>