暂存

Startup.cs

@@ -130,6 +130,7 @@ namespace MySystem
             });
 
             initMainServer();
+            MerchantConfirmService.Instance.Start(); //提交商户进件
         }
 
         //初始化数据结构

Util/HaoDa/AddNewMerchantSetUtil.cs

@@ -2,6 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Aop.Api.Util;
+using GraphQL;
+using Library;
+using LitJson;
 using MySystem;
 using MySystem.Models.Main;
 
@@ -15,7 +19,7 @@ namespace MySystem
         public static AddNewMerchant SetValue(MerchantAddInfo AddInfo)
         {
             AddNewMerchant addNewMerchant = new AddNewMerchant();
-            addNewMerchant.brh = "ceshi"; //机构号
+            addNewMerchant.brh = "030145"; //机构号
             addNewMerchant.mchtNo = AddInfo.SubMchid; //收款商户号
             addNewMerchant.accountNo = AddInfo.AccountNumber; //银行卡号
             addNewMerchant.accountName = AddInfo.AccountName; //开户名（账户名称）
@@ -59,165 +63,262 @@ namespace MySystem
             }
             List<ImageItem> imageList = new List<ImageItem>();
             ImageItem imageItem = new ImageItem();
-            //开户许可证
-            if (!string.IsNullOrEmpty(AddInfo.OpenAccountLicenses))
+            //法人手持身份证正面
+            if (!string.IsNullOrEmpty(AddInfo.PersonWithIdCard))
             {
-                imageItem.name = "openAccountLicenses";
-                imageItem.value = AddInfo.OpenAccountLicenses;
-                imageList.Add(imageItem);
+                var a = AddInfo.PersonWithIdCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/');
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.PersonWithIdCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.PersonWithIdCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.PersonWithIdCard);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "personWithIdCard";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
-            //租赁协议
-            if (!string.IsNullOrEmpty(AddInfo.RentAgreement))
+            if (AddInfo.BankAccountType == "1")
             {
-                imageItem = new ImageItem();
-                imageItem.name = "rentAgreement";
-                imageItem.value = AddInfo.RentAgreement;
-                imageList.Add(imageItem);
+                //收款人银行卡照片
+                if (!string.IsNullOrEmpty(AddInfo.BankCard))
+                {
+                    var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.BankCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                    if (tokenInfo["code"].ToString() == "1")
+                    {
+                        // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.BankCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
+                        var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.BankCard);
+                        if (returnInfo != "false")
+                        {
+                            imageItem = new ImageItem();
+                            imageItem.name = "bankCard";
+                            imageItem.value = returnInfo;
+                            imageList.Add(imageItem);
+                        }
+                    }
+                }
             }
-            //盒伙人商户合影
-            if (!string.IsNullOrEmpty(AddInfo.OperatorMcht))
+            if (AddInfo.BankAccountType == "0")
             {
-                imageItem = new ImageItem();
-                imageItem.name = "operatorMcht";
-                imageItem.value = AddInfo.OperatorMcht;
-                imageList.Add(imageItem);
+                //开户许可证(对公凭证)
+                if (!string.IsNullOrEmpty(AddInfo.OpenAccountLicenses))
+                {
+                    var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.OpenAccountLicenses.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                    if (tokenInfo["code"].ToString() == "1")
+                    {
+                        // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.OpenAccountLicenses.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
+                        var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.OpenAccountLicenses);
+                        if (returnInfo != "false")
+                        {
+                            imageItem.name = "openAccountLicenses";
+                            imageItem.value = returnInfo;
+                            imageList.Add(imageItem);
+                        }
+                    }
+                }
             }
