Browse Source

调整开户意愿请求接口,参数有变动
每次提交开户意愿请求,把微信或支付宝状态改为待审核

lcl 1 year ago
parent
commit
bc8c0cf55d

+ 21 - 12
Util/HaoDa/AlipayFunctionForHD.cs

@@ -46,9 +46,14 @@ namespace MySystem
             {
                 CardPeriodEnd = "forever";
             }
+            string CertMerchantName = info.CertMerchantName;
             if (info.SubjectType == "SUBJECT_TYPE_SMALL")
             {
                 info.LicenseCopy = info.IdCardCopy;
+                for(int i = 0; i < 9; i++)
+                {
+                    CertMerchantName = CertMerchantName.Replace(i.ToString(), "");
+                }
             }
             string BizContent = "{" +
             "  \"out_biz_no\":\"" + out_biz_no + "\"," +
@@ -60,18 +65,22 @@ namespace MySystem
             "  }," +
             "  \"auth_identity_info\":{" +
             "    \"identity_type\":\"" + identity_type + "\"," +
-            "    \"is_financial_org\":false," +
-            "    \"certificate_type\":\"BUSINESS_CERT\"," +
-            "    \"certificate_info\":{" +
-            "      \"cert_type\":\"UNIT_SOCIAL_CREDIT\"," +
-            "      \"cert_no\":\"" + info.LicenseNumber + "\"," +
-            "      \"cert_image\":\"" + UploadPic(info.LicenseCopy) + "\"," +
-            "      \"merchant_name\":\"" + info.CertMerchantName + "\"," +
-            "      \"legal_person_name\":\"" + info.CertLegalPerson + "\"," +
-            "      \"register_address\":\"" + info.BizAddressCode.Replace(",", "") + info.BizStoreAddress + "\"," +
-            "      \"effect_time\":\"" + info.PeriodBegin.Value.ToString("yyyy-MM-dd") + "\"," +
-            "      \"expire_time\":\"" + PeriodEnd + "\"" +
-            "    },";
+            "    \"is_financial_org\":false,";
+            if (info.SubjectType != "SUBJECT_TYPE_SMALL")
+            {
+                BizContent += "    \"certificate_type\":\"BUSINESS_CERT\"," +
+                "    \"certificate_info\":{" +
+                "      \"cert_type\":\"UNIT_SOCIAL_CREDIT\"," +
+                "      \"cert_no\":\"" + info.LicenseNumber + "\"," +
+                "      \"cert_image\":\"" + UploadPic(info.LicenseCopy) + "\"," +
+                "      \"merchant_name\":\"" + info.CertMerchantName + "\"," +
+                "      \"legal_person_name\":\"" + info.CertLegalPerson + "\"," +
+                "      \"register_address\":\"" + info.BizAddressCode.Replace(",", "") + info.BizStoreAddress + "\"," +
+                "      \"effect_time\":\"" + info.PeriodBegin.Value.ToString("yyyy-MM-dd") + "\"," +
+                "      \"expire_time\":\"" + PeriodEnd + "\"" +
+                "    },";
+            }
+
             if (info.SubjectType == "SUBJECT_TYPE_SMALL")
             {
                 string bizAddressCode = info.BizAddressCode;

+ 8 - 2
Util/HaoDa/MerchantConfirmService.cs

@@ -58,11 +58,17 @@ namespace MySystem
                 //开户意愿申请
                 if (AddInfo.Status == -1 && merchant.Status == -1)
                 {
-                    RedisDbconn.Instance.AddList("AlipayForHaoDaQueue", AddInfo.Id);
+                    AddInfo.WeChatSignUrl = "";
+                    AddInfo.WeChatRemark = "";
+                    AddInfo.Status = 0;
+                    RedisDbconn.Instance.AddList("WeChatForHaoDaQueue", AddInfo.Id);
                 }
                 if (AddInfo.QueryCount == -1 && merchant.QueryCount == -1)
                 {
-                    RedisDbconn.Instance.AddList("WeChatForHaoDaQueue", AddInfo.Id);
+                    AddInfo.AlipaySignUrl = "";
+                    AddInfo.AlipayRemark = "";
+                    AddInfo.QueryCount = 0;
+                    RedisDbconn.Instance.AddList("AlipayForHaoDaQueue", AddInfo.Id);
                 }
             }
             else

+ 4 - 4
Util/HaoDa/TestHaoDaService.cs

@@ -30,12 +30,12 @@ namespace MySystem
             //开户意愿申请
             // RedisDbconn.Instance.AddList("AlipayForHaoDaQueue",824);
             // RedisDbconn.Instance.AddList("WeChatForHaoDaQueue",824);
-            AlipayAddInfo(826);//提交支付宝开户意愿申请单
-            // AlipayAddInfo(824,"202309011037515410");//查询支付宝开户意愿申请状态
+            // AlipayAddInfo(826);//提交支付宝开户意愿申请单
+            AlipayAddInfo(826,"202309011037637291");//查询支付宝开户意愿申请状态
             // WeChatAddInfo(826);//提交微信开户意愿申请单
