"拉卡拉进件支付代码"

pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java

@@ -67,6 +67,9 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
         limitUri.add("/api/questionsAnswers");
         limitUri.add("/api/helpVideo");
         limitUri.add("/api/systemConfig/updateSystemVersion");
+        limitUri.add("/api/lkl/querySubMerInfo");
+        limitUri.add("/api/lkl/lklCallBack");
+        limitUri.add("/api/lkl/queryMerchantChannelStatus");
         boolean passFlag = limitUri.stream().anyMatch(s -> s.equals(requestUri) || requestUri.startsWith(s));
         if (passFlag) {
             return true;

pluss-common-bundle/src/main/resources/config/application-common.yml

@@ -163,18 +163,34 @@ express:
   APIKEY: 63e75d64-e8fd-4dcc-93fa-17dc710cdf04
 lkl:
   privateKey: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp
-  appid: OP00000462  #接入方唯一编号
+  appid: OP00000657  #接入方唯一编号
-  mchSerialNo: 00dfba8194c41b84cf #证书序列号
+  mchSerialNo: 01887665511e #证书序列号
   merchantNo: 8221210594300JY #商户号
   vposId: 491612871013605376 #vpos_id
   termNo: A0073841 #终端号
-  apiUrl: https://test.wsmsd.cn/sit/
+  apiUrl: https://s2.lakala.com/
-  privateKeyPath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\OP00000003_private_key.pem
+  privateKeyPath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\api_private_key.pem
-  certificatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\OP00000003_cert.cer
+  certificatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\lkl-apigw-v1.cer
-  returncatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\lkl-apigw-v2.cer
+  returncatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\lkl-apigw-v1.cer
   callBackUrl: https://p40312246f.goho.co/api/auditCallback/tradeCallBack
   pubKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHB7j7gG3ioLnnr7bsuEXTAh/8YSxSp4lQIYGW9gX0Ikgz9JqARdg4iEnU6tgNirxA6Jdg0AWgLJQxQBEZMkwyK2ZfYgesYhlJkv6WVC8v5OkOrhA9NSQ3iS6JsYegsZO0GJSTtLQaTOF8WobPYe5NI+eWU1fRz2ZyxlWlKshBeQIDAQAB
 
 
 
+#lkl:
+#  privateKey: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp
+#  appid: OP00000462  #接入方唯一编号
+#  mchSerialNo: 00dfba8194c41b84cf #证书序列号
+#  merchantNo: 8221210594300JY #商户号
+#  vposId: 491612871013605376 #vpos_id
+#  termNo: A0073841 #终端号
+#  apiUrl: https://test.wsmsd.cn/sit/
+#  privateKeyPath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\OP00000003_private_key.pem
+#  certificatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\OP00000003_cert.cer
+#  returncatePath: D:\\project\\chaozhanggui\\pluss-common-bundle\\src\\main\\resources\\lakalaConf\\lkl-apigw-v1.cer
+#  callBackUrl: https://p40312246f.goho.co/api/auditCallback/tradeCallBack
+#  pubKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHB7j7gG3ioLnnr7bsuEXTAh/8YSxSp4lQIYGW9gX0Ikgz9JqARdg4iEnU6tgNirxA6Jdg0AWgLJQxQBEZMkwyK2ZfYgesYhlJkv6WVC8v5OkOrhA9NSQ3iS6JsYegsZO0GJSTtLQaTOF8WobPYe5NI+eWU1fRz2ZyxlWlKshBeQIDAQAB
+
+
+
 

pluss-common-bundle/src/main/resources/lakalaConf/api_cert.cer

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIGAYh2ZVEeMA0GCSqGSIb3DQEBBQUAMGAxFDASBgNVBAMM
+C0xBS0FMQS1MQU9QMQswCQYDVQQGEwJDTjEXMBUGA1UECgwOTGFrYWxhIENvLixM
+dGQxDzANBgNVBAsMBkxLTC1ZRjERMA8GA1UEBwwIc2hhbmdoYWkwHhcNMjMwNjAx
+MDk1ODUxWhcNMzMwNjAxMDk1ODUxWjBgMRQwEgYDVQQDDAtMQUtBTEEtTEFPUDEL
+MAkGA1UEBhMCQ04xFzAVBgNVBAoMDkxha2FsYSBDby4sTHRkMQ8wDQYDVQQLDAZM
+S0wtWUYxETAPBgNVBAcMCHNoYW5naGFpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuX0oRVQqMatLl7U31D0S/HiW/ie/7/PpeHw2Y8Jmn2fbfeTKdNcQ
+6JjBvy069zeJ+NmngH4JNGJZp1CiDAPs76XOz9nGPE/k/dyJ3/VftY5gceZfm68z
+iHSmxxvY6WjllwVNiQrGqfWUix2L/dhE6hZszFhzbiBrDttFz9zcZf9gZaHvyUHj
+y202onhN/olrbsHAWc77zvLowMbMiTANjw/4cGvOpv0HL3l/1HsMIuLqJUazXpxC
+MbFndLaloIeUlZMehtNDv/xMELK7gImBKYLcFD2OUM6o9XdrLcIyrNujC7GqpFMy
+32S54Q8Wpku2vcuyphnUK0XbFKNWjlDbKQIDAQABo2AwXjAPBgNVHRMECDAGAQH/
+AgEAMB8GA1UdIwQYMBaAFNhKhTJ8euu/7alFJnM/CSKbJ3NeMB0GA1UdDgQWBBTY
+SoUyfHrrv+2pRSZzPwkimydzXjALBgNVHQ8EBAMCBsAwDQYJKoZIhvcNAQEFBQAD
+ggEBAIY2Y65MM6AB2Ajd6dITpCH19NaUrjA74PVzws0i1kdDui2ap0QlYWzDTvQ6
+WK5SgQ9DZ1t8qhbsm4/DD7j+Sqj6fNYDG9N7PLDOgFj7LShdFJXVn8Ak/FWBwxe2
+uM7uxg82p+wGxG/jtfI5VntOiRDTvrB4K7CdsLVjBM4ae/0UfuKceIw4mLCCT5hH
+CnnK0RNmxgfOksSJmC1F2NxzZw8wMQp2nqnQaIvNphndzFy9+EXpz7i7P3q89m/r
+CCnsI3f4pjm9wOaPMyPzIEc3yxHnTTMsAzHdccVzp02iR6qjquqYsKWjTfRr5Oa0
+dgLD9Ccfpcux0xAs5UKgSrXRNOw=
+-----END CERTIFICATE-----

pluss-common-bundle/src/main/resources/lakalaConf/api_private_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC5fShFVCoxq0uX
+tTfUPRL8eJb+J7/v8+l4fDZjwmafZ9t95Mp01xDomMG/LTr3N4n42aeAfgk0Ylmn
+UKIMA+zvpc7P2cY8T+T93Inf9V+1jmBx5l+brzOIdKbHG9jpaOWXBU2JCsap9ZSL
+HYv92ETqFmzMWHNuIGsO20XP3Nxl/2Bloe/JQePLbTaieE3+iWtuwcBZzvvO8ujA
+xsyJMA2PD/hwa86m/QcveX/Uewwi4uolRrNenEIxsWd0tqWgh5SVkx6G00O//EwQ
+sruAiYEpgtwUPY5Qzqj1d2stwjKs26MLsaqkUzLfZLnhDxamS7a9y7KmGdQrRdsU
+o1aOUNspAgMBAAECggEAQ4rHdzdGhf+R7xQV2DrFBxoCIVnoEkAG69CPHZRUOgdf
+bWA6OIF3rrqxEiQuLIcUvoDC9Y7vWxvU+Y/q8eUcCceenyD1hlCxWZ9MtThsOXg2
+tkLk3ZPWeAHCGQ6S1atUrsFHkndSD+FUzbNcnnp53aN8yowKvDchxK8jpKUPvDO6
+nchVipK/KfuPeK2HLIeQcQCF+sOqeAHqnj3ygafvI/J6e5df72xo8cqSepas2/4S
+Racl6MbGvnuFWjU5L6AiYSG93EFSaQcz/wC4Na7H8iYjMbEnxyKHMOPOR8qVz2ud
+ZnAU3HXk1wnfwK7JBohyr9GjJtFZNBo3HB1LjAu6YQKBgQDpOYqm+ur+wwf/NHgN
+jj5GTiizyJTAsPq2ECUG993TpK3knhuDuCRESqbuC2DHbnF/6yMlJqUbOENZnUcc
+BRGZ6CowQqbxqwSOm9v/e8JixmO/G55YdII3cuGIDh16j1Y2UMtPYqoqvm4KsGud
+1EWYjlg3vZoCnwvZse5pYkpyhwKBgQDLmkBxMiUDypN1LKN7deKmMaplRQCBBUrQ
+bL4VjkqUaeTMLs6qznIz8Ab1n8+ceECEMMTxrzRYx3VktyPO5cQ5p8mTD78AL0wM
+ACjJVn0q6CmcljnXdLCG7agBCTw3cz1eziaDoPnyGyREfR6a1XDdTYcD3xi/uYCv
+tAQ6OT/AzwKBgQC+HIenYbYZAYYNRAnwkti0mpWXJ5QKFrnnmvVz3qzWDtEpILCx
+CHOXr3qvZFr5dk/SxCub5wqDS7Oq4wfKEV+to5BwUoSfTpaiYO5OLeXgenNonuzO
+kfprlJu/OjJRa3INSILSLU0lFqHA2NqAhz5MAwxqM4XNSTRxuhbrlJG3FQKBgQCK
+XlNrWnPTZsnd+S9FiXE2F0zBNCrKhEk66pwoVCKVSH4o0aq8ZD8y0u434ZsbsJHQ
+BMDjq3l82FkM0HXydy5rLH+OhUX+HyakhTsy0aeREGSvOV0n8vLBUCQ8SAV3fcb4
+dkuwaydShWWZchrpiSMCE10toWHVcoFlZ4bz9tI/+wKBgBPvXo3WZGDa5F8sGE9o
+AI8PnD9ihb28GFIzZ5ktpRw4SWrz99c1N7sGTMVQ9mvc2/+TY7pOOjddFD6TYcAx
+nctZv2puyuAQoN1/jgA08vS0F1k2EUerm3jS3KD5x2RQoany22ovq2vmi0yzNNqN
+iECVZI9IZLHftwXfvM+Q03fq
+-----END PRIVATE KEY-----

pluss-common-bundle/src/main/resources/lakalaConf/api_public_key.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuX0oRVQqMatLl7U31D0S
+/HiW/ie/7/PpeHw2Y8Jmn2fbfeTKdNcQ6JjBvy069zeJ+NmngH4JNGJZp1CiDAPs
+76XOz9nGPE/k/dyJ3/VftY5gceZfm68ziHSmxxvY6WjllwVNiQrGqfWUix2L/dhE
+6hZszFhzbiBrDttFz9zcZf9gZaHvyUHjy202onhN/olrbsHAWc77zvLowMbMiTAN
+jw/4cGvOpv0HL3l/1HsMIuLqJUazXpxCMbFndLaloIeUlZMehtNDv/xMELK7gImB
+KYLcFD2OUM6o9XdrLcIyrNujC7GqpFMy32S54Q8Wpku2vcuyphnUK0XbFKNWjlDb
+KQIDAQAB
+-----END PUBLIC KEY-----

pluss-common-bundle/src/main/resources/lakalaConf/lkl-apigw-v1.cer

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIGAXUrc4b4MA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNVBAYT
+AkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMRcwFQYDVQQK
+DA5MYWthbGEgQ28uLEx0ZDEqMCgGA1UEAwwhTGFrYWxhIE9yZ2FuaXphdGlvbiBW
+YWxpZGF0aW9uIENBMB4XDTIwMTAxNTA4NDk1MloXDTMwMTAxMzA4NDk1MlowZTEL
+MAkGA1UEBhMCQ04xEDAOBgNVBAgMB0JlaUppbmcxEDAOBgNVBAcMB0JlaUppbmcx
+FzAVBgNVBAoMDkxha2FsYSBDby4sTHRkMRkwFwYDVQQDDBBBUElHVy5MQUtBTEEu
+Q09NMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwAXZw9lupWcFXouC
+Nhm0DQT47Zf4KOIRF8rqT8Ps3pYzT8odROJ8rq4P+lciGrg29czpqrRM22yQktFr
+itvcM7JlE6jFbGH3rycnvGvhRYU/j1N9k0ozm8oVwmKX357/OtGzNivBECGSnU9L
+Bkp4Nm9M1K4cOwEuZ0xsQEthZjQYF0mDpnlWmVJL5i1Lq834atN2qrb/mzMHBNtD
+JnqRV7rPL39lKpe7LJiitsC2JuW1UbWZZU1NNwA/rz2d83C+KD1DLJ0+sMYY2Q3T
+OQ4BPAowDEwOH7XAXrHM/0kRm+ZeIFlwevEGIQWmMt1Ogz+AW4Iq0slINc4wOINK
+vH9tHwIDAQABo4HVMIHSMIGSBgNVHSMEgYowgYeAFCnH4DkZPR6CZxRn/kIqVsMo
+dJHpoWekZTBjMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpSmluZzEQMA4GA1UE
+BwwHQmVpSmluZzEXMBUGA1UECgwOTGFrYWxhIENvLixMdGQxFzAVBgNVBAMMDkxh
+a2FsYSBSb290IENBggYBaiUALIowHQYDVR0OBBYEFIya0Yc4OSBer55JLyA0AYe9
+m8mTMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUA
+A4IBAQCBEwOlk3mXigNv94Drn3dcaY2ml/y+8yNpAIuUhuBE00WFoqEX5lOatFy5
+fzdXuC12lBVQ8SjSm3aH7k2X0eXqDzkOHiur2ZBRKmJ++J4TeenuSUOjSIbQK/DT
+vxaqFUjYwFSVCyizpy7wfU4wKt+jOuFb9LyULJ9lkM1dV9Kh7Lmd9+nlJYYuPEPU
+LJkkVZqSALSiiJudXnTwlISjZTXEAkJpdIlMw+hvPTAkoG95B95M+OV/uLbItGK+
+qT4+RHWo8EbBDPQYo6J4QYHOxRlfMoGBMyrz6XDt7ELLmT7ld4aE02w6KQPfK3gq
+kLDT+/STozvaNmXzBJh7J6KqxJBH
+-----END CERTIFICATE-----

pluss-common-bundle/src/main/resources/lakalaConf/lkl-apigw-v2.cer

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIGAXRTgcMnMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNVBAYT
+AkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMRcwFQYDVQQK
+DA5MYWthbGEgQ28uLEx0ZDEqMCgGA1UEAwwhTGFrYWxhIE9yZ2FuaXphdGlvbiBW
+YWxpZGF0aW9uIENBMB4XDTIwMTAxMDA1MjQxNFoXDTMwMTAwODA1MjQxNFowZTEL
+MAkGA1UEBhMCQ04xEDAOBgNVBAgMB0JlaUppbmcxEDAOBgNVBAcMB0JlaUppbmcx
+FzAVBgNVBAoMDkxha2FsYSBDby4sTHRkMRkwFwYDVQQDDBBBUElHVy5MQUtBTEEu
+Q09NMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt1zHL54HiI8d2sLJ
+lwoQji3/ln0nsvfZ/XVpOjuB+1YR6/0LdxEDMC/hxI6iH2Rm5MjwWz3dmN/6BZeI
+gwGeTOWJUZFARo8UduKrlhC6gWMRpAiiGC8wA8stikc5gYB+UeFVZi/aJ0WN0cpP
+JYCvPBhxhMvhVDnd4hNohnR1L7k0ypuWg0YwGjC25FaNAEFBYP9EYUyCJjE//9Z7
+sMzHR9SJYCqqo6r9bOH9G6sWKuEp+osuAh+kJIxJMHfipw7w3tEcWG0hce9u/el4
+cYJtg8/PPMVoccKmeCzMvarr7jdKP4lenJbtwlgyfs+JgNu60KMUJH8RS72wC9NY
+uFz09wIDAQABo4HVMIHSMIGSBgNVHSMEgYowgYeAFCnH4DkZPR6CZxRn/kIqVsMo
+dJHpoWekZTBjMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpSmluZzEQMA4GA1UE
+BwwHQmVpSmluZzEXMBUGA1UECgwOTGFrYWxhIENvLixMdGQxFzAVBgNVBAMMDkxh
+a2FsYSBSb290IENBggYBaiUALIowHQYDVR0OBBYEFJ2Kx9YZfmWpkKFnC33C0r5D
+K3rFMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUA
+A4IBAQBZoeU0XyH9O0LGF9R+JyGwfU/O5amoB97VeM+5n9v2z8OCiIJ8eXVGKN9L
+tl9QkpTEanYwK30KkpHcJP1xfVkhPi/cCMgfTWQ5eKYC7Zm16zk7n4CP6IIgZIqm
+TVGsIGKk8RzWseyWPB3lfqMDR52V1tdA1S8lJ7a2Xnpt5M2jkDXoArl3SVSwCb4D
+AmThYhak48M++fUJNYII9JBGRdRGbfJ2GSFdPXgesUL2CwlReQwbW4GZkYGOg9LK
+CNPK6XShlNdvgPv0CCR08KCYRwC3HZ0y1F0NjaKzYdGNPrvOq9lA495ONZCvzYDo
+gmsu/kd6eqxTs/JwdaIYr4sCMg8Z
+-----END CERTIFICATE-----

pluss-service-bundle/src/main/java/cn/pluss/platform/klk/controller/LaKaLaController.java

@@ -1,6 +1,7 @@
 package cn.pluss.platform.klk.controller;
 
 import cn.hutool.json.JSONUtil;
+import cn.pluss.platform.klk.service.LklPayService;
 import cn.pluss.platform.klk.service.impl.LaKalaInterfaceImpl;
 import cn.pluss.platform.klk.vo.TuoKeVo;
 import org.springframework.web.bind.annotation.*;
@@ -16,6 +17,11 @@ import java.util.Map;
 public class LaKaLaController {
     @Resource
     LaKalaInterfaceImpl laKalaInterface;
+
+
+    @Resource
+    LklPayService lklPayService;
+
     @PostMapping("/lkl")
     public void aa(@RequestBody TuoKeVo tuoKeVo){
         laKalaInterface.tuoKeAddMer(tuoKeVo);
@@ -49,4 +55,9 @@ public class LaKaLaController {
     public void tradeCallBack(@RequestBody Map<String,Object> map){
         System.out.println("拉卡拉交易回调:"+ JSONUtil.toJsonStr(map));
     }
+
+    @GetMapping("/querySubMerInfo")
+    public String querySubMerInfo(String orgCode,String merInnerNo,String merCupNo){
+        return lklPayService.querySubMerInfo(orgCode, merInnerNo,merCupNo);
+    }
 }

pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/LkLPayServiceImpl.java

@@ -13,6 +13,7 @@ import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
 import cn.pluss.platform.pay.PayService;
 import cn.pluss.platform.util.DateUtils;
 import cn.pluss.platform.util.SnowFlakeUtil;
+import cn.pluss.platform.util.StringUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -46,6 +47,15 @@ public class LkLPayServiceImpl implements PayService {
     public JSONObject tradePay(MerchantOrder order, MerchantChannelStatus channel, MerchantBaseInfo merchant) {
 
 
+        String account_type="WECHAT";
+        if(StringUtil.isNotEmpty(order.getScanType())&&"01".equals(order.getScanType())){
+            account_type="wechatPay".equals(order.getPayTypeCode())?"WECHAT":"aliPay".equals(order.getPayTypeCode()) ?"ALIPAY":"UQRCODEPAY";
+        }else {
+
+        }
+
+
+
 
 
 

pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/LklPayService.java

@@ -107,6 +107,45 @@ public class LklPayService {
 
 
 
+    public String querySubMerInfo(String orgCode,String merInnerNo,String merCupNo){
+        String req_time= DateUtils.getSdfTimes();
+        String body=null;
+        if(ObjectUtil.isNotEmpty(orgCode)&&ObjectUtil.isNotEmpty(merInnerNo)){
+            body="{\n" +
+                    "\t\"reqData\": {\n" +
+                    "\t\t\"version\": \"1.0\",\n" +
+                    "\t\t\"orderNo\": \""+req_time+"\",\n" +
+                    "\t\t\"orgCode\": \""+orgCode+"\",\n" +
+                    "\t\t\"merInnerNo\": \""+merInnerNo+"\"\n" +
+                    "\t}\n" +
+                    "}";
+        }else if(ObjectUtil.isNotEmpty(orgCode)&&ObjectUtil.isNotEmpty(merCupNo)){
+            body="{\n" +
+                    "\t\"reqData\": {\n" +
+                    "\t\t\"version\": \"1.0\",\n" +
+                    "\t\t\"orderNo\": \""+req_time+"\",\n" +
+                    "\t\t\"orgCode\": \""+orgCode+"\",\n" +
+                    "\t\t\"merCupNo\": \""+merCupNo+"\"\n" +
+                    "\t}\n" +
+                    "}";
+        }else {
+            body="{\n" +
+                    "\t\"reqData\": {\n" +
+                    "\t\t\"version\": \"1.0\",\n" +
+                    "\t\t\"orderNo\": \""+req_time+"\",\n" +
+                    "\t\t\"orgCode\": \""+orgCode+"\"\n" +
+                    "\t}\n" +
+                    "}";
+        }
+
+
+
+       String resp= req(body,"api/v2/mms/openApi/querySubMerInfo");
+       log.info("resp:{}",resp);
+       return resp;
+
+    }
+
 
 
 

pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java

@@ -102,7 +102,7 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
     private static final String client_id = "chaozhanggui";
     private static final String client_secret = "Y54Gqy6aLpxld3dp";
     private static final String grant_type = "client_credentials";
-    public static final String userNo = "22241007";
+    public static final String userNo = "22265868";
     /**
      * 商户进件
      */
@@ -235,7 +235,7 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
         JSONObject object2 = new JSONObject();
         object1.put("userNo", userNo); //合作机构信息 由拓客SAAS提供
         object1.put("email", "chaozhanggui2023@163.com"); //商户邮箱
-        object1.put("busiCode", "PAPER_CODE");//业务类型 BPOS:传统POS, ZPOS:电签,ZPOS4G：4G电签,SUPER_POS:智能pos,B_WIZARD:蓝精灵,PAPER_CODE:码牌,WECHAT_PAY:专业化扫码,KLYX:云音箱,QRCODE:收款王,MONEY_BOX:收钱宝盒根据业务开放取值
+        object1.put("busiCode", "WECHAT_PAY");//业务类型 BPOS:传统POS, ZPOS:电签,ZPOS4G：4G电签,SUPER_POS:智能pos,B_WIZARD:蓝精灵,PAPER_CODE:码牌,WECHAT_PAY:专业化扫码,KLYX:云音箱,QRCODE:收款王,MONEY_BOX:收钱宝盒根据业务开放取值
         object1.put("merRegName", merchantBaseInfo.getAlias()); //商户注册名称 不能少于七个中文
         object1.put("merType", (merchantBaseInfo.getMerchantType().equals(1)||merchantBaseInfo.getMerchantType().equals("2"))?"TP_PERSONAL":"TP_MERCHANT");  //商户注册类型 TP_MERCHANT:企业 TP_PERSONAL:⼩微个⼈
         object1.put("merName", merchantBaseInfo.getAlias()); //商户名称(经营名称)  不能少于七个中文
@@ -341,20 +341,31 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
         object1.put("accountIdCard", accountV4.getIdcard().getCertNo()); //结算⼈证件号码
 
 
-        Set<FeesSetVo> feesSet = new HashSet<>();
-        FeesSetVo f = new FeesSetVo();
-        f.setFeeCode("SCAN_PAY_SECOND");
-        f.setFeeValue("0.038");
-        feesSet.add(f);
 
-        object2.put("termNum", "1"); //终端数量 1-5 最⼤ 5个终端
+        Set<FeesSetVo> feesSet = new HashSet<>();
+        FeesSetVo w = new FeesSetVo();
+        w.setFeeCode("WECHAT");
+        w.setFeeValue(0.38d);
+
+        FeesSetVo a = new FeesSetVo();
+        a.setFeeCode("ALIPAY");
+        a.setFeeValue(0.38d);
+
+        FeesSetVo u = new FeesSetVo();
+        u.setFeeCode("SCAN_PAY_SECOND");
+        u.setFeeValue(0.38d);
+        feesSet.add(w);
+        feesSet.add(a);
+        feesSet.add(u);
+
+        object2.put("termNum", "5"); //终端数量 1-5 最⼤ 5个终端
         object2.put("fees", feesSet); //费率集合
 
         QueryWrapper<MccReflect> userAppQueryWrapper = new QueryWrapper();
         userAppQueryWrapper.eq("standard_mcc_code", merchantBaseInfo.getMcc()).eq("channel_id", "5").last("limit 1");
         MccReflect mccReflect = service.getOne(userAppQueryWrapper);
 
-        object2.put("mcc", ObjectUtils.isEmpty(mccReflect)?"18001":"11010");  //商户MCC编号 通过 【商户类别查询→查询小类】接口获取 对应 code字段
+        object2.put("mcc", ObjectUtils.isEmpty(mccReflect)?"7399":mccReflect.getMccCode());  //商户MCC编号 通过 【商户类别查询→查询小类】接口获取 对应 code字段
         object2.put("activityId","37"); //归属活动信息 由拓客SAAS分配
         object1.put("bizContent", object2); //业务扩展信息 参⻅ 业务扩展信息
 
@@ -482,7 +493,7 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
         Set<FeesSetVo> feesSet = new HashSet<>();
         FeesSetVo f = new FeesSetVo();
         f.setFeeCode(tuoKeVo.getFeeCode());
-        f.setFeeValue(tuoKeVo.getFeeValue());
+        f.setFeeValue(0.038d);
         feesSet.add(f);
 
         object2.put("termNum", tuoKeVo.getTermNum()); //终端数量 1-5 最⼤ 5个终端
@@ -760,17 +771,8 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
         HttpHeaders headers = new HttpHeaders();
         // 表单提交
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-        //  封装参数
-        MultiValueMap<String, String> params = new LinkedMultiValueMap<String, String>();
-        params.add("grant_type", "client_credentials");
-        params.add("client_id", "testsit");
-        params.add("client_secret", "EguwEckByf2I6u6z");
-        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<MultiValueMap<String, String>>(params, headers);
-        //  执行HTTP请求
-        ResponseEntity<String> response = client.exchange("https://test.wsmsd.cn/sit/htkauth/oauth/token", HttpMethod.POST, requestEntity, String.class);
-        System.out.println(response.getBody().toString());
 
-        Map parse = (Map) JSONArray.parse(response.getBody().toString());
+        Map parse = getToken();
         HttpHeaders header = new HttpHeaders();
         header.set("Authorization", "bearer " + parse.get("access_token"));
         //  封装参数
@@ -778,7 +780,7 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
         par.add("businessScene", "2");
         HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<MultiValueMap<String, String>>(par, header);
         //  执行HTTP请求
-        ResponseEntity<String> re = client.exchange("https://test.wsmsd.cn/sit/htkregistration/customer/category", HttpMethod.GET, request, String.class);
+        ResponseEntity<String> re = client.exchange("https://htkactvi.lakala.com/registration/customer/category", HttpMethod.GET, request, String.class);
 
         try {
             String seqResult = new String(re.getBody().getBytes("ISO8859-1"), "utf-8");
@@ -797,17 +799,8 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
         HttpHeaders headers = new HttpHeaders();
         // 表单提交
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-        //  封装参数
-        MultiValueMap<String, String> params = new LinkedMultiValueMap<String, String>();
-        params.add("grant_type", "client_credentials");
-        params.add("client_id", "testsit");
-        params.add("client_secret", "EguwEckByf2I6u6z");
-        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<MultiValueMap<String, String>>(params, headers);
-        //  执行HTTP请求
-        ResponseEntity<String> response = client.exchange("https://test.wsmsd.cn/sit/htkauth/oauth/token", HttpMethod.POST, requestEntity, String.class);
-        System.out.println(response.getBody().toString());
 
-        Map parse = (Map) JSONArray.parse(response.getBody().toString());
+        Map parse =getToken();
         HttpHeaders header = new HttpHeaders();
         header.set("Authorization", "bearer " + parse.get("access_token"));
         //  封装参数
@@ -815,7 +808,7 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
 
         HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<MultiValueMap<String, String>>(par, header);
         //  执行HTTP请求
-        ResponseEntity<String> re = client.exchange("https://test.wsmsd.cn/sit/htkregistration/customer/category", HttpMethod.GET, request, String.class);
+        ResponseEntity<String> re = client.exchange("https://htkactvi.lakala.com/registration/customer/category", HttpMethod.GET, request, String.class);
 
         try {
             String seqResult = new String(re.getBody().getBytes("ISO8859-1"), "utf-8");
@@ -929,19 +922,22 @@ public class LaKalaInterfaceImpl implements LaKalaInterface {
     public static void main(String[] args) {
 
         Map map = getToken();
-        String result="";
+        System.out.println(JSONUtil.toJsonStr(map));
-        try{
-            JSONObject object=new JSONObject();
-            object.put("customerNo","123627687");
 
-            result = cn.hutool.http.HttpRequest.post("https://tkapi.lakala.com/htkmerchants/open/merchant/info")
+//        System.out.println(new LaKalaInterfaceImpl().getRegistrationChid());
-                    .header("Authorization", "bearer " + map.get("access_token")).header("content-type", "application/json")
+//        String result="";
-                    .body(object.toString()).execute().body();
+//        try{
-            Map arry = (Map) JSONArray.parse(result);
+//            JSONObject object=new JSONObject();
-            System.out.println(JSONUtil.toJsonStr(arry));
+//            object.put("customerNo","123627687");
-        }catch (Exception e){
+//
-            e.printStackTrace();
+//            result = cn.hutool.http.HttpRequest.post("https://tkapi.lakala.com/htkmerchants/open/merchant/info")
-        }
+//                    .header("Authorization", "bearer " + map.get("access_token")).header("content-type", "application/json")
+//                    .body(object.toString()).execute().body();
+//            Map arry = (Map) JSONArray.parse(result);
+//            System.out.println(JSONUtil.toJsonStr(arry));
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
 
 
 

pluss-service-bundle/src/main/java/cn/pluss/platform/klk/util/RSAUtil.java

@@ -77,13 +77,13 @@ public class RSAUtil {
     }
 
     public static void main(String[] args) throws Exception {
-        String req="{\"customerNo\":\"123627687\"}";
+        String req="{\"customerNo\":\"123676959\"}";
         String pubKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHB7j7gG3ioLnnr7bsuEXTAh/8YSxSp4lQIYGW9gX0Ikgz9JqARdg4iEnU6tgNirxA6Jdg0AWgLJQxQBEZMkwyK2ZfYgesYhlJkv6WVC8v5OkOrhA9NSQ3iS6JsYegsZO0GJSTtLQaTOF8WobPYe5NI+eWU1fRz2ZyxlWlKshBeQIDAQAB";
         String priKey="MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp";
 
 
 
-        String data="c92t6Q4X6M4lcteFkZmSTxhfW/zz7w5+TYdMHVgLVzspQMJ33EyoR3k03RSVxqFKXlfWfpeunXb0ibaHqDS1eTWuXci6bzJTA+m3wTguj8eGev9paf05GzR1hWUrj7o4Aw1foUJfhPjCnGK4bWhO7QI1MBU4qKBmE9J25w7MzBAXHHW7yFACCZguOF/xIZdz+HeP9fQ8bqGPjtnwOePEUITx9n0g7ZwcH2/tgdGxkykHy8h/gFFZ4C4BzoI9xN6cD4ESzr0dYFS6NVANUwjc5Shmeh/sye1tZyIEZWHAVZyGR8s6L8iG0SecJwHxSnuMZvCqmVr0Z3EYhEoS8jp/DjUBt2WbXjqGDwIVoftD5WaO6CBQ2AfZAtCRCvJW3Z7G3AACQ687whDRhKIGWOZO8KXow6OLkT+XwWxOzewfFvcKX79JkPwPPzaxSSH7sNQ6nlxGKZBbwe9BIPkm8o63UHmL5JKBGNvi8iXJ59ZXjBlOeebcW0GpNziK0+ExyBaKPbRi1bEonZ1tUV72TZzazdb5kEWvC6ZgAGn2gDbqYdWMeyq0WyfYAf8NBRQFSjw45V4NJfbY8UffMzwErWb3fiqceKKfP3Ae/4JRNRXKjqT0WT6k3aJpe7bb9aKh7GZKUXloaVJBuYwN571Cf+Rvif75kHdVNxOZoH+gTniid6KEWLAjBQvFevd6yvVWqnwPrPiqxU6QQp0226oxizsT2dpeOG2qMSLyWJXqTO4/N5nmtim/r2Gz06johlPYn/o45sOw3XoJBMMN80966H2ZT+1i++4NwA1swamaOXbwzim9k8Y0e39DNrTjQTiYloGt0IO8V4OS6yhtNGeB1K9OF2zIbYyk6/4/hIhwn2h+bNdjHCWSx5Y2yJAG5HAlKpsf1SL0ZblLz2BfVszU3H6IFwbfLzcB2qN2XGTY6xwQXgrF5jBc8E5S1seMlKJWwpnioRXDO191UlhktMPe+ElY9YaR74xKNCqgRHDS99MhhYHow8BMp4bA5eefQJSWK8WXeAqX5cOniAxmWrKwf2KpDt2YDR+JKwoTQi18jPc5QTvtnmaDrhG9Vd2hchSaNYsbBSmoPTQHnpf98GLtJqaG+OREnMHU3PenIL8P8Y1VHUSmyTvAvFIp9U71l6vryQ2BjNfDzemr6T6FcWagqKVUm4wV4+WP0IoGv9yAvNmUALsRRcsunqIFaGtjSaSUXpnH9gvIIlcxWGtc5uv5XkiZzJb8Wim3nUGGrzOKvrDF2oRjSTkpjnqW05bnh/2pkJShgiF1LntNwgza8ukYSr2MgeeyHsI6ztpujtw3Xxb8OUFMxeA9MGzLCKuFPXiObx77H7LGKI+hPiCDizfk4ks3uRrOAQ211aURicqjhQvC9b7F5OJJwN9DGvql4pJ0FURhyyg90VbG2SjdfRuW22b+WqDxI3QwvLHQ9oDs3PI+wgYa8/j68prKw1ooCZ2VjyEk+zENbthYRo7Ckj1FWHsoeqXG2xY9rDmtBORL4Y+rPUhuX2OQVA5csO1jZJ1WkRp4edrUzOZFyzg2jQ9RlUHYWRVD3WFDLrOn+AwpyZS4ZATKJweEc4I/qOzYTydJy4fhV6lM44yyvghsBNfy5LzAL73gBU5bRmKlt3EGKnDT+LhG/WGnWAHGbeEvzikeKuXswFG+/fgN0qmKI9neTFzHnCc4SiRBijGKaookMSogv5IGQU2ZHI3536gQ4Ry+u7qmb2dqsb0d9YuQ3vzXoCsXwhT3yoMZvViWCbT7bcykJ8ofQJo32trojjg8iQ8mchsIgX8thNhTnHldlIeXbJjfSXqmtUmZYPo0LDgq64fDk+mvWtJgQ2ksfoDwVUIhjEYRnAa4i/bwvt9zYr68vv5GLxl1V1XWSA0fCp4PPRc4Yb6V2Xf1VDSOTnlcmliSx9SgGTT9SsQbIJ5i/uRKFy0AUllA2dsR6o4bPN7Ho0J00m/2oElsSqZmlFlSJcIbpMPjNWT+XSMgYvzeyTz+1rDnAYD0skVKmx/+zQgaFtOeetLkjII3ER4FoObXgdwnpU8aCtv77XZsHoJ1jtp3oSqwBhTHUohsy16DAkxUVRwN3nqDGbOLdxQn7U9Ytnh8oZRURIJTZW92MTP2pztrUfswgIs3xGXyigvYyKN3o7iSIaZNR6J3IZz47g188zN9mUwQ71OXus5tRMu4t7Ssq1/4frpmPKoQetgxGosf8SupSjoQqtw2Fz7TqYUNsqbi9F+/9oIQpKJH45Jh2GHA24/aKQvOtlpAXWOlQDPX2R0lrIrbPLU1tEL688kLgO5aE8o1y2fFrvT8bHZm/tjj2wBnrhr6EPsscl6kK9Kt8Ngz9xpFLpONFXWfpDfXwcyEmFNpGgNhOpvJTJU/rYpGtwZ71yrru5bXKcRXXMp7MLiHNiqOT5wjCekpk62nHerEN8mUJQ9i1jEP5rX+LdEYC0tZPppFPmsUQ4/7ozZDMQWuCcMG9SuVfEZILdl3Dcf93t4rL39FNCHI9EYwLSKlacrsnwhvOTFdDg01yUGwAmaTbftQcL6ZCcsO96cpPzVP4X7oAq88SbPEpXysrg1+t6rgxg28lUASxuabdIAbax98QAmyIRR4Pe0N/AH7Kt1r/Eyon7MJNF3UDfTVo5Gc5xT02exRxTA39/A89S/g7uz2ltGjD5OPe+xe1J/nUCaA+3EcOwUPESHhxGZlyXq0wJl2JGhcUFylrAwXqHL9HmUNFEVzCYz25sfaQOPUOzLtfuF4DQk6qcAA06uFzfZ58zUbV5psq74Rj2vq5FeXOrElqEMIh4R8GAA4YPOQXohq94k6YkKkBqT2NNalnJGiNJGy0ThWBaPktCruKlpIfoaiJN/1spYxnu0LSr+xbzk0SMo6/nmIkUzArSQelb1w24eMxg==";
+        String data="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";
 
         byte[] privateKey = Base64.decodeBase64(priKey);
         byte[] publicKey = Base64.decodeBase64(pubKey);
@@ -91,7 +91,7 @@ public class RSAUtil {
         String encrypt = Base64.encodeBase64String(bytes);
         byte[] bytes1 = decryptByPublicKey(Base64.decodeBase64(data), publicKey);
 
-//        System.out.println("加密后的数据:======"+encrypt);
+        System.out.println("加密后的数据:======"+encrypt);
 
         System.out.println("解密后的数据:====="+new String(bytes1));
 

pluss-service-bundle/src/main/java/cn/pluss/platform/klk/vo/FeesSetVo.java

@@ -5,5 +5,6 @@ import lombok.Data;
 @Data
 public class FeesSetVo {
     private String feeCode;
-    private String feeValue;
+    private Double feeValue;
+    private Double topFee;
 }

pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java

@@ -148,7 +148,6 @@ public class LklMerAuditHandler{
           }
           return null;
 
-
     }