+            // //租赁协议
+            // if (!string.IsNullOrEmpty(AddInfo.RentAgreement))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "rentAgreement";
+            //     imageItem.value = AddInfo.RentAgreement;
+            //     imageList.Add(imageItem);
+            // }
+            // //盒伙人商户合影
+            // if (!string.IsNullOrEmpty(AddInfo.OperatorMcht))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "operatorMcht";
+            //     imageItem.value = AddInfo.OperatorMcht;
+            //     imageList.Add(imageItem);
+            // }
             //营业执照
             if (!string.IsNullOrEmpty(AddInfo.LicenseCopy))
             {
-                imageItem = new ImageItem();
-                imageItem.name = "license";
-                imageItem.value = AddInfo.LicenseCopy;
-                imageList.Add(imageItem);
-            }
-            //委托结算协议
-            if (!string.IsNullOrEmpty(AddInfo.AgentProtocol))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "agentProtocol";
-                imageItem.value = AddInfo.AgentProtocol;
-                imageList.Add(imageItem);
-            }
-            //商户签名图片
-            if (!string.IsNullOrEmpty(AddInfo.SignaturePicture))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "signaturePicture";
-                imageItem.value = AddInfo.SignaturePicture;
-                imageList.Add(imageItem);
-            }
-            //辅助照片
-            if (!string.IsNullOrEmpty(AddInfo.Support))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "support";
-                imageItem.value = AddInfo.Support;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.LicenseCopy.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.LicenseCopy.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.LicenseCopy);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "license";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
+            // if (true)
+            // {
+            //     //委托结算协议
+            //     if (!string.IsNullOrEmpty(AddInfo.AgentProtocol))
+            //     {
+            //         imageItem = new ImageItem();
+            //         imageItem.name = "agentProtocol";
+            //         imageItem.value = AddInfo.AgentProtocol;
+            //         imageList.Add(imageItem);
+            //     }
+            //     //法人手持委托结算协议
+            //     if (!string.IsNullOrEmpty(AddInfo.HoldAgentProtocol))
+            //     {
+            //         imageItem = new ImageItem();
+            //         imageItem.name = "holdAgentProtocol";
+            //         imageItem.value = AddInfo.HoldAgentProtocol;
+            //         imageList.Add(imageItem);
+            //     }
+            //     //被委托人手持身份证
+            //     if (!string.IsNullOrEmpty(AddInfo.AgentCardIdPicture))
+            //     {
+            //         imageItem = new ImageItem();
+            //         imageItem.name = "agentCardIdPicture";
+            //         imageItem.value = AddInfo.AgentCardIdPicture;
+            //         imageList.Add(imageItem);
+            //     }
+            //     //被委托人身份证正面
+            //     if (!string.IsNullOrEmpty(AddInfo.AgentIdCardFront))
+            //     {
+            //         imageItem = new ImageItem();
+            //         imageItem.name = "agentIdCardFront";
+            //         imageItem.value = AddInfo.AgentIdCardFront;
+            //         imageList.Add(imageItem);
+            //     }
+            //     //被委托人身份证反面
+            //     if (!string.IsNullOrEmpty(AddInfo.AgentIdCardBack))
+            //     {
+            //         imageItem = new ImageItem();
+            //         imageItem.name = "agentIdCardBack";
+            //         imageItem.value = AddInfo.AgentIdCardBack;
+            //         imageList.Add(imageItem);
+            //     }
+            // }
+            // //商户签名图片
+            // if (!string.IsNullOrEmpty(AddInfo.SignaturePicture))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "signaturePicture";
+            //     imageItem.value = AddInfo.SignaturePicture;
+            //     imageList.Add(imageItem);
+            // }
+            // //辅助照片
+            // if (!string.IsNullOrEmpty(AddInfo.Support))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "support";
+            //     imageItem.value = AddInfo.Support;
+            //     imageList.Add(imageItem);
+            // }
             //门头照
             if (!string.IsNullOrEmpty(AddInfo.StoreEntrancePic))
             {
-                imageItem = new ImageItem();
-                imageItem.name = "shopFrontImg";
-                imageItem.value = AddInfo.StoreEntrancePic;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.StoreEntrancePic.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.StoreEntrancePic.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.StoreEntrancePic);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "shopFrontImg";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
             //收银台
             if (!string.IsNullOrEmpty(AddInfo.CheckstandImg))
             {
-                imageItem = new ImageItem();
-                imageItem.name = "checkstandImg";
-                imageItem.value = AddInfo.CheckstandImg;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.CheckstandImg.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.CheckstandImg.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.CheckstandImg);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "checkstandImg";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
             //店铺全景
             if (!string.IsNullOrEmpty(AddInfo.IndoorPic))
             {
-                imageItem = new ImageItem();
-                imageItem.name = "shopInnerImg";
-                imageItem.value = AddInfo.IndoorPic;
-                imageList.Add(imageItem);
-            }
-            //商品照片
-            if (!string.IsNullOrEmpty(AddInfo.ProductImg))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "productImg";
-                imageItem.value = AddInfo.ProductImg;
-                imageList.Add(imageItem);
-            }
-            //合同签名
-            if (!string.IsNullOrEmpty(AddInfo.Agreement))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "agreement";
-                imageItem.value = AddInfo.Agreement;
-                imageList.Add(imageItem);
-            }
-            //税务登记证
-            if (!string.IsNullOrEmpty(AddInfo.TaxImage))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "taxImage";
-                imageItem.value = AddInfo.TaxImage;
-                imageList.Add(imageItem);
-            }
-            //组织机构证照片
-            if (!string.IsNullOrEmpty(AddInfo.OrganizationCopy))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "orgImage";
-                imageItem.value = AddInfo.OrganizationCopy;
-                imageList.Add(imageItem);
-            }
-            //行业许可证
-            if (!string.IsNullOrEmpty(AddInfo.IndustryLicense1))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "industryLicense1";
-                imageItem.value = AddInfo.IndustryLicense1;
-                imageList.Add(imageItem);
-            }
-            //正面人像图片
-            if (!string.IsNullOrEmpty(AddInfo.FaceRecognition))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "faceRecognition";
-                imageItem.value = AddInfo.FaceRecognition;
-                imageList.Add(imageItem);
-            }
-            //补充资料
-            if (!string.IsNullOrEmpty(AddInfo.Extra1))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "extra1";
-                imageItem.value = AddInfo.Extra1;
-                imageList.Add(imageItem);
-            }
-            //收款人银行卡照片
-            if (!string.IsNullOrEmpty(AddInfo.BankCard))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "bankCard";
-                imageItem.value = AddInfo.BankCard;
-                imageList.Add(imageItem);
-            }
-            //法人手持身份证正面
-            if (!string.IsNullOrEmpty(AddInfo.PersonWithIdCard))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "personWithIdCard";
-                imageItem.value = AddInfo.PersonWithIdCard;
-                imageList.Add(imageItem);
-            }
-            //对公凭证
-            if (!string.IsNullOrEmpty(AddInfo.TakeCreditCard))
-            {
-                imageItem = new ImageItem();
-                imageItem.name = "takeCreditCard";
-                imageItem.value = AddInfo.TakeCreditCard;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IndoorPic.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.IndoorPic.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.IndoorPic);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "shopInnerImg";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
+            // //商品照片
+            // if (!string.IsNullOrEmpty(AddInfo.ProductImg))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "productImg";
+            //     imageItem.value = AddInfo.ProductImg;
+            //     imageList.Add(imageItem);
+            // }
+            // //合同签名
+            // if (!string.IsNullOrEmpty(AddInfo.Agreement))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "agreement";
+            //     imageItem.value = AddInfo.Agreement;
+            //     imageList.Add(imageItem);
+            // }
+            // //税务登记证
+            // if (!string.IsNullOrEmpty(AddInfo.TaxImage))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "taxImage";
+            //     imageItem.value = AddInfo.TaxImage;
+            //     imageList.Add(imageItem);
+            // }
+            // //组织机构证照片
+            // if (!string.IsNullOrEmpty(AddInfo.OrganizationCopy))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "orgImage";
+            //     imageItem.value = AddInfo.OrganizationCopy;
+            //     imageList.Add(imageItem);
+            // }
+            // //行业许可证
+            // if (!string.IsNullOrEmpty(AddInfo.IndustryLicense1))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "industryLicense1";
+            //     imageItem.value = AddInfo.IndustryLicense1;
+            //     imageList.Add(imageItem);
+            // }
+            // //正面人像图片
+            // if (!string.IsNullOrEmpty(AddInfo.FaceRecognition))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "faceRecognition";
+            //     imageItem.value = AddInfo.FaceRecognition;
+            //     imageList.Add(imageItem);
+            // }
+            // //补充资料
+            // if (!string.IsNullOrEmpty(AddInfo.Extra1))
+            // {
+            //     imageItem = new ImageItem();
+            //     imageItem.name = "extra1";
+            //     imageItem.value = AddInfo.Extra1;
+            //     imageList.Add(imageItem);
+            // }
             addNewMerchant.images = imageList; //图片
             return addNewMerchant;
         }

