DuGuYang 1 year ago
parent
commit
19e38b988f
3 changed files with 55 additions and 45 deletions
  1. 29 29
      Startup.cs
  2. 10 10
      Util/HaoDa/TestChangeMerchantCardSetUtil.cs
  3. 16 6
      Util/HaoDa/TestHaoDaService.cs

+ 29 - 29
Startup.cs

@@ -140,37 +140,37 @@ namespace MySystem
                 TestHaoDaService.Instance.Start(); //好哒测试
                 // MerchantStandardService.Instance.Start();
             }
-            if(Library.ConfigurationManager.EnvironmentFlag == 2)
-            {
-                MerchantConfirmService.Instance.Start(); //提交商户进件
-                CheckWeChatSignService.Instance.Start(); //查询商户审核状态
-                CheckWeChatBindService.Instance.Start(); //执行好哒微信绑定appid
-                ProfitShareService.Instance.Start(); //分账状态监控队列,分账完成则提交返现
-                HaoDaExtHelper.Instance.StartWeChat();
-                HaoDaExtHelper.Instance.StartAlipay();
-                HaoDaExtQueryHelper.Instance.StartWeChat();
-                HaoDaExtQueryHelper.Instance.StartAlipay();
-                HaoDaExtQueryAuthHelper.Instance.StartWeChat();
-                HaoDaExtQueryAuthHelper.Instance.StartAlipay();
-                HaoDaAuthQueryHelper.Instance.Start(); //查询实名认证状态
-                WeChatPayBackService.Instance.Start(); //支付回调
-                WeChatPayBackService.Instance.StartProfitShare(); //分账队列
-                WeChatPayBackService.Instance.StartSettleOrder(); //接收分账结算金额
-                WeChatPayBackService.Instance.StartDivi(); //补分账
-                ProfitHelper.Instance.StartListenTrade(); //返现队列-支付宝
-                ProfitHelper.Instance.StartListenWxTrade(); //返现队列-微信
-                ProfitHelper.Instance.StartListenProfit(); //每月分润
+            // if(Library.ConfigurationManager.EnvironmentFlag == 2)
+            // {
+            //     MerchantConfirmService.Instance.Start(); //提交商户进件
+            //     CheckWeChatSignService.Instance.Start(); //查询商户审核状态
+            //     CheckWeChatBindService.Instance.Start(); //执行好哒微信绑定appid
+            //     ProfitShareService.Instance.Start(); //分账状态监控队列,分账完成则提交返现
+            //     HaoDaExtHelper.Instance.StartWeChat();
+            //     HaoDaExtHelper.Instance.StartAlipay();
+            //     HaoDaExtQueryHelper.Instance.StartWeChat();
+            //     HaoDaExtQueryHelper.Instance.StartAlipay();
+            //     HaoDaExtQueryAuthHelper.Instance.StartWeChat();
+            //     HaoDaExtQueryAuthHelper.Instance.StartAlipay();
+            //     HaoDaAuthQueryHelper.Instance.Start(); //查询实名认证状态
+            //     WeChatPayBackService.Instance.Start(); //支付回调
+            //     WeChatPayBackService.Instance.StartProfitShare(); //分账队列
+            //     WeChatPayBackService.Instance.StartSettleOrder(); //接收分账结算金额
+            //     WeChatPayBackService.Instance.StartDivi(); //补分账
+            //     ProfitHelper.Instance.StartListenTrade(); //返现队列-支付宝
+            //     ProfitHelper.Instance.StartListenWxTrade(); //返现队列-微信
+            //     ProfitHelper.Instance.StartListenProfit(); //每月分润
 
-                AlipayPayBackFeeService.Instance.Start();
-                ActiveRewardService.Instance.StartAct();
-                ActiveRewardService.Instance.StartOpenReward();
-                ActiveRewardService.Instance.StartLeaderReward();
-                ActiveRewardService.Instance.StartOperateReward();
+            //     AlipayPayBackFeeService.Instance.Start();
+            //     ActiveRewardService.Instance.StartAct();
+            //     ActiveRewardService.Instance.StartOpenReward();
+            //     ActiveRewardService.Instance.StartLeaderReward();
+            //     ActiveRewardService.Instance.StartOperateReward();
                 
-                MerchantStandardService.Instance.Start(); //商户缴纳服务费次月活动交易额大于等于1W,奖励进件创客50元
-                MerchantStandardService.Instance.StartThree(); //商户缴纳服务费次月起连续不间断三个月,每月活动交易额大于1W,奖励进件创客100元
-                MerchantStandardService.Instance.StartActive();
-            }
+            //     MerchantStandardService.Instance.Start(); //商户缴纳服务费次月活动交易额大于等于1W,奖励进件创客50元
+            //     MerchantStandardService.Instance.StartThree(); //商户缴纳服务费次月起连续不间断三个月,每月活动交易额大于1W,奖励进件创客100元
+            //     MerchantStandardService.Instance.StartActive();
+            // }
         }
 
         //初始化数据结构

