Merge remote-tracking branch 'origin/master'

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdHuaGaoServiceImpl.java

@@ -1017,6 +1017,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
                 formData.put("textField_mizdd3pi",fProviderContactPost);
                 formData.put("textField_mizdd3pk",fProviderContactMobile);
                 formData.put("textField_mizdd3pm",fSupplierAddress);
+                formData.put("selectField_mjs0s3ku","未完成");
 
 
                 Map detail = new HashMap();

mjava-lianan/src/main/java/com/malk/lianan/TestUtil.java

@@ -57,9 +57,12 @@ public class TestUtil {
     private final static String GYPAY_API_SIGN_PUB_KEY="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmudhlkVXrFP1DB0r11LvVpy8nYVO9sR2tYLXCkQxXE4HR2VlihCO43B2v/Ep3tlny4l/OX++AQX4sJpO8vAnCRmNIAgXKXAfvre1HTSkJf9vb8G9sf4UsZX2bLEOtH4wOO7Osv8Za98WzBHBRrqESI91Z4GSE0/8ucMp6V7EZ5wIDAQAB";
 
     public static void main(String[] args) throws Exception {
-//        query();
-        String sign1="GRJCRklJVIy8vUFUg4gDo+iv+MIp+MHmitPrnUJLO0mcg+6EiJklYhoXtHhgmTgx2Rw7AgTsAsNNbM02ehgMLim0zeX76Ghq1oD/xbDyydi6/CLSEf1QS9fQvUsnOIwgZKarSc/UM2wdlgHf9M7OmNpf3Mv+YuEHwyMF6dXlljc=";
-        String data="AeWTi5jUG8l1h6JJG9uuvGH63r6sSpnJW2VhOA52XGW5QdH6TESqQ4iKV46TuAB53juaW6DyBrQcuoXOXZK6lzIkird1cQksS8ve/IxVBwc1sa8BJRrO9cqCHoURjbKdJz66+FBE5L4pCZy5DESP/Q==";
+        query();
+
+
+        /*String sign1="Ra/WLUYZUeHHyaOhyvTDm1tczq8b25mTn2tfW4VQesbQHdY6E88bjXkuuJt0YVn6jgelH56Kl7z9zgv8L3QVCfy5WLgMwpsxjUeRGrL03Gd2KIz4R9ithmGNNziSJz0JR1yYHkUU2eHv+KmKGOxEjI+7NQ/oHOxe+mVI1HpioAo=";
+        String data="{    \"ResultCode\": \"82000007\",    \"ResultMsg\": \"签名验证失败\",    \"NextTag\": \"0\",    \"ResultSet\": [    ]}";
+
 //        RSASignatureUtil.verifySafe("AeWTi5jUG8l1h6JJG9uuvGH63r6sSpnJW2VhOA52XGW5QdH6TESqQ4iKV46TuAB53juaW6DyBrQcuoXOXZK6lzIkird1cQksS8ve/IxVBwc1sa8BJRrO9cqCHoURjbKdJz66+FBE5L4pCZy5DESP/Q=="
 //                ,"GRJCRklJVIy8vUFUg4gDo+iv+MIp+MHmitPrnUJLO0mcg+6EiJklYhoXtHhgmTgx2Rw7AgTsAsNNbM02ehgMLim0zeX76Ghq1oD/xbDyydi6/CLSEf1QS9fQvUsnOIwgZKarSc/UM2wdlgHf9M7OmNpf3Mv+YuEHwyMF6dXlljc="
 //                ,GYPAY_API_SIGN_PUB_KEY);
@@ -89,7 +92,7 @@ public class TestUtil {
         }catch (Exception e){
             e.printStackTrace();
         }
-
+*/
     }
 
     /**
@@ -108,7 +111,7 @@ public class TestUtil {
         head.put("Timestamp", UtilDateTime.getLocalDateTimeTimeStamp());
         head.put("SystemNo",GYPAY_API_SYS_ID);
         head.put("SystemName",GYPAY_API_SYS_NAME);
-        head.put("RequestNo","12150001");
+        head.put("RequestNo","12150007");
         Map<String,Object> body = new HashMap<>();
         Map<String,Object> item = new HashMap<>();
         item.put("AcctNo",GYPAY_API_ACCOUNT_NO);
@@ -116,6 +119,50 @@ public class TestUtil {
         item.put("StartTransDate","2025-12-01");
         item.put("EndTransDate","2025-12-15");
         item.put("NextTag","1");
+        Map<String,Object> data = UtilMap.map("ParamSet", Arrays.asList(item));
+        System.out.println(JSON.toJSONString(data));
+        String encrypt = AesUtil.encrypt(JSON.toJSONString(data),GYPAY_API_AES_KEY);
+        log.info("encrypt:{},{}","",encrypt);
+        //解密
+        body.put("Data", encrypt);
+        String signed=RSASignatureUtil.signSafe(JSONObject.toJSONString(data),GYPAY_API_PRI_KEY);
+        body.put("Sign", signed);
+
+        Map<String,Object> Cmscloud = new HashMap<>();
+        Cmscloud.put("Head",head);
+        Cmscloud.put("Body",body);
+        String indata=JSONObject.toJSONString(UtilMap.map("Cmscloud",Cmscloud));
+        System.out.println(indata);
+        String result=HttpUtil.createPost(GYPAY_API_URL).body(indata).execute().body();
+        System.out.println(result);
+        JSONObject resultjson=JSONObject.parseObject(result);
+        JSONObject resultBody = resultjson.getJSONObject("Cmscloud").getJSONObject("Body");
+        String resultData=AesUtil.decrypt(resultBody.getString("Data"),GYPAY_API_AES_KEY);
+        System.out.println(resultData);
+
+        Boolean flag=RSASignatureUtil.verifySafe(resultData,resultBody.getString("Sign"),GYPAY_API_SIGN_PUB_KEY);
+        System.out.println(flag);
+
+    }
+
+    //账户信息查询接口
+    public static void query2(){
+        Map<String,Object> head = new HashMap<>();
+        head.put("MesgNo","T0005");
+        head.put("TenantId",GYPAY_API_TENANT_ID);
+        head.put("Timestamp", UtilDateTime.getLocalDateTimeTimeStamp());
+        head.put("SystemNo",GYPAY_API_SYS_ID);
+        head.put("SystemName",GYPAY_API_SYS_NAME);
+        head.put("RequestNo","12300001");
+
+
+        Map<String,Object> body = new HashMap<>();
+        Map<String,Object> item = new HashMap<>();
+        item.put("CurrencyCodeList",Arrays.asList("CNY"));
+        item.put("AcctStatus","1");
+        item.put("AcctNoOrName","浙江联联看数字科技有限公司");
+        item.put("NextTag",1);
+
         Map<String,Object> data = UtilMap.map("ParamSet", Arrays.asList(item));
         System.out.println(JSON.toJSONString(data));
         String encrypt = AesUtil.encrypt(JSON.toJSONString(data),GYPAY_API_AES_KEY);