Util/HaoDa/CheckWeChatSignService.cs

@@ -50,7 +50,7 @@ namespace MySystem
             {
                 var mId = int.Parse(query.MerchantId);
                 WebCMSEntities db = new WebCMSEntities();
-                var returnInfo = HaoDaHelper.Instance.QueryMerchantStatus("000",query.MerchantNo);
+                var returnInfo = HaoDaHelper.Instance.QueryMerchantStatus("030145",query.MerchantNo);
                 JsonData dic = JsonMapper.ToObject(returnInfo);
                 if (dic["code"].ToString() == "4")
                 {

Util/HaoDa/HaoDaHelper.cs

@@ -8,6 +8,7 @@ using Library;
 using System.Net;
 using System.IO;
 using Aop.Api.Util;
+using LitJson;
 
 namespace MySystem
 {
@@ -22,18 +23,18 @@ namespace MySystem
         #region 盒易付
 
         //测试环境
-        // string BoxRequestUrl = "https://openapi-test.iboxpay.com/api";
-        // string BoxAppId = "8840021411446784";
-        // string BoxAppSecret = "xgwGnmYGjVy0GOWOWkQtRk8Hk8ur5tCV";
-        // string BoxPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjMQxp24mjxDTr13uPW0y+tiO1yXFGw7P/pPQ0oZKK7F6KstEaus7pLEywBZ5XRXE5jgkhR2TS7Ne7djJfbpn5yFc6pPlz3ZsOfBVeB88NEwhx6xzCGX2eqSSkO33n8w2G0xc2ss5HpYBarT00NBZWhrwOXpdRPYLOYHKVU3Rl+FA9xDw/wYfoWvrr+JSfHRGn/ENMmQFEdckAbPauKaQMrZD2kz+PRrhq56eWnCuVQPcaz/jroVT8qQEgkg2IsNy+DwfLOIqm8IySEpxnQ5wN/KvsQJc2wXDQNf9F5kvWwjoqSSP0qJS+oPRXET+zJb+WTk2y5M6AYoC9NodwsC4NwIDAQAB";
-        // string BrhCode = "039001";
+        string BoxRequestUrl = "https://openapi-test.iboxpay.com";
+        string BoxAppId = "AT7317781468267548672";
+        string BoxAppSecret = "OfWuHQdhQfnE8NaF4xdtgk4B9CYqnbri";
+        string BoxPublicKey = "";
+        string BrhCode = "001040";
 
         //生产环境
-        string BoxRequestUrl = "https://openapi.iboxpay.com/api";
-        string BoxAppId = "AP5879017839106039808";
-        string BoxAppSecret = "DGtftIyl6R3nzwPr5YuV5fnmkfwufXRj";
-        string BoxPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmjoQirIYZBD9Qon2HkF4j/NAINXtJ7Lzq/WXxTF7t7mg7LNARt0+ZZaeWx8caq2fv5zdsGyyoInL23cBtDI5KmFfK69iA0ygQMK0WbiKqsUB1OpPbT3+9zLuadIJAznjA223lY6CIjTpdLZhaRjImNVqc60bdkx6YsQcA+xW+3r1JH4PPHb7yBEbkKIX8OhyX7U4p0TkbDkAobbjHr5YB9gmYLoSFJMOPfTtSExkv7/Y7IVR9poZAHcr3teFoAiXW3RzxelRtnXxIkl/6AUOKoL5fhr/UTUN+Q18uzNljYWr6SwnTI3EmtzgykaewWtZvV85Xdhe/BjiQ5Xor7YbwIDAQAB";
-        string BrhCode = "039034";
+        // string BoxRequestUrl = "";
+        // string BoxAppId = "";
+        // string BoxAppSecret = "";
+        // string BoxPublicKey = "";
+        // string BrhCode = "";
 
 
         /// <summary>
@@ -327,9 +328,9 @@ namespace MySystem
             string ret = string.Empty;
             try
             {
-                function.WriteLog(DateTime.Now.ToString(), "请求开店宝API日志");
-                function.WriteLog(postUrl, "请求开店宝API日志");
-                function.WriteLog(paramData, "请求开店宝API日志");
+                function.WriteLog(DateTime.Now.ToString(), "请求好哒API日志");
+                function.WriteLog(postUrl, "请求好哒API日志");
+                function.WriteLog(paramData, "请求好哒API日志");
                 byte[] postData = System.Text.Encoding.UTF8.GetBytes(paramData);
                 // 设置提交的相关参数 
                 System.Net.HttpWebRequest request = System.Net.WebRequest.Create(postUrl) as System.Net.HttpWebRequest;
@@ -360,7 +361,7 @@ namespace MySystem
                 srcString = reader.ReadToEnd();
                 ret = srcString;   //返回值赋值
                 reader.Close();
-                function.WriteLog(srcString, "请求开店宝API日志");
+                function.WriteLog(srcString, "请求好哒API日志");
             }
             catch (System.Net.WebException ex)
             {
@@ -374,7 +375,7 @@ namespace MySystem
             catch (Exception ex)
             {
                 ret = "fail";
-                function.WriteLog(DateTime.Now.ToString() + "\r\n" + ex.ToString(), "请求开店宝API异常");
+                function.WriteLog(DateTime.Now.ToString() + "\r\n" + ex.ToString(), "请求好哒API异常");
             }
             return ret;
         }
@@ -518,6 +519,31 @@ namespace MySystem
             return result.ToString();
         }
 
+
+        /// <summary>
+        /// 获取好哒开放平台文件名
+        /// </summary>
+        /// <param name="token">上传图片凭证token</param>
+        /// <param name="value">图片路径</param>
+        /// <returns></returns>
+        public string ReturnFileName(string token, string value)
+        {
+            Dictionary<string, string> file = new Dictionary<string, string>();
+            file.Add("fileName", value.Substring(value.LastIndexOf("/")).Trim('/'));
+            FileItem item = new FileItem(function.getPath(value.Split(',')[0]));
+            Dictionary<string, FileItem> files = new Dictionary<string, FileItem>();
+            files.Add("file", item);
+            var upLoadInfo = JsonMapper.ToObject(HaoDaHelper.Instance.DoPost(BoxRequestUrl +"/api/file/v1/upload_file", token, file, files, "utf-8"));
+            if (upLoadInfo["code"].ToString() == "1")
+            {
+                return upLoadInfo["data"]["fileName"].ToString();
+            }
+            else
+            {
+                return "false";
+            }
+        }
+
         #endregion
 
     }

Util/HaoDa/MerchantConfirmService.cs

@@ -26,24 +26,25 @@ namespace MySystem
         {
             while (true)
             {
-                string content = RedisDbconn.Instance.RPop<string>("MerchantConfirmQueue");
-                if (!string.IsNullOrEmpty(content))
-                {                    
-                    try
-                    {
-                        JsonData jsonObj = JsonMapper.ToObject(content);
-                        int MerchantId = int.Parse(jsonObj["MerchantId"].ToString());
-                        StartDo(MerchantId);
-                    }
-                    catch (Exception ex)
-                    {
-                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "好哒商户进件异常");
-                    }
-                }
-                else
-                {
-                    Thread.Sleep(2000);
-                }
+                // string content = RedisDbconn.Instance.RPop<string>("MerchantConfirmQueue");
+                // if (!string.IsNullOrEmpty(content))
+                // {
+                //     try
+                //     {
+                //         JsonData jsonObj = JsonMapper.ToObject(content);
+                //         int MerchantId = int.Parse(jsonObj["MerchantId"].ToString());
+                //         StartDo(MerchantId);
+                //     }
+                //     catch (Exception ex)
+                //     {
+                //         function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "好哒商户进件异常");
+                //     }
+                // }
+                // else
+                // {
+                //     Thread.Sleep(2000);
+                // }
+                StartDo(1);
             }
         }
 
@@ -56,7 +57,7 @@ namespace MySystem
             {
                 string BusinessCode = AddInfo.BusinessCode;
                 if (string.IsNullOrEmpty(BusinessCode))
-                { 
+                {
                     BusinessCode = "LKB" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(5);
                     AddInfo.BusinessCode = BusinessCode;
                 }
@@ -85,7 +86,7 @@ namespace MySystem
                     var info = AddNewMerchantSetUtil.SetValue(AddInfo);
                     string result = HaoDaHelper.Instance.AddNewMerchant(info);
                     JsonData jsonObj = JsonMapper.ToObject(result);
-                    if ( jsonObj["resultCode"].ToString()=="0")
+                    if (jsonObj["resultCode"].ToString() == "0")
                     {
 
                         AddInfo.WeChatRemark = "";