直属创客交易额调整

商户管理调整

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商户列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMerchantInfo data, string MerIdcardNo, string MerchantName, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMerchantInfo data, string MerIdcardNo, string MerchantName, string PhoneNo, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -60,14 +60,22 @@ namespace MySystem.Areas.Admin.Controllers
             //身份证号
             if (!string.IsNullOrEmpty(MerIdcardNo))
             {
-                condition += " and MerIdcardNo like '%" + MerIdcardNo + "%'";
+                var IdCardf = MerIdcardNo.Substring(0, 6);
+                var IdCardb = MerIdcardNo.Substring(MerIdcardNo.Length - 4);
+                condition += " and LEFT(MerIdcardNo,6)=" + IdCardf + " AND RIGHT(MerIdcardNo,4)=" + IdCardb + "";
             }
             //商户姓名
             if (!string.IsNullOrEmpty(MerchantName))
             {
                 condition += " and MerchantName like '%" + MerchantName + "%'";
             }
-
+            //手机号
+            if (!string.IsNullOrEmpty(PhoneNo))
+            {
+                var PhoneNof = PhoneNo.Substring(0, 3);
+                var PhoneNob = PhoneNo.Substring(PhoneNo.Length- 4);
+                condition += " and LEFT(MerchantMobile,3)=" + PhoneNof + " AND RIGHT(MerchantMobile,4)=" + PhoneNob + "";
+            }
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1040,12 +1040,21 @@ namespace MySystem.Areas.Admin.Controllers
             string DepositGet = "未领取";
             string DepositUser = "";
             string DepositToUser = "";
+            decimal headAmount = 0;
+            decimal footAmount = 0;
             ActiveReward reward = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.RewardAmount != 40) ?? new ActiveReward();
             if (reward.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == reward.UserId) ?? new Users();
                 DepositGet = "已领取";
                 DepositUser = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+                var fAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 0);
+                var lAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 1);
+                if (fAmount != null && lAmount != null)
+                {
+                    headAmount = fAmount.RewardAmount;
+                    footAmount = lAmount.RewardAmount;
+                }
             }
             string DepositGet6 = "未领取";
             string DepositUser6 = "";
@@ -1090,6 +1099,7 @@ namespace MySystem.Areas.Admin.Controllers
             string SendStatus = applyorder.SendStatus == 1 ? "已发货" : "未发货";
             string ApplyDate = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string SendDate = applyorder.SendDate == null ? "" : applyorder.SendDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+            string CreateDate = pos.CreateDate == null ? "" : pos.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string TransferTime = pos.TransferTime == null ? "" : pos.TransferTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ActiveTime = reward.CreateDate == null ? "" : reward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1115,6 +1125,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 result += "机具所属小分仓：暂无小分仓\n";
             }
+            result += "入库时间：" + CreateDate + "\n";
             result += "划拨时间：" + TransferTime + "\n";
             result += "绑定状态：" + bindResult + "(绑定时间：" + bindTime + ")\n";
             result += "激活状态：" + activeResult + "(激活时间：" + activeTime + ")\n";
@@ -1124,6 +1135,7 @@ namespace MySystem.Areas.Admin.Controllers
             result += "是否发货：" + SendStatus + "，发货时间：" + SendDate + "\n";
             result += "押金：" + Deposit + "\n";
             result += "是否返现：" + DepositGet + "，领取时间：" + ActiveTime + "\n";
+            result += "返现金额：" + headAmount + " " + " " + footAmount + "\n";//TODO: 添加返现金额和额外奖励
             result += "押金返现应返现对象：" + DepositToUser + "\n";
             result += "押金返现实际返现对象：" + DepositUser + "\n";
             if (pos.BrandId == 6)
@@ -1548,7 +1560,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
                 newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