-            // WeChatAddInfo(824,"202309011037515410");//查询微信开户意愿申请状态
+            // WeChatAddInfo(826,"2000002424195476");//查询微信开户意愿申请状态
             // QueryMerchantStatus(824);//新建商户查询状态
-            // QueryAuthStatus(824);//查询实名认证状态
+            // QueryAuthStatus(826);//查询实名认证状态
             // ConfiemMer(808);//新建商户
             // ChangeMerchantCard(1);//商户修改银行卡
         }

+ 34 - 12
Util/HaoDa/WeChatFunctionForHD.cs

@@ -40,6 +40,7 @@ namespace MySystem
         {
             Dictionary<string, object> result = new Dictionary<string, object>();
             string business_code = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+            result.Add("channel_id", info.WeChatMerchantId); //渠道商户号
             result.Add("business_code", business_code); //业务申请编号
 
             WebCMSEntities dbpxc = new WebCMSEntities();
@@ -60,25 +61,46 @@ namespace MySystem
 
             Dictionary<string, object> business_licence_info = new Dictionary<string, object>();
 
+            string CertMerchantName = info.CertMerchantName;
             if (info.SubjectType == "SUBJECT_TYPE_SMALL")
             {
                 info.LicenseCopy = info.IdCardCopy;
+                for(int i = 0; i < 9; i++)
+                {
+                    CertMerchantName = CertMerchantName.Replace(i.ToString(), "");
+                }
             }
-            business_licence_info.Add("licence_number", info.LicenseNumber); //注册号/统一社会信用代码
-            business_licence_info.Add("licence_copy", GetMediaId("/" + info.LicenseCopy)); //营业执照照片
-            business_licence_info.Add("merchant_name", info.CertMerchantName); //商户名称
-            business_licence_info.Add("legal_person", info.CertLegalPerson); //个体户经营者/法人姓名
-            business_licence_info.Add("company_address", info.BizStoreAddress); //注册地址
-            string PeriodEnd = info.PeriodEnd.Value.ToString("yyyy-MM-dd");
-            // if (PeriodEnd.Substring(0, 4) == "2050")
-            if (PeriodEnd.Substring(0, 4) == "9999")
+            if (info.SubjectType != "SUBJECT_TYPE_SMALL")
             {
-                // PeriodEnd = "forever";
-                PeriodEnd = "长期";
+                business_licence_info.Add("licence_number", info.LicenseNumber); //注册号/统一社会信用代码
+                business_licence_info.Add("licence_copy", GetMediaId("/" + info.LicenseCopy)); //营业执照照片
+                business_licence_info.Add("merchant_name", CertMerchantName); //商户名称
+                business_licence_info.Add("legal_person", info.CertLegalPerson); //个体户经营者/法人姓名
+                business_licence_info.Add("company_address", info.BizStoreAddress); //注册地址
+                string PeriodEnd = info.PeriodEnd.Value.ToString("yyyy-MM-dd");
+                // if (PeriodEnd.Substring(0, 4) == "2050")
+                if (PeriodEnd.Substring(0, 4) == "9999")
+                {
+                    // PeriodEnd = "forever";
+                    PeriodEnd = "长期";
+                }
+                business_licence_info.Add("licence_valid_date", "[\"" + info.PeriodBegin.Value.ToString("yyyy-MM-dd") + "\",\"" + PeriodEnd + "\"]"); //营业执照有效日期
+
+                subject_info.Add("business_licence_info", business_licence_info); //营业执照
             }
-            business_licence_info.Add("licence_valid_date", "[\"" + info.PeriodBegin.Value.ToString("yyyy-MM-dd") + "\",\"" + PeriodEnd + "\"]"); //营业执照有效日期
 
-            subject_info.Add("business_licence_info", business_licence_info); //营业执照
+            if (info.SubjectType == "SUBJECT_TYPE_SMALL")
+            {
+                Dictionary<string, object> assist_prove_info = new Dictionary<string, object>();
+                assist_prove_info.Add("micro_biz_type", "MICRO_TYPE_STORE"); //小微经营类型
+                assist_prove_info.Add("store_name", info.BizStoreName); //门店名称
+                assist_prove_info.Add("store_address_code", info.AreaNo); //门店省市编码
+                assist_prove_info.Add("store_address", info.BizStoreAddress); //门店地址
+                assist_prove_info.Add("store_header_copy", GetMediaId("/" + info.StoreEntrancePic)); //门店门头照片
+                assist_prove_info.Add("store_indoor_copy", GetMediaId("/" + info.IndoorPic)); //店内环境照片
+                subject_info.Add("assist_prove_info", assist_prove_info); //辅助证明材料信息
+            }
+            
             result.Add("subject_info", subject_info);
 
             Dictionary<string, object> identification_info = new Dictionary<string, object>();