Merge branch 'feature-dgy-后台新功能批量处理' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4275,7 +4275,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     QueryCount = item.QueryCount,//券类型(1 电签 2 大POS)
                     CreateDate = DateTime.Now,
-                    ChangeKind = 3,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
+                    ChangeKind = 1,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
                     OrderNo = ChangeRecordNo,
                     ToUserId = tUserId.Id,
                     FromUserId = fUserId.Id,
@@ -4287,7 +4287,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 QueryCount = 3,
                 CreateDate = DateTime.Now,
-                ChangeKind = 3,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
+                ChangeKind = 1,//类型(0购买，1划拨，2使⽤，3申请机具循环驳回)
                 ChangeCount = CouponCount,
                 // AfterOut = AfterOut,
                 // AfterTotal = AfterTotal,
@@ -4867,7 +4867,7 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
         #region 直营团队数据
-        public JsonResult Team1InfoDo(string MakerCode, string BindingTime, string ActivationTime, string PosFee, string BrandId, int page = 1, int limit = 30)
+        public JsonResult Team1InfoDo(string MakerCode, string BindingTime, string ActivationTime, string PosFeeSelect, string BrandId, int page = 1, int limit = 30)
         {
             string conn = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
@@ -4887,7 +4887,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = BindingTime.Split(new string[] { " - " }, StringSplitOptions.None);
                 bstart = datelist[0] + " 00:00:00";
                 bend = datelist[1] + " 23:59:59";
-                condition += "and tb.BindingTime>='" + bstart + "' and tb.BindingTime<'" + bend + "'";
+                condition += " and tb.BindingTime>='" + bstart + "' and tb.BindingTime<'" + bend + "'";
             }
             if (!string.IsNullOrEmpty(ActivationTime))
             {
@@ -4896,15 +4896,14 @@ namespace MySystem.Areas.Admin.Controllers
                 aend = datelist[1] + " 23:59:59";
                 condition += " and tb.ActivationTime>='" + astart + "' and tb.ActivationTime<'" + aend + "'";
             }
-            if (!string.IsNullOrEmpty(PosFee))
+            if (!string.IsNullOrEmpty(PosFeeSelect))
             {
-                condition += " and tb.SeoKeyword=" + PosFee;
+                condition += " and tb.SeoKeyword=" + PosFeeSelect;
             }
             if (!string.IsNullOrEmpty(BrandId))
             {
                 condition += " and tb.BrandId=" + BrandId;
             }
-            var sql = "select wname,k.`Name`,PosSnType,PosSn,tb.SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from (select (select Name from BusinessPartner where Id=(select PartnerId from BusinessPartnerPos where PosId=pos.Id and `Status`>-1 limit 1)) wname,BrandId,PosSnType,PosSn,(CASE WHEN BrandId not in(2,7,10,11) THEN ROUND(CAST(SeoKeyword AS DECIMAL)/100, 2) ELSE SeoKeyword end) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from PosMachinesTwo pos where BindingState=1 and `Status`>=-1 and BuyUserId=" + UserId + "  and Id in (select PosId from BusinessPartnerPos)) tb left join KqProducts k on tb.BrandId=k.Id" + condition;
 
             DataTable dt = CustomerSqlConn.dtable("select wname,k.`Name`,PosSnType,PosSn,tb.SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from (select (select Name from BusinessPartner where Id=(select PartnerId from BusinessPartnerPos where PosId=pos.Id and `Status`>-1 limit 1)) wname,BrandId,PosSnType,PosSn,(CASE WHEN BrandId not in(2,7,10,11) THEN ROUND(CAST(SeoKeyword AS DECIMAL)/100, 2) ELSE SeoKeyword end) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from PosMachinesTwo pos where BindingState=1 and `Status`>=-1 and BuyUserId=" + UserId + "  and Id in (select PosId from BusinessPartnerPos)) tb left join KqProducts k on tb.BrandId=k.Id" + condition, conn);
             foreach (DataRow item in dt.Rows)
@@ -4939,7 +4938,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string ExportTeam1InfoExcelDo(string MakerCode, string BindingTime, string ActivationTime, string PosFee, string BrandId)
+        public string ExportTeam1InfoExcelDo(string MakerCode, string BindingTime, string ActivationTime, string PosFeeSelect, string BrandId)
         {
             string conn = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
@@ -4959,7 +4958,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = BindingTime.Split(new string[] { " - " }, StringSplitOptions.None);
                 bstart = datelist[0] + " 00:00:00";
                 bend = datelist[1] + " 23:59:59";
-                condition += "and tb.BindingTime>='" + bstart + "' and tb.BindingTime<'" + bend + "'";
+                condition += " and tb.BindingTime>='" + bstart + "' and tb.BindingTime<'" + bend + "'";
             }
             if (!string.IsNullOrEmpty(ActivationTime))
             {
@@ -4968,9 +4967,9 @@ namespace MySystem.Areas.Admin.Controllers
                 aend = datelist[1] + " 23:59:59";
                 condition += " and tb.ActivationTime>='" + astart + "' and tb.ActivationTime<'" + aend + "'";
             }
-            if (!string.IsNullOrEmpty(PosFee))
+            if (!string.IsNullOrEmpty(PosFeeSelect))
             {
-                condition += " and tb.SeoKeyword=" + PosFee;
+                condition += " and tb.SeoKeyword=" + PosFeeSelect;
             }
             if (!string.IsNullOrEmpty(BrandId))
             {

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

@@ -54,20 +54,19 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">绑定时间</label>
                             <div class="layui-input-inline">
-                                <input class="layui-input" type="text" readonly name="BindingTimeData" id="BindingTime"
+                                <input class="layui-input" type="text" readonly name="BindingTime" id="BindingTime"
                                     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" readonly name="ActivationTimeData"
+                                <input class="layui-input" type="text" readonly name="ActivationTime"
                                     id="ActivationTime" placeholder="" autocomplete="off">
                             </div>
                         </div>
                         @{
-                            Dictionary<string, string> ProfitObjectsActivesDic = new
-                            MySystem.DictionaryClass().getKqProductBrandDic();
+                            Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();
                         }
                         <div class="layui-inline">
                             <label class="layui-form-label">品牌</label>
@@ -81,6 +80,18 @@
                                 </select>
                             </div>
                         </div>
+                        <div class="layui-inline">
+                        <label class="layui-form-label">服务费金额</label>
+                        <div class="layui-input-inline">
+                            <select id="PosFeeSelect" name="PosFeeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">0</option>
+                                <option value="99">99</option>
+                                <option value="199">199</option>
+                                <option value="249">249</option>
+                                <option value="299">299</option>
+                            </select>
+                        </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>查询

wwwroot/layuiadmin/modules_main/ExportExcels_Admin.js

@@ -32,7 +32,7 @@ layui.config({
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
         elem: '#CreateDate',
-        type: 'datetime',
+        type: 'date',
         range: true,
         trigger: 'click',
         change: function (value, date, endDate) {