+ 10 - 10
Util/HaoDa/TestChangeMerchantCardSetUtil.cs

@@ -16,30 +16,30 @@ namespace MySystem
     /// </summary>
     public class TestChangeMerchantCardSetUtil
     {
-        public static ChangeMerchantCard SetValue(MerchantAddInfo AddInfo, string BankCard = "/static/upload/2023/9/11/nb.jpg")
+        public static ChangeMerchantCard SetValue(MerchantAddInfo AddInfo, string BankCard = "/static/upload/2024/1/17/111.jpg")
         {
             ChangeMerchantCard changeMerchantCard = new ChangeMerchantCard();
-            changeMerchantCard.mchtNo = "030510106621391"; //收款商户号
-            changeMerchantCard.accountNo = "6217359952003511113"; //卡号(账户类型 0-对公 时填写对公账号,1-对私 时填写银行卡号)
+            changeMerchantCard.mchtNo = "030340107177303"; //收款商户号
+            changeMerchantCard.accountNo = "6217001630072316745"; //卡号(账户类型 0-对公 时填写对公账号,1-对私 时填写银行卡号)
             changeMerchantCard.accoutType = "1"; //账户类型 0-对公,1-对私
             if (changeMerchantCard.accoutType == "1")
             {
-                changeMerchantCard.accountName = "王亦君"; //开户名(账户名称 账户类型 0-对公 时填写对公账户名,1-对私 时填写银行卡户名)
+                changeMerchantCard.accountName = "孙璐薇"; //开户名(账户名称 账户类型 0-对公 时填写对公账户名,1-对私 时填写银行卡户名)
             }
             else
             {
-                changeMerchantCard.accountName = "四川探火网络科技有限责任公司"; //开户名(账户名称 账户类型 0-对公 时填写对公账户名,1-对私 时填写银行卡户名)
+                changeMerchantCard.accountName = "安徽邦洲电子商务有限公司"; //开户名(账户名称 账户类型 0-对公 时填写对公账户名,1-对私 时填写银行卡户名)
             }
-            changeMerchantCard.zbankNo = "313701013316"; //开户支行号
+            changeMerchantCard.zbankNo = "105361044312"; //开户支行号
             changeMerchantCard.alterType = "1"; //结算类型:0-对公结算银行卡;1-法人对私结算银行卡;2-非法人结算
             // if (AddInfo.AccountType == "0" && AddInfo.LicenceType == "0") changeMerchantCard.alterType = "0"; //结算类型:0-对公结算银行卡;1-法人对私结算银行卡;2-非法人结算
             // if (AddInfo.AccountType == "1" && (AddInfo.LicenceType == "0" || AddInfo.LicenceType == "1")) changeMerchantCard.alterType = "1"; //结算类型:0-对公结算银行卡;1-法人对私结算银行卡;2-非法人结算
             // if (AddInfo.AccountType == "1" && AddInfo.LicenceType == null) changeMerchantCard.alterType = "2"; //结算类型:0-对公结算银行卡;1-法人对私结算银行卡;2-非法人结算
-            changeMerchantCard.acctZbankCode = "510107"; //开户支行地区码
-            changeMerchantCard.idCard = "620522199407080017"; //非法人身份证号
+            changeMerchantCard.acctZbankCode = "340102"; //开户支行地区码
+            changeMerchantCard.idCard = "340123200410150349"; //非法人身份证号
             if (changeMerchantCard.alterType == "2")
             {
-                changeMerchantCard.idCard = "620522199407080017"; //非法人身份证号(结算类型为2时必填)
+                changeMerchantCard.idCard = "340123200410150349"; //非法人身份证号(结算类型为2时必填)
                 if (AddInfo.CardPeriodEnd.Value.Year == 2050)
                 {
                     changeMerchantCard.agentCardDate = AddInfo.CardPeriodBegin.Value.ToString("yyyyMMdd") + "-" + "长期"; //法人身份证有效期 格式:20150101-20200101,若结束日期为长期填20150101-长期
@@ -74,7 +74,7 @@ namespace MySystem
             }
             if (changeMerchantCard.alterType == "1")
             {
-                var info = "/static/upload/2023/8/14/dd.jpg";
+                var info = "/static/upload/2024/1/17/111.jpg";
                 if (!string.IsNullOrEmpty(info))
                 {
                     var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(info.Substring(info.LastIndexOf("/")).Trim('/'), "0"));

+ 16 - 6
Util/HaoDa/TestHaoDaService.cs

@@ -36,9 +36,10 @@ namespace MySystem
             // WeChatAddInfo(825,"2000002424428809");//查询微信开户意愿申请状态
             // QueryMerchantStatus(867);//新建商户查询状态
             // ConfiemMer(808);//新建商户
-            // ChangeMerchantCard(1);//商户修改银行卡
+            // ChangeMerchantCard(1874);//商户修改银行卡
+            QueryChangeCardStatus(1874);//商户修改银行卡状态
             // AddOpenDivideAccounts(832); //添加分账方
-            QueryAuthStatus(1845);//查询实名认证状态
+            // QueryAuthStatus(1845);//查询实名认证状态
             // WeChatFunctionForHD.Instance.QueryAuthMerchant("600955391");
             // AlipayFunctionForHD.Instance.AuthOrderAuthQuery("2088820718243322");
             // StartProfitShareListen();
@@ -569,10 +570,10 @@ namespace MySystem
         public void ChangeMerchantCard(int MerchantId)
         {
             WebCMSEntities db = new WebCMSEntities();
-            // MerchantAddInfo AddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == MerchantId);
-            // var request = TestChangeMerchantCardSetUtil.SetValue(AddInfo);
-            // JsonData Infos = JsonMapper.ToObject(HaoDaHelper.Instance.ChangeMerchantCard(request));
-            // JsonData results = JsonMapper.ToObject(HaoDaHelper.Instance.QueryChangeCardStatus(AddInfo.MchtNo, Infos["taskId"].ToString()));
+            MerchantAddInfo AddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == MerchantId);
+            var request = TestChangeMerchantCardSetUtil.SetValue(AddInfo);
+            JsonData Infos = JsonMapper.ToObject(HaoDaHelper.Instance.ChangeMerchantCard(request));
+            JsonData results = JsonMapper.ToObject(HaoDaHelper.Instance.QueryChangeCardStatus(AddInfo.MchtNo, Infos["data"]["taskId"].ToString()));
             //TODO:修改结算卡变更商户相关信息
             // AccountNumber
             // BankName
@@ -588,6 +589,15 @@ namespace MySystem
             // ZBankNo
             db.Dispose();
         }
+
+        //商户修改银行卡
+        public void QueryChangeCardStatus(int MerchantId)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantAddInfo AddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == MerchantId);
+            // JsonData results = JsonMapper.ToObject(HaoDaHelper.Instance.QueryChangeCardStatus(AddInfo.MchtNo, Infos["data"]["taskId"].ToString()));
+            JsonData results = JsonMapper.ToObject(HaoDaHelper.Instance.QueryChangeCardStatus(AddInfo.MchtNo, "16592654"));
+        }