Merge branch 'feature-dgy-后台优化新' into DuGuYang

# Conflicts:
#	Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs
#	wwwroot/layuiadmin/modules_main/PosMerchantInforgList_Admin.js

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -748,6 +748,7 @@ namespace MySystem.Areas.Admin.Controllers
                 // 实际返还金额
                 // decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
                 decimal amt = decimal.Parse(merchantDepositReturn.ReturnAmount.ToString());
+                dic["Amount"] = amt.ToString("f2");
                 dic["ReturnAmount"] = (amt * 0.92M).ToString("f2");
 
                 if (!string.IsNullOrEmpty(merchantDepositReturn.AlipayAccountNo))
@@ -786,7 +787,8 @@ namespace MySystem.Areas.Admin.Controllers
             // ReturnFields.Add("BankCardNo", "银行卡号");
             ReturnFields.Add("BankName", "开户行");
             ReturnFields.Add("PayKindName", "退款类型");
-            ReturnFields.Add("ReturnAmount", "实际返还金额");
+            ReturnFields.Add("Amount", "服务费金额");
+            ReturnFields.Add("ReturnAmount", "达标奖金额");
             ReturnFields.Add("SeoDescription", "备注");
             // ReturnFields.Add("UserIdRealName", "创客真实姓名");
             // ReturnFields.Add("UserIdMakerCode", "创客编号");
@@ -904,6 +906,7 @@ namespace MySystem.Areas.Admin.Controllers
                 // 实际返还金额
                 // decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
                 decimal amt = decimal.Parse(merchantDepositReturn.ReturnAmount.ToString());
+                dic["Amount"] = amt.ToString("f2");
                 dic["ReturnAmount"] = (amt * 0.92M).ToString("f2");
 
                 if (!string.IsNullOrEmpty(merchantDepositReturn.AlipayAccountNo))
@@ -942,7 +945,8 @@ namespace MySystem.Areas.Admin.Controllers
             // ReturnFields.Add("BankCardNo", "银行卡号");
             ReturnFields.Add("BankName", "开户行");
             ReturnFields.Add("PayKindName", "退款类型");
-            ReturnFields.Add("ReturnAmount", "实际返还金额");
+            ReturnFields.Add("Amount", "服务费金额");
+            ReturnFields.Add("ReturnAmount", "达标奖金额");
             ReturnFields.Add("SeoDescription", "备注");
             // ReturnFields.Add("UserIdRealName", "创客真实姓名");
             // ReturnFields.Add("UserIdMakerCode", "创客编号");

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -173,12 +173,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 人工已退商户列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexrgData(PosMerchantInfo data, string MerIdcardNo, string MerchantName, string PhoneNo, string PosSn, int page = 1, int limit = 30)
+        public JsonResult IndexrgData(PosMerchantInfo data, string KqMerNo, string MerIdcardNo, string MerchantName, string PhoneNo, string PosSn, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("KqMerNo", "1"); //商户编号
+            // Fields.Add("KqMerNo", "1"); //商户编号
             string condition = " and Status>-1 and StandardStatus=-2";
             //身份证号
             if (!string.IsNullOrEmpty(MerIdcardNo))
@@ -192,19 +192,17 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and MerchantName like '%" + MerchantName + "%'";
             }
