DuGuYang 1 year ago
parent
commit
1fffc7d61a

+ 0 - 4
Controllers/HomeController.cs

@@ -19,9 +19,5 @@ namespace MySystem.Controllers
             _logger = logger;
         }
 
-        public IActionResult Index()
-        {
-            return View();
-        }
     }
 }

+ 1 - 0
Entity/HaoDa/AddNewMerchant.cs

@@ -14,6 +14,7 @@ namespace MySystem
         public string accountName { get; set; }//开户名(账户名称)
         public string accountType { get; set; }//账户类型 1 对私 0 对公
         public string zbankNo { get; set; }//开户银行支行号 参考支行号表(联系对接人提供)
+        public string zbankName = "四川省农村信用社联合社";//开户银行支行号 参考支行号表(联系对接人提供)
         public string zbankRegionCode { get; set; }//开户银行支行区域码 参考区域码表(联系对接人提供)
         public string openBankAccName { get; set; }//开户许可证-开户名 企业商户必填(个体工商户对私不填)
         public string openBankAccout { get; set; }//开户许可证-银行卡号 企业商户必填(个体工商户对私不填)

+ 1 - 0
Startup.cs

@@ -132,6 +132,7 @@ namespace MySystem
             initMainServer();
             MerchantConfirmService.Instance.Start(); //提交商户进件
             CheckWeChatSignService.Instance.Start(); //查询商户审核状态
+            TestOpenDivideAccountsService.Instance.Start(); //添加分账接收方账户
         }
 
         //初始化数据结构

+ 26 - 14
Util/HaoDa/AddNewMerchantSetUtil.cs

@@ -27,7 +27,14 @@ namespace MySystem
                 addNewMerchant.mchtNo = AddInfo.MchtNo; //收款商户号
             }
             addNewMerchant.accountNo = AddInfo.AccountNumber; //银行卡号
-            addNewMerchant.accountName = AddInfo.AccountName; //开户名(账户名称)
+            if (AddInfo.AccountType == "1")
+            {
+                addNewMerchant.accountName = AddInfo.CertLegalPerson; //开户名(账户名称)
+            }
+            else
+            {
+                addNewMerchant.accountName = AddInfo.AccountName; //开户名(账户名称)
+            }
             addNewMerchant.accountType = AddInfo.AccountType; //账户类型 1 对私 0 对公
             addNewMerchant.zbankNo = AddInfo.ZbankNo; //开户银行支行号 参考支行号表(联系对接人提供)
             addNewMerchant.zbankRegionCode = AddInfo.ZbankRegionCode; //开户银行支行区域码 参考区域码表(联系对接人提供)
