调整

Areas/Api/Controllers/v1/Main1/ExportExcelsController.cs

@@ -27,7 +27,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult DownloadsList(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             List<Dictionary<string, object>> dataList = DownloadsListDo(value);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });

Areas/Api/Controllers/v1/Main1/MerchantAddInfoController.cs

@@ -419,7 +419,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult DirectResetMerchantAmount(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = DirectResetMerchantAmountDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });

Areas/Api/Controllers/v1/Main1/MerchantAmountSummayController.cs

@@ -27,7 +27,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult DirectMerchantTradeSummaryList(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             List<Dictionary<string, object>> dataList = DirectMerchantTradeSummaryListDo(value);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });

Areas/Api/Controllers/v1/Main1/PosMachinesTwoController.cs

@@ -27,7 +27,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult DirectResetQrCodeAmount(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = DirectResetQrCodeAmountDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
@@ -62,7 +62,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult UnionPayResetQrCodeAmount(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = UnionPayResetQrCodeAmountDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });

Areas/Api/Controllers/v1/Main1/UserSwapWhiteController.cs

@@ -29,7 +29,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult RiskMakerList(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             List<Dictionary<string, object>> dataList = RiskMakerListDo(value);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
@@ -69,7 +69,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult AddRiskMaker(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = AddRiskMakerDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
@@ -99,6 +99,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             }
             Dictionary<string, object> fields = new Dictionary<string, object>();
             var sys = SysAdminService.Query(AppConfig.LoginSession.sysId);
+            fields.Add("CreateDate", DateTime.Now); //创建时间
             fields.Add("UserId", user.Id); //创客Id
             fields.Add("CreateMan", sys.AdminName + "_" + sys.RealName); //操作人
             fields.Add("Remark", Remark); //备注
@@ -119,7 +120,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult DeleteRiskMaker(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = DeleteRiskMakerDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });

Areas/Api/Controllers/v1/Main1/UsersController.cs

@@ -27,7 +27,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult DirectResetUserPersonalAmount(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = DirectResetUserPersonalAmountDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
@@ -62,7 +62,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult UnionPayResetUserPersonalAmount(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = UnionPayResetUserPersonalAmountDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
@@ -97,7 +97,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult DirectResetUserTeamAmount(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = DirectResetUserTeamAmountDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
@@ -132,7 +132,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult UnionPayResetUserTeamAmount(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = UnionPayResetUserTeamAmountDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });

Areas/Api/Controllers/v1/Main2/MerchantAddInfoController.cs

@@ -423,7 +423,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         [Authorize]
         public JsonResult UnionPaySettlementRecordList(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             List<Dictionary<string, object>> dataList = UnionPaySettlementRecordListDo(value);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
@@ -434,6 +434,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string MerchantName = data["MerchantName"].ToString(); //商户名称
             string MerchantNo = data["MerchantNo"].ToString(); //商户号
             string SettlementDate = data["SettlementDate"].ToString(); //结算时间(必填)
+            string SettleStatus = data["SettleStatus"].ToString(); //出款状态(0 入账成功 1 入账失败 2 结算超时 3 入账受理成功 4 已提交结算请求)
             string pageSize = data["page_size"].ToString();
             string pageNum = data["page_num"].ToString();
             var MerchantId = 0;
@@ -455,7 +456,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 StartDate = datelist[0];
                 EndDate = datelist[1];
             }
-            var dataList = MySelfUtil.CardInComeRecordList(MerchantId, StartDate, EndDate, pageSize, pageNum);
+            var dataList = MySelfUtil.CardInComeRecordList(MerchantId, StartDate, EndDate,SettleStatus, pageSize, pageNum);
             return dataList;
         }
         #endregion
@@ -465,7 +466,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         [Authorize]
         public JsonResult UnionPayResetMerchantAmount(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = UnionPayResetMerchantAmountDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });

Areas/Api/Controllers/v1/Main2/MerchantAmountSummayController.cs

@@ -27,7 +27,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         [Authorize]
         public JsonResult UnionPayMerchantTradeSummaryList(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             List<Dictionary<string, object>> dataList = UnionPayMerchantTradeSummaryListDo(value);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });

Util/MySelf/MySelfUtil.cs

@@ -18,14 +18,14 @@ namespace MySystem
         /// 到账记录列表
         /// </summary>
         /// <returns></returns>
-        public static List<Dictionary<string, object>> CardInComeRecordList(int MerchantId, string StartDate, string EndDate, string pageSize, string pageNum)
+        public static List<Dictionary<string, object>> CardInComeRecordList(int MerchantId, string StartDate, string EndDate, string SettleStatus, string pageSize, string pageNum)
         {
             var merchantInfo = MerchantAddInfoService.Query(MerchantId);
             var SubjectType = 0;
             if (merchantInfo.SubjectType == "SUBJECT_TYPE_ENTERPRISE") SubjectType = 1; //企业公司
             if (merchantInfo.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") SubjectType = 2; //个体工商户
             if (merchantInfo.SubjectType == "SUBJECT_TYPE_SMALL") SubjectType = 3; //小微
-            JsonData Info = JsonMapper.ToObject(HaoDaHelper.Instance.CardInComeRecord(merchantInfo.OutMchtNo, StartDate, EndDate, merchantInfo.MchtNo, "", "", pageNum, pageSize));
+            JsonData Info = JsonMapper.ToObject(HaoDaHelper.Instance.CardInComeRecord(merchantInfo.OutMchtNo, StartDate, EndDate, merchantInfo.MchtNo, "", SettleStatus, pageNum, pageSize));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             if (Info["code"].ToString() == "0")
             {
@@ -39,6 +39,7 @@ namespace MySystem
                         curData.Add("TradeNo", item["id"].ToString()); //订单Id
                         curData.Add("SettleStatus", item["settleStatus"].ToString()); //结算状态(0: 入账成功、1: 入账失败、2: 结算超时、3: 入账受理成功、4: 已提交结算请求、5:已拆分批次、6: 初始化批次信息、7:正在提交结算请求)
                         curData.Add("MerchantName", merchantInfo.CertMerchantName); //商户名称
+                        curData.Add("MchtNo", merchantInfo.MchtNo); //商户号
                         curData.Add("ClearTime", item["clearTime"].ToString()); //处理时间
                         curData.Add("RemitTime", item["remitTime"].ToString()); //到账时间
                         curData.Add("SettleDate", item["settleDate"].ToString().Substring(item["settleDate"].ToString().Length - 5, 5)); //结算日期
@@ -47,6 +48,7 @@ namespace MySystem
                         curData.Add("CardNo", item["cardNo"].ToString()); //结算卡号
                         curData.Add("TradeMchtName", item["tradeMchtName"].ToString()); //收单商户名称
                         curData.Add("BankName", item["bankName"].ToString()); //开户行名称
+                        curData.Add("Remark", item["remark"].ToString()); //备注
                         dataList.Add(curData);
                     }
                 }