直连添加支付宝和微信商户号

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

@@ -247,14 +247,25 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
+            string AliPPID = data["AliPPID"].ToString(); //支付宝PID
+            string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
+            var query = MerchantAddInfoService.Query(int.Parse(MerchantId));
             Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
+            if (query.Id > 0)
+            {
+                if (!string.IsNullOrEmpty(query.AlipayPid))
+                {
+                    fields.Add("AlipayPid", AliPPID); //支付宝PID
+                }
+                if (!string.IsNullOrEmpty(query.SubMchid))
+                {
+                    fields.Add("SubMchid", WeChatNo); //微信商户号
+                }
+            }
+            AppResultJson resultJson = MerchantAddInfoService.Edit(fields, int.Parse(MerchantId));
 
-            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
+            return new AppResultJson() { Status = "1", Info = "添加成功", Data = Obj };
         }
         #endregion
 

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

@@ -28,10 +28,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = DirectActRecordDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = DirectActRecordDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> DirectActRecordDo(string value)
+        private List<Dictionary<string, object>> DirectActRecordDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantName = data["MerchantName"].ToString(); //商户名称
@@ -42,19 +43,46 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
+            if (!string.IsNullOrEmpty(MerchantName))
+            {
+                var query = MerchantAddInfoService.Query(" and CertMerchantName='" + MerchantName + "'");
+                condition += " and MerchantId='" + query.Id + "'";
+            }
+            if (!string.IsNullOrEmpty(AliPID))
+            {
+                condition += " and AlipayPid='" + AliPID + "'";
+            }
+            if (!string.IsNullOrEmpty(WeChatNo))
+            {
+                condition += " and SubMchid='" + WeChatNo + "'";
+            }
+            if (!string.IsNullOrEmpty(data["UpdateDate"].ToString()))
+            {
+                string[] datelist = UpdateDate.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and UpdateDate>='" + start + " 00:00:00' and UpdateDate<='" + end + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(data["PayMode"].ToString()))
+            {
+                condition += " and Sort='" + PayMode + "'";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = MerchantDepositOrderService.List(relationData, condition, pageNum, pageSize);
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = MerchantDepositOrderService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("", subdata[""].ToString()); //
+                var query = MerchantAddInfoService.Query(int.Parse(subdata["MerchantId"].ToString()));
                 curData.Add("Id", subdata["Id"].ToString()); //Id
-                curData.Add("MerchantName", ""); //商户名称
-                curData.Add("MctNo", ""); //商户号
-                curData.Add("UpdateDate", ""); //激活时间
-                curData.Add("PayMode", ""); //支付方式(1 支付宝 2 微信)
-                curData.Add("ActPayPrice", ""); //支付金额
+                curData.Add("MerchantName", query.CertMerchantName); //交易商户
+                curData.Add("AliPID", query.AlipayPid); //支付宝PID
+                curData.Add("WeChatNo", query.SubMchid); //微信商户号
+                curData.Add("UpdateDate", subdata["UpdateDate"].ToString() == null ? "" : DateTime.Parse(subdata["UpdateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                curData.Add("PayMode", int.Parse(subdata["Sort"].ToString())); //支付方式(1 支付宝 2 微信)
+                curData.Add("ActPayPrice", decimal.Parse(subdata["ActPayPrice"].ToString())); //支付金额
 
                 dataList.Add(curData);
             }

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

@@ -69,7 +69,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 var order = MerchantDepositOrderService.Query(" and Status>0 and MerchantId=" + MerchantId + "");
                 if (order.Id > 0) Status = int.Parse(subdata["Status"].ToString());
                 curData.Add("Id", MerchantId); //Id
-                curData.Add("MerchantName", subdata["Id"].ToString()); //商户名称
+                curData.Add("MerchantName", merAddInfo.CertMerchantName); //商户名称
                 curData.Add("AliPID", merAddInfo.AlipayPid); //支付宝PID
                 curData.Add("WeChatNo", merAddInfo.SubMchid); //微信商户号
                 curData.Add("UpdateDate", order.UpdateDate.ToString() == null ? "" : DateTime.Parse(order.UpdateDate.ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间

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

@@ -28,10 +28,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = UnionPayActRecordDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = UnionPayActRecordDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> UnionPayActRecordDo(string value)
+        private List<Dictionary<string, object>> UnionPayActRecordDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantName = data["MerchantName"].ToString(); //商户名称
@@ -41,18 +42,42 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
+            if (!string.IsNullOrEmpty(MerchantName))
+            {
+                var query = MerchantAddInfoService.Query(" and CertMerchantName='" + MerchantName + "'");
+                condition += " and MerchantId='" + query.Id + "'";
+            }
+            if (!string.IsNullOrEmpty(MctNo))
+            {
+                var query = MerchantAddInfoService.Query(" and MchtNo='" + MctNo + "'");
+                condition += " and MerchantId='" + query.Id + "'";
+            }
+            if (!string.IsNullOrEmpty(data["UpdateDate"].ToString()))
+            {
+                string[] datelist = UpdateDate.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and UpdateDate>='" + start + " 00:00:00' and UpdateDate<='" + end + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(data["PayMode"].ToString()))
+            {
+                condition += " and Sort='" + PayMode + "'";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = MerchantDepositOrderService.List(relationData, condition, pageNum, pageSize);
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = MerchantDepositOrderService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
+                var query = MerchantAddInfoService.Query(int.Parse(subdata["MerchantId"].ToString()));
                 curData.Add("Id", subdata["Id"].ToString()); //Id
-                curData.Add("MerchantName", ""); //商户名称
-                curData.Add("MctNo", ""); //商户号
-                curData.Add("UpdateDate", ""); //激活时间
-                curData.Add("PayMode", ""); //支付方式(1 支付宝 2 微信)
-                curData.Add("ActPayPrice", ""); //支付金额
+                curData.Add("MerchantName", query.CertMerchantName); //商户名称
+                curData.Add("MctNo", subdata["MchtNo"].ToString()); //商户号
+                curData.Add("UpdateDate", subdata["UpdateDate"].ToString() == null ? "" : DateTime.Parse(subdata["UpdateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                curData.Add("PayMode", int.Parse(subdata["Sort"].ToString())); //支付方式(1 支付宝 2 微信)
+                curData.Add("ActPayPrice", decimal.Parse(subdata["ActPayPrice"].ToString())); //支付金额
 
                 dataList.Add(curData);
             }

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

@@ -63,13 +63,12 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 var order = MerchantDepositOrderService.Query(" and Status>0 and MerchantId=" + MerchantId + "");
                 if (order.Id > 0) Status = int.Parse(subdata["Status"].ToString());
                 curData.Add("Id", MerchantId); //Id
-                curData.Add("MerchantName", subdata["Id"].ToString()); //商户名称
+                curData.Add("MerchantName", merAddInfo.CertMerchantName); //商户名称
                 curData.Add("MctNo", merAddInfo.MchtNo); //商户号
                 curData.Add("UpdateDate", order.UpdateDate.ToString() == null ? "" : DateTime.Parse(order.UpdateDate.ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                 curData.Add("PayMode", order.Sort); //支付方式(1 支付宝 2 微信)
                 curData.Add("Status", Status); //达标状态(-1 未参与 0 考核中 1 已通过 2 未通过 101 待领取 100 已领取 99 发放中)
                 curData.Add("Months", subdata["Months"].ToString()); //达标月数
-
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数