-            //手机号
-            if (!string.IsNullOrEmpty(PhoneNo))
+            //商户编号
+            if (!string.IsNullOrEmpty(KqMerNo))
             {
-                var PhoneNof = PhoneNo.Substring(0, 3);
-                var PhoneNob = PhoneNo.Substring(PhoneNo.Length - 4);
-                condition += " and LEFT(MerchantMobile,3)=" + PhoneNof + " AND RIGHT(MerchantMobile,4)=" + PhoneNob + "";
+                condition += " and KqMerNo='" + KqMerNo + "'";
             }
             //机具号
             if (!string.IsNullOrEmpty(PosSn))
             {
                 condition += " and KqSnNo='" + PosSn + "'";
             }
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "KqRegTime DESC", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -323,6 +321,98 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+        #region 导出人工已退商户Excel
+
+        /// <summary>
+        /// 导出人工已退商户Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportrgExcel(PosMerchantInfo data, string MerIdcardNo, string MerchantName, string PhoneNo, string PosSn)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+
+            Fields.Add("KqMerNo", "1"); //商户编号
+            string condition = " and Status>-1 and StandardStatus=-2";
+            //身份证号
+            if (!string.IsNullOrEmpty(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 + "";
+            }
+            //机具号
+            if (!string.IsNullOrEmpty(PosSn))
+            {
+                condition += " and KqSnNo='" + PosSn + "'";
+            }
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", 1, 20000, condition, "MerchantName,Remark,KqMerNo,KqSnNo,UserId,KqRegTime", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+
+
+                var KqSnNo = dic["KqSnNo"].ToString();
+                var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
+                var brand = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId) ?? new KqProducts();
+                dic["BrandName"] = brand.Name;
+
+                int UserId = int.Parse(dic["UserId"].ToString());
+                Users puser = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["MakerCode"] = puser.MakerCode;
+                dic["RealName"] = puser.RealName;
+                dic.Remove("UserId");
+
+                //实际押金
+                string SeoKeyword = "0";
+                if (!string.IsNullOrEmpty(pos.SeoKeyword))
+                {
+                    if (pos.BrandId != 2 && pos.BrandId != 7)
+                    {
+                        SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
+                    }
+                    else
+                    {
+                        SeoKeyword = pos.SeoKeyword;
+                    }
+                }
+                dic["SeoKeyword"] = SeoKeyword;
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+            ReturnFields.Add("KqMerNo", "商户编号");
+            ReturnFields.Add("MerchantName", "商户名称");
+            ReturnFields.Add("BrandName", "机具品牌");
+            ReturnFields.Add("KqSnNo", "机具SN");
+            ReturnFields.Add("KqRegTime", "退还时间");
+            ReturnFields.Add("SeoKeyword", "服务费金额");
+            ReturnFields.Add("Remark", "已退还金额");
+            ReturnFields.Add("MakerCode", "创客编号");
+            ReturnFields.Add("RealName", "创客姓名");
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "PosMerchantInfo", "ExportrgExcel");
+            return Json(result);
+        }
+
+        #endregion
+
+
         #region 达标商户列表
 
         /// <summary>
@@ -809,9 +899,11 @@ namespace MySystem.Areas.Admin.Controllers
                 JsonData dr = list[i];
                 string KqMerNo = dr[0].ToString(); // 商户编号
                 string Amount = dr[1].ToString(); // 已退金额
+                string KqRegTime = dr[2].ToString(); // 退还时间
                 var posMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == KqMerNo) ?? new PosMerchantInfo();
                 posMerchantInfo.StandardStatus = -2;
                 posMerchantInfo.Remark = Amount;
+                posMerchantInfo.KqRegTime = DateTime.Parse(KqRegTime);
                 Ids += posMerchantInfo.Id + "_" + Amount + ",";
                 db.SaveChanges();
             }

wwwroot/layuiadmin/modules_main/PosMerchantInforgList_Admin.js

@@ -125,6 +125,7 @@ layui.config({
             , { field: 'MerchantMobile', width: 200, title: '手机号', sort: true }
             , { field: 'KqSnNo', width: 220, title: '机具SN号', sort: true }
             , { field: 'SeoKeyword', width: 220, title: '服务费', sort: true }
+            , { field: 'KqRegTime', width: 220, title: '导入退还时间', sort: true }
             // , { field: 'PrizeParams', width: 220, title: '设置押金', sort: true }
             , { field: 'Remark', width: 220, title: '　退还金额：', sort: true }
         ]]
@@ -404,7 +405,7 @@ layui.config({
             });
             $.ajax({
                 type: "GET",
-                url: "/Admin/PosMerchantInfoList/ExportExcel?r=" + Math.random(1),
+                url: "/Admin/PosMerchantInfoList/ExportrgExcel?r=" + Math.random(1),
                 data: userdata,
                 dataType: "json",
                 success: function (data) {