ソースを参照

修改文字助利宝到账文字
后台助利宝分润展示和到账标记

lichunlei 3 年 前
コミット
c189710e47

+ 1 - 1
AppStart/Helper/SycnHelpProfitService.cs

@@ -121,7 +121,7 @@ namespace MySystem
                         AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
                         BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
                         AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                        Remark = user.RealName.Substring(0, 1) + "**:" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + "交易" + TradeAmt.ToString("f2"),
+                        Remark = RewardType == 1 ? "直拓商户分润" : "推荐交易分润",
                     }).Entity;
                     db.SaveChanges();
                     tran.Commit();

+ 4 - 3
Areas/Admin/Controllers/MainServer/HelpProfitRewardController.cs

@@ -91,9 +91,10 @@ namespace MySystem.Areas.Admin.Controllers
                 if (RewardType == 112) dic["RewardType"] = "推荐奖励";
                 if (RewardType == 0) dic["RewardType"] = "";
                 //验证和同步账户状态
-                int CheckStatus = int.Parse(dic["CheckStatus"].ToString());
-                if (CheckStatus == 0) dic["CheckStatus"] = "初始";
-                if (CheckStatus == 1) dic["CheckStatus"] = "已验证和同步";
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["Status"] = "初始";
+                if (Status == 1) dic["Status"] = "已展示";
+                if (Status == 2) dic["Status"] = "已到账";
 
             }
             return Json(obj);

+ 11 - 14
wwwroot/layuiadmin/modules_main/HelpProfitReward_Admin.js

@@ -120,21 +120,18 @@ $('#TradeDate').val(value);
             { type: 'checkbox', fixed: 'left' }
     		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
             ,{field:'TradeMonth', width: 200, title:'交易月', sort: true}
-,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'UserId', width: 200, title:'创客', sort: true}
-,{field:'UserIdMakerCode', width: 200, title:'创客创客编号', sort: true}
-,{field:'UserIdRealName', width: 200, title:'创客真实姓名', sort: true}
-,{field:'BrandId', width: 200, title:'品牌', sort: true}
-,{field:'RewardType', width: 200, title:'奖励类型', sort: true}
-,{field:'CreditTradeAmt', width: 200, title:'贷记卡交易总金额', sort: true}
-,{field:'CreditRewardAmount', width: 200, title:'贷记卡交易奖励金额', sort: true}
-,{field:'OpenRewardNo', width: 200, title:'开机奖励单号', sort: true}
-,{field:'RewardDesc', width: 200, title:'奖励描述', sort: true}
-,{field:'Remark', width: 200, title:'备注', sort: true}
-,{field:'CheckStatus', width: 200, title:'验证和同步账户状态', sort: true}
+            ,{field:'SeoTitle', width: 200, title:'交易日', sort: true}
+            ,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
+            ,{field:'UserIdMakerCode', width: 200, title:'创客创客编号', sort: true}
+            ,{field:'UserIdRealName', width: 200, title:'创客真实姓名', sort: true}
+            ,{field:'BrandId', width: 200, title:'品牌', sort: true}
+            ,{field:'RewardType', width: 200, title:'奖励类型', sort: true}
+            ,{field:'CreditTradeAmt', width: 200, title:'贷记卡交易总金额', sort: true}
+            ,{field:'CreditRewardAmount', width: 200, title:'贷记卡交易奖励金额', sort: true}
+            ,{field:'RewardDesc', width: 200, title:'奖励描述', sort: true}
+            ,{field:'Remark', width: 200, title:'备注', sort: true}
+            ,{field:'Status', width: 200, title:'验证和同步账户状态', sort: true}
 
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {