Merge remote-tracking branch 'origin/master'

edu-thirdparty/src/main/java/com/keao/edu/thirdparty/adapay/ConfigInit.java

@@ -8,9 +8,8 @@ public class ConfigInit {
 
 
     private static ConfigInit instance;
-    public final static Integer organId = 46; //商户对应的分部
     public final static String merNo = "B09767221"; //商户对应的分部
-    public final static String appId = "app_42a86688-db6f-422c-b5e3-c0883dbadb1d";
+    public final static String appId = "app_72f91296-18b0-4263-84fe-24fa6902c1d0";
 
     public final static String wxAppId = "wx751141096e75a4ee";
     public final static String wxAppSecret = "e882d76c95d1613607a85338b1bed3ff";
@@ -44,8 +43,8 @@ public class ConfigInit {
          *添加商户配置，一个商户只需要 添加一次，添加以后在内存中。
          */
 
-        String apiKey = "api_live_8dd6fba0-59ca-45f7-8e82-0b3ae7bd7907";
-        String mockApiKey = "api_test_193c8f6a-514f-4d95-a26b-2861c7971105";
+        String apiKey = "api_live_bfc3c02f-657b-4731-9fcd-ea9503aa3bb9";
+        String mockApiKey = "api_test_d09b9f68-9798-43b3-93b7-a22ef406a20c";
         String rsaPrivateKey = "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAL3zHDr2s5Lp3b9FKAD4vB3Y2MyOypv68mKFi8uPznO9JkzBhwYLYRC8mnP+W7tw5Q7Yuf5Szhn8Mo9KZ8Bsv6S6iz3BtXzeHb/8nyeBAH2m477bJzwmapZPhPSroR8md1dnNI+4NttM/0Cn/rdAySzQn+IPHLPxWFwQw+y6FFi7AgMBAAECgYEAkuUBPfAvKzxEyng22ZmCESrzbi43La1B6UMRuxi5NfRfPBilzNzb8c+JOo7Ibgp+eZ7NJ4rt7FaG2x1VYxA2m151I86e6TlgPYNjjj56RpkrD9/LrDqePFE4AlrwO5802fK4X/iac1MCpEhaiVNQ3x6ikwcKWzKmMV/EpdijIcECQQDlt+ou3L5M2TQW8YYg9zA9TKRd+M/Xs0tPLJLE+W6m0+dmyeHBErMW6X874qhmIc3F8HYIW+O51GMy6KDgQ7PrAkEA065ujs1ZkwIPMopgIoqlRi8JDvAxgEZqktDDMMg0o2XZP6J7C5suf2BsrhKnjLlxII7dQPxDfPDiRz4jYpBKcQJBAKd77ev42W5iNk48DdTfJHas+HHjRHY5rMCu+NtQGNLdUKtqqYQBRD2CRFe/K5Q7NTIJ3aS+ikwkg6bMYO7hrb0CQDesuC1c+0M8Fm0vketj1eZotpQ0PoDDhIJK4BuzfIzBW+ttu7kovokH/m2mQGU13Pg4Ox89ei6hWJJuWHYzBzECQQDexzziaTpHMy3achL2M2pOSdaSLYoesmPTmVZ3kOZf82FpRlfxVGUs0nKpEEgagUkiHUQHAu5RVkxIiDqMYrQp";
 
         merConfig.setApiKey(apiKey);

edu-thirdparty/src/main/java/com/keao/edu/thirdparty/adapay/CorpMember.java

@@ -108,14 +108,12 @@ class CorpMember extends ConfigInit {
      * @return 创建的CorpMember 对象
      * @throws Exception 异常
      */
-    public Map<String, Object> executeCreateMember( Map<String,Object> info) throws Exception {
+    public Map<String, Object> executeCreateMember( Map<String,Object> info,String path) throws Exception {
         System.out.println("=======execute Create CorpMember begin=======");
         Map<String, Object> memberParams = new HashMap<String, Object>();
         memberParams.put("app_id", appId);
         memberParams.putAll(info);
 
-        String path= "C:/Users/river/Desktop/mec/mec-thirdparty/libs/test.zip";
-
         File file = new File(path);
         System.out.println("创建企业用户，请求参数：" + JSON.toJSONString(memberParams) );
         Map<String, Object> member = com.huifu.adapay.model.CorpMember.create(memberParams, file);

edu-thirdparty/src/main/java/com/keao/edu/thirdparty/adapay/MainDemo.java

@@ -18,31 +18,34 @@ public class MainDemo {
 
     public static void testMerchant() throws Exception {
 
-        HashMap<String, Object> memberParams = new HashMap<>();
-        memberParams.put("member_id", "W004201");
-        memberParams.put("order_no", "corp_mem_" + System.currentTimeMillis());
-
-        memberParams.put("social_credit_code", "91420106303461541T");
-        memberParams.put("social_credit_code_expires", "20440730");
-        memberParams.put("business_scope", "教育资讯、投资资讯");
-        memberParams.put("name", "武汉大雅乐盟教育咨询有限公司");
-        memberParams.put("prov_code", "0042");
-        memberParams.put("area_code", "4201");
-        memberParams.put("legal_person", "李松");
-        memberParams.put("legal_cert_id", "420106196811210837");
-        memberParams.put("legal_cert_id_expires", "20990730");
-        memberParams.put("legal_mp", "13958465215");//法人手机号
-        memberParams.put("address", "武昌区水果湖汉街武汉中央文化旅游区K3地块第2幢34层2号");
-        memberParams.put("zip_code", "430000");
-        //memberParams.put("telphone", "41164452");
-       // memberParams.put("email", "ceshi@qq.com");
-        memberParams.put("bank_code", "03020000");
-        memberParams.put("bank_acct_type", "1");
-        memberParams.put("card_no", "‘8111501011700649152");
-        memberParams.put("card_name", "武汉大雅乐盟教育咨询有限公司");
-       // new CorpMember().executeCreateMember(memberParams);
-
-        new CorpMember().executeQueryMember("W004201");
+//        HashMap<String, Object> memberParams = new HashMap<>();
+//        memberParams.put("order_no", "corp_mem_" + System.currentTimeMillis());
+//        //memberParams.put("telphone", "41164452");
+//        // memberParams.put("email", "ceshi@qq.com");
+//
+//
+//        memberParams.put("member_id",                  "H004209");
+//        memberParams.put("name",                       "苏州乐谷文化传播有限公司");
+//        memberParams.put("prov_code",                  "0032");
+//        memberParams.put("area_code",                  "3206");
+//        memberParams.put("social_credit_code",         "91320508314158601J");
+//        memberParams.put("social_credit_code_expires", "20991231");
+//        memberParams.put("business_scope",             "文化交流活动策划、乐器培训、声乐培训、乐器批发兼零售及售后服务、面向中小学生开展的艺术培训");
+//        memberParams.put("legal_person",               "蔡明哲");
+//        memberParams.put("legal_cert_id",              "230204198110311914");
+//        memberParams.put("legal_cert_id_expires",      "20350714");
+//        memberParams.put("legal_mp",                   "18611812776");
+//        memberParams.put("address",                    "江苏省苏州市干将西路515号702室");
+//        memberParams.put("zip_code",                   "215002");
+//        memberParams.put("bank_code",                  "3080000");
+//        memberParams.put("bank_acct_type",             "1");
+//        memberParams.put("card_name",                  "苏州乐谷文化传播有限公司");
+//        memberParams.put("card_no",                    "512907602210601");
+//
+//        String path= "C:/Users/river/Desktop/imgzip/苏州乐谷文化传播有限公司.zip";
+//        new CorpMember().executeCreateMember(memberParams,path);
+
+        new CorpMember().executeQueryMember("H004209");
 
 
         //Payment.closePayment("002112020062916385810123596334923411456");