-                Users user  = new Users();
+                Users user = new Users();
                 if (!string.IsNullOrEmpty(MakerCode))
                 {
                     UserForMakerCode userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
@@ -1695,7 +1707,7 @@ namespace MySystem.Areas.Admin.Controllers
             if (forMerNo != null)
             {
                 PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
-                if(merchant != null)
+                if (merchant != null)
                 {
                     db.PosMerchantInfo.Remove(merchant);
                 }

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1599,7 +1599,7 @@ 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 + "'" + con);
+            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1630,7 +1630,7 @@ namespace MySystem.Areas.Admin.Controllers
                 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 + "'" + con);
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1684,7 +1684,7 @@ namespace MySystem.Areas.Admin.Controllers
                 TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
             }
 
-            DataTable dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            DataTable dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team' and UserId= '" + ParentId + "'" + con);
             if (dts.Rows.Count > 0)
             {
                 TotalAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
@@ -1715,7 +1715,7 @@ namespace MySystem.Areas.Admin.Controllers
                 YAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
             }
 
-            dts = OtherMySqlConn.dtable("select Sum(NotHelpNoonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team' and UserId= '" + ParentId + "'" + con);
             if (dts.Rows.Count > 0)
             {
                 TotalAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
@@ -1842,7 +1842,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> obj = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1873,7 +1873,7 @@ namespace MySystem.Areas.Admin.Controllers
                 YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
 
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));

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

@@ -40,7 +40,7 @@
                         <label class="layui-form-label">身份证号</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="MerIdcardNo" 
-                                placeholder="请输入身份证号前六位或后四位" autocomplete="off">
+                                placeholder="请输入身份证号" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -50,6 +50,13 @@
                                 placeholder="请输入商户姓名" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">手机号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerchantMobile" 
+                                placeholder="请输入手机号" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询

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

@@ -97,7 +97,7 @@
                     </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>
                     </br>
-                    个人绑定数：<span style="color: #f00;" id="PBCount">0</span>　| 个人激活数：<span style="color: #f00;" id="PACount">0</span>　
+                    个人机具绑定总数：<span style="color: #f00;" id="PBCount">0</span>　| 个人机具激活总数：<span style="color: #f00;" id="PACount">0</span>　
                     </br>
                     团队交易额：
                     </br>
@@ -105,7 +105,7 @@
                     </br>
                     刷卡交易总额(稳)(元)：<span style="color: #f00;" id="TotalAmtwd1">0.00</span>　| 贷记卡交易额(稳)(元)：<span style="color: #f00;" id="DAmtwd1">0.00</span>　|　借记卡非封顶交易额(稳)(元)：<span style="color: #f00;" id="JAmtwd1">0.00</span>　|　借记卡封顶交易额(稳)(元)：<span style="color: #f00;" id="JfAmtwd1">0.00</span>　|　借记卡交易笔数(稳)(元)：<span style="color: #f00;" id="JCountwd1">0.00</span>　|　云闪付小额交易额(稳)(元)：<span style="color: #f00;" id="YAmtwd1">0.00</span>
                     </br>
-                    团队绑定数：<span style="color: #f00;" id="TBCount">0</span>　| 团队激活数：<span style="color: #f00;" id="TACount">0</span>　
+                    团队机具绑定总数：<span style="color: #f00;" id="TBCount">0</span>　| 团队机具激活总数：<span style="color: #f00;" id="TACount">0</span>　
                 
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

wwwroot/layuiadmin/modules_main/UsersChildren_Admin.js

@@ -114,8 +114,8 @@ layui.config({
             , { field: 'JCountwd', width: 200, title: '借记卡交易笔数(稳)', sort: true }
             , { field: 'YAmtwd', width: 200, title: '云闪付小额交易额(稳)', sort: true }
 
-            , { field: 'TBCount', width: 200, title: '团队绑定数', sort: true }
-            , { field: 'TACount', width: 200, title: '团队激活数', sort: true }
+            , { field: 'TBCount', width: 200, title: '团队机具绑定总数', sort: true }
+            , { field: 'TACount', width: 200, title: '团队机具激活总数', sort: true }
 
             // , { field: 'HelpInfo', width: 400, title: '扶持期商户交易信息', sort: true }
             // , { field: 'NotHelpInfo', width: 400, title: '稳定期商户交易信息', sort: true }