@@ -79,7 +86,6 @@ namespace MySystem
             //法人手持身份证正面
             if (!string.IsNullOrEmpty(AddInfo.PersonWithIdCard))
             {
-                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")
                 {
@@ -115,7 +121,6 @@ namespace MySystem
             //身份证正面
             if (!string.IsNullOrEmpty(AddInfo.IdCardCopy))
             {
-                var a = AddInfo.IdCardCopy.Substring(AddInfo.IdCardCopy.LastIndexOf("/")).Trim('/');
                 var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IdCardCopy.Substring(AddInfo.IdCardCopy.LastIndexOf("/")).Trim('/'), "0"));
                 if (tokenInfo["code"].ToString() == "1")
                 {
@@ -132,7 +137,6 @@ namespace MySystem
             //身份证反面
             if (!string.IsNullOrEmpty(AddInfo.IdCardNational))
             {
-                var a = AddInfo.IdCardNational.Substring(AddInfo.IdCardNational.LastIndexOf("/")).Trim('/');
                 var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IdCardNational.Substring(AddInfo.IdCardNational.LastIndexOf("/")).Trim('/'), "0"));
                 if (tokenInfo["code"].ToString() == "1")
                 {
@@ -157,6 +161,7 @@ namespace MySystem
                         var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.OpenAccountLicenses);
                         if (returnInfo != "false")
                         {
+                            imageItem = new ImageItem();
                             imageItem.name = "openAccountLicenses";
                             imageItem.value = returnInfo;
                             imageList.Add(imageItem);
@@ -183,10 +188,9 @@ namespace MySystem
             //营业执照
             if (!string.IsNullOrEmpty(AddInfo.LicenseCopy))
             {
-                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.LicenseCopy.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.LicenseCopy.Substring(AddInfo.LicenseCopy.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")
                     {
@@ -352,14 +356,22 @@ namespace MySystem
             //     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.Extra1))
+            {
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.Extra1.Substring(AddInfo.Extra1.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.Extra1);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "extra1";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
+            }
             addNewMerchant.images = imageList; //图片
             return addNewMerchant;
         }

+ 146 - 64
Util/HaoDa/AddOpenDivideAccountsUtil.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using LitJson;
 using MySystem;
 using MySystem.Models.Main;
 
@@ -15,88 +16,169 @@ namespace MySystem
         public static AddOpenDivideAccounts AddValue(MerchantAddInfo AddInfo)
         {
             AddOpenDivideAccounts addOpenDivideAccounts = new AddOpenDivideAccounts();
-            addOpenDivideAccounts.acctNo=""; //非必须 用户编码(创建分账接收方失败或者审核驳回时,修改信息时填写)
-            if (AddInfo.SubjectType == "0")//0-企业法人营业执照 1-个体工商户营业执照
-            {
-                addOpenDivideAccounts.userType = "1"; //必须 用户类型 1-企业,2-个人
-                addOpenDivideAccounts.userName = AddInfo.CertLegalPerson; //必须 用户名,个人填写身份证姓名,企业填写法人姓名
-                addOpenDivideAccounts.compName = ""; //企业必须 企业名称
-            }
-            if (AddInfo.SubjectType == "1")
-            {
-                addOpenDivideAccounts.userType = "2"; //必须 用户类型 1-企业,2-个人
-                addOpenDivideAccounts.userName = AddInfo.CertMerchantName; //必须 用户名,个人填写身份证姓名,企业填写法人姓名
-            }
+
+            // addOpenDivideAccounts.acctNo = ""; //非必须 用户编码(创建分账接收方失败或者审核驳回时,修改信息时填写)
+            addOpenDivideAccounts.userType = "1"; //必须 用户类型 1-企业,2-个人
+            addOpenDivideAccounts.userName = "蒲晓敏"; //必须 用户名,个人填写身份证姓名,企业填写法人姓名
+            addOpenDivideAccounts.compName = "四川省润观米科技有限公司"; //企业必须 企业名称
             // addOpenDivideAccounts.mobile=""; //非必须 手机号
             addOpenDivideAccounts.legalCertType = "1"; //必须 法人证明类型 1身份证 2护照 3港澳台居民通行证(废弃不用)4外国人永久居留证 5香港来往内地通行证 6澳门来往内地通行证 7台湾同胞来往内地通行证
-            addOpenDivideAccounts.userCardNo = AddInfo.IdCardNumber; //必须 身份证号
-            addOpenDivideAccounts.userCardStartDate = AddInfo.CardPeriodBegin.Value.ToString("yyyyMMdd"); //必须 法人证件开始日期
-            addOpenDivideAccounts.userCardEndDate = AddInfo.CardPeriodEnd.Value.ToString("yyyyMMdd"); //必须 法人证件结束日期
-            addOpenDivideAccounts.acctNm = AddInfo.AccountName; //必须 账户名称
-            addOpenDivideAccounts.acctType = AddInfo.BankAccountType; //必须 账户类型(0-对公、1-对私)
-            addOpenDivideAccounts.bankCardNo = AddInfo.AccountNumber; //必须 银行卡号
-            addOpenDivideAccounts.acctBankNo=""; //必须 总行行号
-            addOpenDivideAccounts.acctBankNm=""; //必须 总行名称
-            addOpenDivideAccounts.acctZbankNo = AddInfo.BankBranchId; //必须 支行行号
-            addOpenDivideAccounts.acctZbankNm=""; //必须 支行名称
-            addOpenDivideAccounts.acctZbankCode = AddInfo.BankAddressCode; //必须 开户支行地区码
+            addOpenDivideAccounts.userCardNo = "511304198607137628"; //必须 身份证号
+            addOpenDivideAccounts.userCardStartDate = "20150302"; //必须 法人证件开始日期
+            addOpenDivideAccounts.userCardEndDate = "20350302"; //必须 法人证件结束日期
+            addOpenDivideAccounts.acctNm = "四川省润观米科技有限公司"; //必须 账户名称
+            addOpenDivideAccounts.acctType = "0"; //必须 账户类型(0-对公、1-对私)
+            addOpenDivideAccounts.bankCardNo = "11360000000324886"; //必须 银行卡号
+            addOpenDivideAccounts.acctBankNo = "304100040000"; //必须 总行行号
+            addOpenDivideAccounts.acctBankNm = "华夏银行"; //必须 总行名称
+            addOpenDivideAccounts.acctZbankNo = "304651010227"; //必须 支行行号
+            addOpenDivideAccounts.acctZbankNm = "夏银行股份有限公司成都天府支行"; //必须 支行名称
+            addOpenDivideAccounts.acctZbankCode = "510122"; //必须 开户支行地区码
             // addOpenDivideAccounts.reservedPhone=""; //非必须 预留手机号。个人和企业对私必填
-            addOpenDivideAccounts.licNo = AddInfo.LicenseNumber; //企业必须 营业执照号
-            addOpenDivideAccounts.licStartDate = AddInfo.PeriodBegin.Value.ToString("yyyyMMdd"); //企业必须 营业执照开始日期
-            addOpenDivideAccounts.licEndDate = AddInfo.PeriodEnd.Value.ToString("yyyyMMdd"); //企业必须 营业执照结束日期
-            addOpenDivideAccounts.businessAddressCode = AddInfo.BizAddressCode; //企业必须 企业经营地区码
-            addOpenDivideAccounts.businessAddress = AddInfo.BizStoreAddress; //企业必须 企业经营详细地址
-            addOpenDivideAccounts.regAddressCode=""; //企业必须 企业注册地址地区码
-            addOpenDivideAccounts.regAddress=""; //企业必须 企业注册详细地址
+            addOpenDivideAccounts.licNo = "91510106MA6C7RRTXR"; //企业必须 营业执照号
+            addOpenDivideAccounts.licStartDate = "20171212"; //企业必须 营业执照开始日期
+            addOpenDivideAccounts.licEndDate = "长期"; //企业必须 营业执照结束日期
+            addOpenDivideAccounts.businessAddressCode = "510106"; //企业必须 企业经营地区码
+            addOpenDivideAccounts.businessAddress = "四川省成都市金牛区星辉西路9号1栋7层11号"; //企业必须 企业经营详细地址
+            addOpenDivideAccounts.regAddressCode = "510106"; //企业必须 企业注册地址地区码
+            addOpenDivideAccounts.regAddress = "四川省成都市金牛区星辉西路9号1栋7层11号"; //企业必须 企业注册详细地址
             // addOpenDivideAccounts.compTel=""; //非必须 固定电话
-            addOpenDivideAccounts.businessMcc = AddInfo.SalesScenesType; //企业必须 经营范围mcc
+            addOpenDivideAccounts.businessMcc = "软件开发;技术推广服务;信息系统集成服务;企业营销策划;广告设计、制作、代理、发布;组织策划文化交流活动;销售:电子产品、办公用品、生活日用品。"; //企业必须 经营范围mcc
+
+            // addOpenDivideAccounts.acctNo = ""; //非必须 用户编码(创建分账接收方失败或者审核驳回时,修改信息时填写)
+            // if (AddInfo.LicenceType == "0")//0-企业法人营业执照 1-个体工商户营业执照
+            // {
+            //     addOpenDivideAccounts.userType = "1"; //必须 用户类型 1-企业,2-个人
+            //     addOpenDivideAccounts.userName = AddInfo.CertLegalPerson; //必须 用户名,个人填写身份证姓名,企业填写法人姓名
+            //     addOpenDivideAccounts.compName = ""; //企业必须 企业名称
+            // }
+            // if (AddInfo.LicenceType == "1")
+            // {
+            //     addOpenDivideAccounts.userType = "2"; //必须 用户类型 1-企业,2-个人
+            //     addOpenDivideAccounts.userName = AddInfo.CertMerchantName; //必须 用户名,个人填写身份证姓名,企业填写法人姓名
+            // }
+            // // addOpenDivideAccounts.mobile=""; //非必须 手机号
+            // addOpenDivideAccounts.legalCertType = "1"; //必须 法人证明类型 1身份证 2护照 3港澳台居民通行证(废弃不用)4外国人永久居留证 5香港来往内地通行证 6澳门来往内地通行证 7台湾同胞来往内地通行证
+            // addOpenDivideAccounts.userCardNo = AddInfo.IdCardNumber; //必须 身份证号
+            // addOpenDivideAccounts.userCardStartDate = AddInfo.CardPeriodBegin.Value.ToString("yyyyMMdd"); //必须 法人证件开始日期
+            // addOpenDivideAccounts.userCardEndDate = AddInfo.CardPeriodEnd.Value.ToString("yyyyMMdd"); //必须 法人证件结束日期
+            // addOpenDivideAccounts.acctNm = AddInfo.AccountName; //必须 账户名称
+            // addOpenDivideAccounts.acctType = AddInfo.BankAccountType; //必须 账户类型(0-对公、1-对私)
+            // addOpenDivideAccounts.bankCardNo = AddInfo.AccountNumber; //必须 银行卡号
+            // addOpenDivideAccounts.acctBankNo = ""; //必须 总行行号
+            // addOpenDivideAccounts.acctBankNm = ""; //必须 总行名称
+            // addOpenDivideAccounts.acctZbankNo = AddInfo.BankBranchId; //必须 支行行号
+            // addOpenDivideAccounts.acctZbankNm = ""; //必须 支行名称
+            // addOpenDivideAccounts.acctZbankCode = AddInfo.BankAddressCode; //必须 开户支行地区码
+            // // addOpenDivideAccounts.reservedPhone=""; //非必须 预留手机号。个人和企业对私必填
+            // addOpenDivideAccounts.licNo = AddInfo.LicenseNumber; //企业必须 营业执照号
+            // addOpenDivideAccounts.licStartDate = AddInfo.PeriodBegin.Value.ToString("yyyyMMdd"); //企业必须 营业执照开始日期
+            // addOpenDivideAccounts.licEndDate = AddInfo.PeriodEnd.Value.ToString("yyyyMMdd"); //企业必须 营业执照结束日期
+            // addOpenDivideAccounts.businessAddressCode = AddInfo.BizAddressCode; //企业必须 企业经营地区码
+            // addOpenDivideAccounts.businessAddress = AddInfo.BizStoreAddress; //企业必须 企业经营详细地址
+            // addOpenDivideAccounts.regAddressCode = ""; //企业必须 企业注册地址地区码
+            // addOpenDivideAccounts.regAddress = ""; //企业必须 企业注册详细地址
+            // // addOpenDivideAccounts.compTel=""; //非必须 固定电话
+            // addOpenDivideAccounts.businessMcc = AddInfo.SalesScenesType; //企业必须 经营范围mcc
             List<ImageItem> imageList = new List<ImageItem>();
             ImageItem imageItem = new ImageItem();
-            //开户许可证
-            if(!string.IsNullOrEmpty(AddInfo.StoreEntrancePic))
+            //身份证正面
+            if (!string.IsNullOrEmpty(AddInfo.IdCardCopy))
             {
-                imageItem.name = "openAccountLicenses";
-                imageItem.value = AddInfo.OpenAccountLicenses;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IdCardCopy.Substring(AddInfo.IdCardCopy.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.IdCardCopy);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "idCardFront";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
-            //租赁协议
-            if(!string.IsNullOrEmpty(AddInfo.StoreEntrancePic))
+            //身份证反面
+            if (!string.IsNullOrEmpty(AddInfo.IdCardNational))
             {
-                imageItem = new ImageItem();
-                imageItem.name = "rentAgreement";
-                imageItem.value = AddInfo.RentAgreement;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IdCardNational.Substring(AddInfo.IdCardNational.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.IdCardNational);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "idCardBack";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
-            //开户许可证
-            if(!string.IsNullOrEmpty(AddInfo.StoreEntrancePic))
+            //法人手持身份证正面
+            if (!string.IsNullOrEmpty(AddInfo.PersonWithIdCard))
             {
-                imageItem.name = "openAccountLicenses";
-                imageItem.value = AddInfo.OpenAccountLicenses;
-                imageList.Add(imageItem);
+                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);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "personWithIdCard";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
-            //租赁协议
-            if(!string.IsNullOrEmpty(AddInfo.StoreEntrancePic))
+            //收款人银行卡照片
+            if (!string.IsNullOrEmpty(AddInfo.BankCard))
             {
-                imageItem = new ImageItem();
-                imageItem.name = "rentAgreement";
-                imageItem.value = AddInfo.RentAgreement;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.BankCard.Substring(AddInfo.BankCard.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    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.StoreEntrancePic))
+            //营业执照
+            if (!string.IsNullOrEmpty(AddInfo.LicenseCopy))
             {
-                imageItem.name = "openAccountLicenses";
-                imageItem.value = AddInfo.OpenAccountLicenses;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.LicenseCopy.Substring(AddInfo.LicenseCopy.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    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(!string.IsNullOrEmpty(AddInfo.StoreEntrancePic))
+            //开户许可证(对公凭证)
+            if (!string.IsNullOrEmpty(AddInfo.OpenAccountLicenses))
             {
-                imageItem = new ImageItem();
-                imageItem.name = "rentAgreement";
-                imageItem.value = AddInfo.RentAgreement;
-                imageList.Add(imageItem);
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.OpenAccountLicenses.Substring(AddInfo.OpenAccountLicenses.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.OpenAccountLicenses);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "openAccountLicenses";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
             }
+
             addOpenDivideAccounts.images = imageList; //图片
             return addOpenDivideAccounts;
         }

+ 4 - 2
Util/HaoDa/CheckWeChatSignService.cs

@@ -58,8 +58,10 @@ namespace MySystem
                     if (merchantadd != null)
                     {
                         merchantadd.Status = 1;
-                        merchantadd.AlipayPid = dic["storeNo"].ToString();
-                        merchantadd.AlipayAuthToken = dic["outMchtNo"].ToString();
+                        // merchantadd.AlipayPid = dic["storeNo"].ToString();
+                        // merchantadd.AlipayAuthToken = dic["outMchtNo"].ToString();
+                        merchantadd.SeoKeyword = dic["storeNo"].ToString();
+                        merchantadd.SeoDescription = dic["outMchtNo"].ToString();
                         MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == mId);
                         if (merchant != null)
                         {

+ 12 - 12
Util/HaoDa/HaoDaHelper.cs

@@ -120,8 +120,8 @@ namespace MySystem
             string head = Newtonsoft.Json.JsonConvert.SerializeObject(headdic);
             function.WriteLog("请求头\n" + head, "好哒微信公众号和小程序支付");
             function.WriteLog("请求参数\n" + req, "好哒微信公众号和小程序支付");
-            function.WriteLog("请求地址:" + BoxRequestUrl + "/hzg/v2/unitedtrade/wechat_js_pay", "好哒微信公众号和小程序支付");
-            string result = PostWebRequest(BoxRequestUrl + "/hzg/v2/unitedtrade/wechat_js_pay", req, headdic);
+            function.WriteLog("请求地址:" + BoxRequestUrl + "/api/hzg/v2/unitedtrade/wechat_js_pay", "好哒微信公众号和小程序支付");
+            string result = PostWebRequest(BoxRequestUrl + "/api/hzg/v2/unitedtrade/wechat_js_pay", req, headdic);
             function.WriteLog("返回\n" + result + "\n\n", "好哒微信公众号和小程序支付");
 
             return result;
@@ -156,8 +156,8 @@ namespace MySystem
             string head = Newtonsoft.Json.JsonConvert.SerializeObject(headdic);
             function.WriteLog("请求头\n" + head, "好哒支付宝服务窗支付");
             function.WriteLog("请求参数\n" + req, "好哒支付宝服务窗支付");
-            function.WriteLog("请求地址:" + BoxRequestUrl + "/hzg/v2/unitedtrade/wechat_js_pay", "好哒支付宝服务窗支付");
-            string result = PostWebRequest(BoxRequestUrl + "/hzg/v2/unitedtrade/wechat_js_pay", req, headdic);
+            function.WriteLog("请求地址:" + BoxRequestUrl + "/api/hzg/v2/unitedtrade/wechat_js_pay", "好哒支付宝服务窗支付");
+            string result = PostWebRequest(BoxRequestUrl + "/api/hzg/v2/unitedtrade/wechat_js_pay", req, headdic);
             function.WriteLog("返回\n" + result + "\n\n", "好哒支付宝服务窗支付");
 
             return result;
@@ -189,8 +189,8 @@ namespace MySystem
             string head = Newtonsoft.Json.JsonConvert.SerializeObject(headdic);
             function.WriteLog("请求头\n" + head, "好哒聚合支付退款");
             function.WriteLog("请求参数\n" + req, "好哒聚合支付退款");
-            function.WriteLog("请求地址:" + BoxRequestUrl + "/hzg/v2/unitedtrade/refund", "好哒聚合支付退款");
-            string result = PostWebRequest(BoxRequestUrl + "/hzg/v2/unitedtrade/refund", req, headdic);
+            function.WriteLog("请求地址:" + BoxRequestUrl + "/api/hzg/v2/unitedtrade/refund", "好哒聚合支付退款");
+            string result = PostWebRequest(BoxRequestUrl + "/api/hzg/v2/unitedtrade/refund", req, headdic);
             function.WriteLog("返回\n" + result + "\n\n", "好哒聚合支付退款");
 
             return result;
@@ -216,8 +216,8 @@ namespace MySystem
             string head = Newtonsoft.Json.JsonConvert.SerializeObject(headdic);
             function.WriteLog("请求头\n" + head, "好哒开通分账");
             function.WriteLog("请求参数\n" + req, "好哒开通分账");
-            function.WriteLog("请求地址:" + BoxRequestUrl + "/v3/hzg/part/mcht/reg", "好哒开通分账");
-            string result = PostWebRequest(BoxRequestUrl + "/v3/hzg/part/mcht/reg", req, headdic);
+            function.WriteLog("请求地址:" + BoxRequestUrl + "/api/v3/hzg/part/mcht/reg", "好哒开通分账");
+            string result = PostWebRequest(BoxRequestUrl + "/api/v3/hzg/part/mcht/reg", req, headdic);
             function.WriteLog("返回\n" + result + "\n\n", "好哒开通分账");
 
             return result;
@@ -238,8 +238,8 @@ namespace MySystem
             string head = Newtonsoft.Json.JsonConvert.SerializeObject(headdic);
             function.WriteLog("请求头\n" + head, "好哒添加分账接收方账户");
             function.WriteLog("请求参数\n" + req, "好哒添加分账接收方账户");
-            function.WriteLog("请求地址:" + BoxRequestUrl + "/api/inst/mcht/new_create_mcht", "好哒添加分账接收方账户");
-            string result = PostWebRequest(BoxRequestUrl + "/api/inst/mcht/new_create_mcht", req, headdic);
+            function.WriteLog("请求地址:" + BoxRequestUrl + "/api/v3/hzg/part/acct/register", "好哒添加分账接收方账户");
+            string result = PostWebRequest(BoxRequestUrl + "/api/v3/hzg/part/acct/register", req, headdic);
             function.WriteLog("返回\n" + result + "\n\n", "好哒添加分账接收方账户");
 
             return result;
@@ -260,8 +260,8 @@ namespace MySystem
             string head = Newtonsoft.Json.JsonConvert.SerializeObject(headdic);
             function.WriteLog("请求头\n" + head, "好哒订单分账申请");
             function.WriteLog("请求参数\n" + req, "好哒订单分账申请");
-            function.WriteLog("请求地址:" + BoxRequestUrl + "/api/inst/mcht/new_create_mcht", "好哒订单分账申请");
-            string result = PostWebRequest(BoxRequestUrl + "/api/inst/mcht/new_create_mcht", req, headdic);
+            function.WriteLog("请求地址:" + BoxRequestUrl + "/api/v3/hzg/part/order/apply", "好哒订单分账申请");
+            string result = PostWebRequest(BoxRequestUrl + "/api/v3/hzg/part/order/apply", req, headdic);
             function.WriteLog("返回\n" + result + "\n\n", "好哒订单分账申请");
 
             return result;

+ 1 - 1
Util/HaoDa/MerchantConfirmService.cs

@@ -45,7 +45,7 @@ namespace MySystem
             //         Thread.Sleep(2000);
             //     }
             // }
-            StartDo(1);
+            StartDo(580);
         }
 
         public void StartDo(int MerchantId)

+ 48 - 0
Util/HaoDa/TestOpenDivideAccountsService.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using MySystem.Models.Main;
+using Library;
+using LitJson;
+using System.Threading;
+
+namespace MySystem
+{
+    public class TestOpenDivideAccountsService
+    {
+        public readonly static TestOpenDivideAccountsService Instance = new TestOpenDivideAccountsService();
+        private TestOpenDivideAccountsService()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(StartListen);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void StartListen()
+        {
+            // StartDo(1);
+            StartDos(580);
+        }
+
+        public void StartDo(int MerchantId)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantAddInfo AddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == MerchantId);
+            var info = AddOpenDivideAccountsUtil.AddValue(AddInfo);
+            string result = HaoDaHelper.Instance.AddOpenDivideAccounts(info);
+            db.Dispose();
+        }
+
+        public void StartDos(int MerchantId)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantAddInfo AddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == MerchantId);
+            string result = HaoDaHelper.Instance.OpenDivideAccounts(AddInfo.SeoKeyword,AddInfo.SeoDescription);
+            db.Dispose();
+        }
+    }
+}

+ 0 - 1
Views/Home/Index.cshtml

@@ -1 +0,0 @@
-<h2>云木科技</h2>