feature: 增加推送系统字段TSXT

jianshui-common/src/main/java/com/jianshui/common/utils/encrypt/JianshuiInvoiceDecryptUtil.java

@@ -526,125 +526,29 @@ public class JianshuiInvoiceDecryptUtil {
 //        String str = "{\"identity\":\"B8FB14CA1C6D7C93D9154E2262FF0F9DD796B180A2A7690A\",\"order\":{\"orderno\":\"No.20160308151221\",\"saletaxnum\":\"110101MXB6CK9Q6\",\"saleaddress\":\"万塘路30号\",\"salephone\":\"0571-1234567\",\"saleaccount\":\"工商银行6222222222222\",\"clerk\":\"sa\",\"payee\":\"sa\",\"checker\":\"sa\",\"invoicedate\":\"2016-03-08 15:12:21\",\"ordertotal\":\"8.00\",\"kptype\":\"1\",\"taxtotal\":\"1.16\",\"bhtaxtotal\":\"6.84\",\"address\":\"浙江杭州 0571-123456789\",\"phone\":\"0571-123456789\",\"taxnum\":\"339900000000004\",\"buyername\":\"浙江爱信诺航天信息有限公司\",\"account\":\"工商-123456789浙江爱信诺航天信息有限公司\",\"message\":\"浙江爱信诺航天信息有限公司\",\"fpdm\":\"\",\"fphm\":\"\",\"detail\":[{\"goodsname\":\"1\",\"spec\":\"1\",\"unit\":\"1\",\"hsbz\":\"1\",\"num\":\"1\",\"price\":\"4\",\"taxrate\":\"0.17\"},{\"goodsname\":\"2\",\"spec\":\"2\",\"unit\":\"2\",\"hsbz\":\"1\",\"num\":\"1\",\"price\":\"4\",\"taxrate\":\"0.17\"}]}}";
 //        String str = "53316a496c4a524c58424e74567fa67fbca2984d30f04309cf9887a8c1f9de11287b4c8a41b5640888243d0f9de16e335281925cf48eb07d28b241228bb27af3bb9bb21328b9967f5219cb9c7ff3f818f0dbfbb8c6246eeda7909b8057a305b9fa4c95b8c98bf67300300b6e2e3c7acbb353289bb0496125698cf5719dcbbd2f81b6627e25b040c883866f290ee75d7931bf00c0f8fd6b89ffaab386f22114275687fe618458da978b8bc3bc302fdaa3bb8c06199a877bd5fdb1c628d0c18ad1b7e9038ad88ff3f37f9c212c31a994696d910e9ee403db58c9f557ac051c4bd7b441f5ba6e53eec828191545a3cd1f82a0a9bab46cc42c271ee7d6043f35d32ee9ec9014a015333f9f0cbc2cf0db816d44424606ea4370364cccd303c369efef51870a2bfe7c80d680f3ff9a40619e2bf94e3407a5315cd3ca7086489481c4004cf8ab90ed29e1c942b275ad956ef045efa5d6950036091f02d2165a7a1953e00bbe2d0e276ba5b7b9e47f106d8addfcef2d1e7bed39ab6b1a25de650f068596dbefd6cf9be4c7e3b50cadc0d49e370b3d6d9268ee73b3d5b1fcbf253f2785743484e9fd213582b7866d58672afb8603ec0f1a730b98469355d98c05205a7b497fb91e67b85af1fb2e5c388655819af08f5bea958704eb637f00073439aa968ea345f6befce238e65cb4d753483c94f58898991d0e096508350c56589ac2abe4b6e9f901cf414992d2a1f38887d885e0cecea164794ebdbd6dde7102a70a4ff1174b8791e824699b740cdf9d8c217f667ca209bcc7a927495036ed21ce280dfc2c1eb1a740d4021a5378cf11d1ac105a4b5107ee5831b831b2f30adf79527603578cd9d875fb0d5a974ec57354ef2a8e82ec23b0172a4d56f8d50898096c6bc6e6f5ebf49f1109f756be881457b206db1905b88d8922fc78507705dec5706e6d18d31b413e55541f4b394ea6f2a906e902dfea104efe30c0f909e25cba571be6703da5f589fe488bdb810cd9ed426f3a73476128a8393e9b40c96ec430a66412be6f613c63a9e94091f87a7daa6043b1be37fa6e7cc0520352cae8aaa7cbd26dce78f2a9419d39bf1f109249d64d5f34454dab0f3c9b1466192104790a9371794c6ea73838ec6197a87c87f328bc0921cc8e0d060b1d757fee0d59df84b1116519935c16d7b89655c78eb782c08fdcc04d60c8b7df32852a90cf72a10aace001fd0d56b2036a2f614fa695c506e96859c4227e09f4ec3f05cdaabd41127063b150b825a1905b1c26bf17cac02cefaefeb4265a531de3ccc1507609717418d34628542a6a95d49e1126d590b921c360ae18896d715bb5f9770e962966e6059693d8e7cdfed5dc1452b709ee5dfc96f9e679a40ec6e937792aa9f8c9268e31ebf21788352eb98cb658707b844f859c21aa2b62d2ff247f1b2e81b49e2028bc759bf2df4e54c151650ad0147c7e9e23d0d7364db0fa0810a404412c07f13389310200b114917c42a4ab7542170d5176b927972910b359b2fdb9809ae087f3edccab738f01ea5df1a7a2e05964363194ebdcd5dcb5d36b20621f4bb0837f8c9938aa6c8250e5430b0485c7aac982b83dc91c691d0d98fe110a7a0b31b324469887659b87ea4116f5039b4419816ff6a3dfc28431fd0c00360ac9bc1536ed11f1d9fde938fd057a5b9e4a4a87af81d72399b4475d431b7c65f1ce1626e696a45a7186b01e26b1c3710df3efd098af0e396c5c117294e81a6ea1874a396736207d9c92a7db2a92c2adc5061498d11a167915a34536d38f29c2a7e5574fbf1e2d8e3cc1c621305fdf97e0b64cfbbc94b76aa66b20a82b189894b5b3e369bdb639a55ab40f7afed7840eb836bc9a54ffdd228476b1085855e883975526826d2efbbb1aadf7c10f1441e28d7d515846";
 //        String str = "543071746f37496638525641668e5246a6a424c1bd74a49fab978c707fd3b1aa3112a3134dbe42fb0108eccf0a4025cf3b173b77f6a32d0992f053062b56a60854e644add6a9da006690a43edeaf6e16ea8ee48a6eb23a6cc2da19bc8dcae068061fc6a292aa170770c050b370bcf7df2b5092b2212855ed15f0d4fe6159b0be9536ffcb32c2ec50bcbc899994b0be2d78a55b6a996d1e14384301e5676b9e2aac878eded4d7f2e19096b27662f4881123032ff8a80e096db65db55329400a1fdcd0aa8798be857020e93ca310a285169500d7ee51f527d85c4ace198717fb0831978f266fba0fc92191b6298f441cc7d6c17b178483a250444afd98f3255e032b482b6dbfe19b89067cda1d5b9be23e7b305b74cc9df481cbddc22119c84f7d59ed9286e91fd5c4187c81b9858e06354ccb384f64269c42b4f36c03ede6a2a9b350fa1bd57a61d353fa25a2e1f34bd896587824a10493fe19df3b41d22e0e2c298c4c0e827595763d4c7d93787b2e32baf6d571d0676a8178059bbeebe7dd00b76c31da713c750f00cf48034df6c958e830fada5fc57fcc728111ac3dc8fb28b3c134eb3aa1b7247085bd6eaca3461002a710209992079502a52869a0e7ad0f632de6ee118f05f9de9caffaa17467c88c3cdaea47f0a5da3925502d1cef3b67a0d0fbdc7752c975cf28ad1c92c93c21d6e3fc2d92e565f2f23131328c10a92e1843e9155b7cb01a5c7ec79dc6ab77644056bbae76696f6babad6725dcf181130733aaf4eeec7cca4ce060e2fef448a4ee2b8b970546f919538738ed0140bb507b66f7599aa2437245ac772756f0e4d6fe9a917932612082667bf07c908646148c7ca0c3d8bdd4ff0717f1226d4e321dbe4cb584dfca0669f8f00dd53d04b4e3d4114e390fecd49e3e4733f493f6097de40254b7bc0fe29ed603cb041563ac75380d8a90fd090f10407c5b4f158ef7f0690698f54ab3162aa44df33577a295c87cda736cf55cca6e9ef8b8230577b69b864557cb38de63fcfc6129d1224a002c2677460b05a6bb7b2fd9170ae6837838b843ea26eac966300f4f07a5caf88d92bc252a495fd73df59ba37d961b43d3845e1a40deeccaa82fd0456cd2db89201951bc737455f78e5dd15024acf411bf5df82db7e74b0f7f8dbe9787fa3cae7de1a993bca5ea37ccd8eba5783cfe43d2d2075780243685d8499d1a66dcc846d617a44f0d1968e456c6a4f4701a3ee77d26a3bcc030f162798214849af65e4a38bffa769354181c623238eb8f885ada17551c840d844d785b1c138664dcdb584bee88d372fb863ad3bb064ffe03c6e503c7216bb5d2a8c8bc50b3c0fd8e331972093447390496904393fc397c6dc147f4a177dd76c9ff0ba43cb8039a1d14f6ed1b165cca33a92d71af5ed26a484962aa6cbe8f906f8370adf7127c5b8a2b4d98099605c0a26735475c080fc3cbfe23a6902ea912ef813c74a915b1bb3ed116a65ccd7aa0943a5b2867b6b03eed0f30d4060dcebc791a4c46ab3e64ca583192b053a6d7aa99cf9c395a3ba155477b5e788dc28f6f431772faf192334602d084bdb908a21841ac1402649cc9c12440603f5488de41a2a9bd2e3da4ed153fa41740e94f92966c853957499f6125b88769abb0dc8e0123d852baac0ef1300f5c07ad9854c38861f8d17d9f98545f32ef4c397571d91996bb6f56bd3071df71915186ca65607e12c1241e647593cd16f637e5cb19eac64080f6917a4ce82aaa66bccd140d9df8d79f6e44d00a81d457e81f284ceddec827f1e589963fddf7c4636f033590076d8759c03e39370efd8c6740529785e594f7594f2f8bf9a5d5a4862eb9ca13ffcd2449f890359ebbca702d44dd28b4f392714788b3bc8321dcb55d9a7dc46718c84ae40711c2d8b52ca99f5d89b6d20888e9a5cf62a0c295aa566b0617ff8bf6c9e4a634ae62f4fa3cd3935315e9cc98aa98af0c895a7b0778cc703d176ca0a24abff161e193d8ac8cbe5fe469104992c7b2217834ddf77e59df32d2ce9e0f99bb6bfa89a680fad18882a3210466789356087a0f3ce9351d1aaaf667a67166a9049de4290f506f6f1bf0c5dd37b69eff7f7e8935408da8ff41c09d07f7345b23fc5f615021651f81c16f143f7e85b3c5b16f0a967964659754ec180d96a37c0854443f2d1bcbd55ea63a33b7981479588a27f033c4da5bc6900be68cc98e5c7e44b1f56b2bbe4ad527de711d3ce6c43addf740036fcb289120e89309b6c64b997f969c6937d26f6bb8245dd3c8c3af183aa12497a909372c977845d3eefafdb5523188834401903d1626cf3d5499f06af7658de591ca88";
-        String str = "843yqOFyoYmfXVBriwu6NqDfgkbt2kYQ3NMOuwX/kOPaYV4JGpFH95Qia5WKaHMXNCV4DEf+H8JJ\n" +
+        String str = "ySwm3tdYPVs2E/lIZq3nJ0VqB6dtgkebY4voEBXqX9sMXR0NQ5WZNDo3J8LCWQxQeUDQVNpY2TSY\n" +
-                "BxDlb2AfDzb2tuvOBXb3I1Jq7ozFRcGfcd0Vv9fu7ZZWXu6MQddPv/Gu6T100emU21t94YNnMi3j\n" +
+                "mWOPWOfVIm42JmQPI0eOO+45CUL116pOYI7/iJ8jfn64lQIXNgD4R4l8I/SWdz8Krcgwoij9Tt95\n" +
-                "Le2clt8YJIor9F/3whPw+sm++go2PvqupEY6fnLpHm411rFHAiTnCIue5JFipJ1r+el9+jP6Fehk\n" +
+                "qjYFNcC8RxkUud1htUdjbhO08lTYWxWggP+PlwV/OvWdVCSqcYxHamo2DZr7LxTZWVEDvwUs1XMk\n" +
-                "USineTXaTf+ekudEDfLDAcL2+D1vnQL6enHZXGuQMMfWBt+IVt42D3+fBxoBGIBJYOtMwst7j49p\n" +
+                "EZdjFxW31bIbR4C8yp23Np8pVUIwPIbevtBRELM3eoXKQ9qxeiEPYCiroYQLCb46M9RUyKZ/1oxt\n" +
-                "P0K3CWlml4quFbSND6zhOk2IYq+/RwHcoYyuMbBY8i3D3IVZu5L4HXtRETjIH7K3ggZb1gNtWP3b\n" +
+                "PjFQYimgbMqhrFsTsHD9bLRXmAidRzbQxI2rOAHMajTw6bPEfq25Eb8t9vYSdglh8xlAxzfljn5m\n" +
-                "KX9bZ6xyrfZmDiehu7LYYENfaF2MJXExgi8kLeqJV4iFIrxchofeQqu9mw1e6pAtH/kvqhP8HPw4\n" +
+                "GZ8mM3GnP4zdweRoTIgQoDsE2GsoX9IAKSOt+cZBW24UEBdIIlqdRINnJjx3IDcfo/brCgKCF5Fa\n" +
-                "u2OyZRGdGHxGIXR9mBDej/jceT+nEQtm50x5/IUd7Wk6DIKP/oy++EsSlLZzV0vmLrG3qDBNQRGm\n" +
+                "HcUYvq1SzNEjDQRrWRQX5NWidSj09Da+XSMg9gLd9ywzWdkGM/dW/dn+vge0rEjdWvhLzZNoqqwv\n" +
-                "9gZ+1YNTEV5xLW4p/OjaP8yoZMb4rky8AVXrWw0wQ8SdtuTbjDxlq3lPqgkaLjFrDyJHcXEZD8rV\n" +
+                "SPZU0ir20OSfA9VL8cdAxX+X0qvnsi8Em475qDkyEeBQgWgIqmsoXEQc7ffijbLoCn0J+LdqxNwF\n" +
-                "ntxfXGpk+Dc9+GZxDuhvOHk3Ss9BNCdH8IRwfPvvopfdd2iQ2vyj9+A5a+vkfZgawuSPh4njIMhF\n" +
+                "S4pn+Hi384WP2j/Ux5ppFb0bxAc7AxZ4b1FXbAkffBrj52QSNYhcQ0gy3rPsxtgqqe4PSCQnPqHb\n" +
-                "fDyJj/aXpmzV/CSrUD2H6CNDaMeyYUmT7ZS8f7a/OyvhJ8K04MNLmnh7XdtrqmOJJgxZGC9X0267\n" +
+                "IJfChgi8zZyCD+t9Ac8A57IYoMtf76lQX3zVIimqw8oyOJY0wvBBJBJVEvncK17wJlk4Hqdz4LY1\n" +
-                "rh/LxcZ3Ktgcv1OszNWtQg7kYV2Ki+ds/x+ZAw0LLNKhZhAGEzxGbZ4eLU5c0orQnEdDSh0n/TZN\n" +
+                "X+HWk5mSOxv8SA9T7Fe4HHaIGoc3VxCF1eNbKIh6JxVXE4Fh+Zq/DN5sNh8OoucxZf/URe3zzBhp\n" +
-                "hGDndtvUhQA5JzWpP7rlgUn5DcjdjH+CGTXEKrtGm9IRh2z8OwMrQXPFa4e9tdBrO/yqiUcdLgSe\n" +
+                "oB3vjcsUDydfbFI/4ZfmMUxMp7EQM8/zNG8a+UEtmdf47aAL674DzRrf19sj3ywbG8ZJR7pXhGSV\n" +
-                "/W5K44eEtv6k2QowBZEtDvmMvikbwpV2vjRwcCu2Ijkl7IZoM1Cs+h0GEegynxnt9irB/0Fcf8xb\n" +
+                "PjirVxHA2mj9ceylYc3dFP64STE6uvgaiKppG7m3n1IbBFpJUpEQuMu9hb7TDNFRCQOpASHI2NiP\n" +
-                "AhYWn+a8XppQjy1gKdCHiB7GIsEZdVX8ZHmw9nnttPgwBPJZWQa6SXWh9SCw4zUN1cSgeS6vQYJt\n" +
+                "KlQ9M00gjQW9cbeWTIGnGoRkG66sEwZag0i0UV57Yd1H/QZKD+t5zLwlwV/nr67eVI1ML8PqHTF6\n" +
-                "7bTsYGr+shi3GAxackR6tiACv8qS3J7WUXkPYzH5F7pLOj47Yom9jCNDx5JHwMX2CxNIAj4IOCCb\n" +
+                "EH12X6CtwajtnEI4AEm4z0TD3fJ+M38OEGUhtOazr0NnTeVagVObmjAWK7OgwfG7NVXutdjmJjr1\n" +
-                "TESh4bn3aaTYBEP9V1OHHRMInVfwsMB6XOr5SyVH8CjZI/fR20b1NPVN0XUbFvGFX3lSKA1ik7eU\n" +
+                "UCJT65mZNcZ7WC73Cf1Gj4GJ+MK2YNXR9LZp5iH+2it+d+QHlJi7CrNv+sAniWYBEKeFqISsH9cq\n" +
-                "v+JsDUtZU9Ukg5mRekZN8LC9ji1D76LBJTLG24cZTGwS5ZY0k+SmWO4E2rQTGSTXSmVIaA+sPugN\n" +
+                "/APKWyRTRnUZqnfxQgkNXknESOP59IElMGk/Wv5utMsigidfji6VX8kWS92W3mjXCyJgiKnHKjqR\n" +
-                "KZWl9vmrSkwY3sY0F47rwZDQhkBBjA6NH51KfKc5Vprm+MGlnIYWXRb0rWugfsVAx8KVwBE7WF20\n" +
+                "oB7sNmBFTijKAQQWzGkxQJvsSnTjZLUvuez0SEONbthDiWSNEluFEaMCABZiA/329Z0Zg4Yp/nUS\n" +
-                "sUdVuCY28FhPNSH2eASfk+EgEeDSlqcf9eO4CCBiW6KwNzsGUpPcTSKYSzr/tpwzt5iKMQogBVkg\n" +
+                "Ft8SQH60T6YljvHignCbQtGyj7oqjMX28mqYN3M53TjADeov/LT2WzDOGYr7Z1WNSXxwmgW52C/t\n" +
-                "bAhGbQ/CBH3LmQy0ncZYmcGJeDGZ+Qf2Xi4HhJckY/ux9YmCedBnyA/iTLpdxJAlVEVnGvQXvzxk\n" +
+                "1p/C9LpsYLyFzEmLWrRd0g/8QmOm95wFdMtzraMDw8BibY4zp/ICdok6q2vgeofZ5d84o3by23ne\n" +
-                "aRIy0wea/xpRo6F00/USkla8F8m+FWo7KNpe0jTKUD5y5NXHe3BVEUL05T+A6odtFEYxPB0KqUYJ\n" +
+                "mtFrBQ+uZ8VlqIKvlm6HtSCiYNUjTcTAu0LnATeQXvGWNkZKpeDHtQxd5NQnhLZcTRuZk/iQd5uF\n" +
-                "woCC5zS0ays6P1R712nP6lHiTZ7qUiuQtetzjlyxZQMZIFfbfY+2dCCfU+cqP58KVke9+nz30RAF\n" +
+                "ok/pZaeDQLTMRUoCXqs7biipRpND5a5YOzLA+rN+9EW+TjOyE3GM73kLjw==";
-                "VX1fJ0aCjPZ3DpAFg0CjUBbNZKxTTU1Hg2aIplpxDAx9HG2bDck6FtIVwnWS0ijpHIn1KwzK3Q/E\n" +
+        str=decrypt(str,"RzVdCHPvtOPvub5T0xbs6A==");
-                "eRWN7Wfx+2GbxP976i7yN8W4B5W4tABiq1lbrYqpBQW3xnadLTNfKu4stknXU9weCbRRHdkFMMpG\n" +
-                "/MKN8ulVfyy5idmqXMlfdBVNmuAAnw0lELQkdL2lRCJsgHJdRY5HHBEhLw9utreiVgt8lis57gxq\n" +
-                "U+kXBGObea0lvFvbCEYd1LuuJqrGPWkZL9a5aa/sCzy6jfwuMBQqz1unNd4HaEMBVsx1JSYovD8C\n" +
-                "7OLyCZKTl/e+5yg/EwPMwdqyfkn+dXP7b+GhIOS0VWZOWxoUKjqfo+LA+fZ2peLLh4skzYWl3i6n\n" +
-                "lvYWj1Q7g1LiAJkdpocf34YG6DwzLKg/vFIm92Uup5ZzJnkqR3RFRR9m3Un6O8I5Ez85cjRHK83D\n" +
-                "i8oAYPnzoG56/fdoKk5vlZdhWfsci1UeLMWRCn0wggWV3TcfrGMDHjpllIRVDaoax4sLYiIBiqqh\n" +
-                "AtQpjVTYQlVdZ1U55sMbdtQ4zz1pM1UCbamFeFJN/fqON6be7EegYgoa2G6/ZR6gVRvXslOKnlEW\n" +
-                "+dlY4S6z+FN8B84occ87RJTr6YXH+brupwtXpJgEXu9IAeK9/iU9mtv7nei5ZWBrrJrQCiE8J8Hr\n" +
-                "YbBg5zgr2TliNN4KvckRt51NjrO4RjB9tOvR+aUsD20Qc7u1jBz1ChhLVrOKkAIvptfxRxMN+9UV\n" +
-                "AItsFrUnFygT/DDFD4yVqJmTa6fLJFSiZah2aAz431fjjO2nGvI13lU9jQINFM+KAR5XXf7TBE5U\n" +
-                "xYWYHGkW1UGJavwqqTysxGwY34PpU8DaHPikGJF/eW8lr1TbRKwJwFWb3BUHO+/XBzJRxlc2xwgQ\n" +
-                "028B5TaKY81qSch6V2lttmy/EECmiFZrbRqvI5S9cSO+WTR1yY74YuC7sZJ5Wzk4N6ufYAznThX+\n" +
-                "6juXZW9IclFow1CUD1cWIHIUgZObxzm/MITmKUCJkPBksD08r0J/pay2vktn0BIlE3jr1SqamfNX\n" +
-                "qDCaaqxm9FEOpnygHsCdyPKQEvjZR2q/6+n2cT3xMJtGuNBO9DQH5fnJX0/lhcczj73tGGJTNycx\n" +
-                "nv8+OLhCQ2ip/IyKepwR+RntVpXDL6WTsqUfYAUnxm1/yE1NKatA2OYGAwLmFsnqPSdaU2XaylS+\n" +
-                "xHbrNRMhnB8jzHu6u++ku3EmE9CgZQg8YzcnbkIkedaCDIcW+MJf9QUeETyM4Y4QmEjL7y5dfMjZ\n" +
-                "1NX/Wir9d/1RScgcrMsJYKoedhJ9uwWU+OqUXkEHbw/UnYLlfNhLwfWWMojElb9mWTi6uB0u6nWb\n" +
-                "3Aze0OvxoADe4oSTWGzo98x74kKXnBj6k1nW05HppltkjjQavaqrSyWImLDSUS+u/bxwvIheHPzu\n" +
-                "U8IqHIMwksOJh+Z2YiFh5tP40i8B76XsFli0pvpFe7SZtRkDdU5tkw/HJxHzOglF5OXCTqmxuk/J\n" +
-                "WuMMiDDw5X8/9yrBObJBr9NfHqzjAICXPMeFjS3nsBXBKvyK9xAbFOzfjTDsqyS0HwUTug5m3Q7V\n" +
-                "aEP8FmDrOFNFsaDuDAgjs3xXFQdn6ZmgoR1pusX2Ix6SpvR5lK8DKihOZ9JMrl/hytVIfE7wyAWu\n" +
-                "iMClhH8YhC1Abl8r/Ltkdfif3vUckkTwA+NfUL26KXa6Qh7uuptYUShlWu0WkFUPKLV0Ty38rimI\n" +
-                "BKEKwJm7wC2pPoEDc+GYI37wGdrJZvqj6/M2BOWzdU+bOz6JtyROmEMZydmgmxIS2f2AaA0c27OI\n" +
-                "E26ylwgJv0GamKwFvuSjuPLCRfpcok1kBFUGc/wB35flbnJjdJrhXlMOsOYHt65FL7mqoweCuVJ4\n" +
-                "3V2wOeH02ybXOkmzPdVtnboMlxZaWrTMAnVdGQdt+kgPlI+i0Q39Ib7iP87Vp/9uioRix28/C7X4\n" +
-                "2Ia2CJgiHx4uhmUbYKKFy7iBixLJdbaXwa+scRUPEQAj9bAkUGXmmb2R8iJpQ0fljAom25THDfuT\n" +
-                "NtIZULAZcEwo7OIk7LAwi/2vRkPs4mJccOrSBiS05Mh4bboZJfBsFZ1tsnOGxDxziHI696UxjacW\n" +
-                "m4iTv8TFm90w28ngJXBM4X9K0uDZVQzRzRp7zOyLiRhs5Ru0R0QRlA7ugS1NlmiHoXAGrCf4Wtcc\n" +
-                "uYL10+BG2fQNz/441A1vZ45HImUbk2TmRB08UBKTxR8i/OnkxcnCyXP+Tb/hlqFE6DbK/Lwhxd7R\n" +
-                "TJI2DPsx+uj0/VhSqeeXyDcN641kHbK8ZE4IAgpo6ZEjAdzc48dShjcZe4g0rJ8OhJ0lmv+Pp0cw\n" +
-                "fPzCcDJiytZxSgPVM1OkW8ktl80EIawEmGuvuPjgU7vRK6r+Nkh/Pc6rAPm5gKdLE9woJWtE7f74\n" +
-                "kQRYy9A4y+afxaywaGLtcaktLSgmyjRd68cfriiMF1qJuzozhmZsbWIi+7yZcwqlelvHX2PEQLpI\n" +
-                "pO33YcQTuCEl18XBB3oFwvGVmdZf4C4s158XfpBzAYCjjP9NCQNPCHAt8tm84Gpsm3151iwz7XX3\n" +
-                "fzFWw2npgCyIgvUTqZ3PugzJr/qIRHk7tg1NbGBFBWGrw7LizzxRsi9laHtoFapiZySAwZ+EZWcg\n" +
-                "bM1PMGsLZO5QInIE2zFIWOG3N5poRSFJlp9t6QM5fFKXv3JZuKlZ15FHIPnItAjMrO+w3JO6USoc\n" +
-                "qSPWNwgYNRFNYhSIA5yv3OuJwH4E+2ZfggrcwK0nl44yk35euf/vk9T6/QTRU8OFM7mGePVT9/a9\n" +
-                "fUOINX4++On2IPT7oFTkJGXJ0TpdOpfZJoAHu4Nguyutq3vb3jB/fRh2kKsGq0PHzPuMPOq8QNDa\n" +
-                "xIiuLtyADWmfgX7EWJblEKgPA/H+r73NoFIAkIssdIw6s43rb4uRprqkdJtwSBQeyAGFKjR8IiA4\n" +
-                "ZduykP5sk25sY9IoTY8vKBg5DNFgceOR/DdsYADYBoF24+koKVqZP0cKwq1G0Sd1cLmt2oqLlEWk\n" +
-                "wl00OV/JGsKzHjNL/JzrnXrFfA69LyL52as731ibL/FSkvmCOuyUTXe/sqzOtPdHrOXfUQ4bMeYB\n" +
-                "XlQnTiN4b32MyOCTjQNAzTbYtHUbAgAo1QypIrSguUtUvd+kh76zwa0mFpx8WNjkH9uWxwOWbTzG\n" +
-                "dnSXRpzfWNDtKBAyEK24xQCcbaNhzeTVfj1wLH4A0GGvOctMWbBi926P+aVB1BFGiGb9jl4rrBfL\n" +
-                "bbgJswl3nMq5h+VWqk2vex/sW5l85jURpovNNpdUY0ECrq+XoRy53WkO3MzLDz/LwRNi/I5kS6n/\n" +
-                "ZKLFR3R/IMNWWyMNdUdAcIYXw9EzE+V99rOn6MhcFXIAwtnGVBXS1JD/zEUfBkf7AtvXXPElsQI/\n" +
-                "hTvU3jfPiNJyzFpC/DnSMJr+Qq6znaDjN94bm3SR1nmI+oiEAYvrS2nCaPcWAPpJ1lc+HdwKfKM6\n" +
-                "9QVMjemoibvO9AEKFCgeOpR0/c3YtFs9VqgsrdcBGbAPxKg6RIg+sCW+2MJNeWhHTt+gQiZPgaep\n" +
-                "dNXB7nhLu5hdOtNVJ/upUJx5PDu2i2HDr0+MFtzi0YGPWQ/YqlLxddRLjg0mZt5Xh+Cpeuqof3AK\n" +
-                "7qP3KxAmfwzg4t62FaC0rTXwhgY6rTGC0WXiALG84p3eXL5a4Ob/9BzLyZnKSqc60pcm/slD19yY\n" +
-                "CazBM8MuCrMk1zz1N0GSCnEwaTrclH0zbuIFsugRTTNbSeWRK2Rjyj2qZiFkcn0WTQheerZzwMvJ\n" +
-                "Rxbqie6zFRgKDjkvgJcVk8blR7yftn0zcoYPkIyolbIaAdXyXZWAcAcYzLU+pzTbTMdF6p6RDENS\n" +
-                "Xxr/jgoU/7AnebXEVj7Z7ME4rXH+mlrBbHY3lQ4WcdKStsGvFpc+EVlfB/lAC5LgvoxFayLylZNQ\n" +
-                "0WNLud+3TDysBZ+QhBB6YRF4AyHP/y0l5TjUkR+iRoYu4B85JXCPm5g7k4ab575Dz3f32A2gKamW\n" +
-                "ajYGA7I1UkattEio2lll7WlZjEwy8B+4D/HG1eU41Os66oCOX1Pjh+i0iDSqec49HX5jteiD22Pd\n" +
-                "TuLBWuLLC0d0nrg1JNCqgwqkxiU4ZWHigOnnHjC+vB9S67yoEpLZtcv+L8kYUsC0rl0VVyHwao2+\n" +
-                "duKZe+cSlvuG6vs7S/3IeAT0Bawll+EefrCWSkdlpp3tM9EmFE/FdU3yupy6/2GlRZVC4Ec9Sn7m\n" +
-                "n321dF1XWtVmcW4T1JxLN8L4b2+FOc9MYkpPZ9TddYLiALVM3Y5lXyfpzwwistWj9zr68/+X0uFS\n" +
-                "zIZro7n+WzgyJCLmfvRN4eLP1eXchF9gXuZHpTzZ7XImcyTdPRAGB0+QFc1ldpwR9D6sdn6v7ivO\n" +
-                "CMTpsbAhkYUysSO6gIRHjwuZNzjP26k0ZxWXzv8BmdQwuRRbr+34de1Yjnj2K2FkYeHxnT4snJzf\n" +
-                "OBYW+O0hOdNw+FPjiaIhayG47YA+djAADWXB2s48urZmlbd9qBt2LU3/S8m8X2LG3mP9xdlZup7I\n" +
-                "NQgPIzD7f/i91YfXuwznY+V9XD1cOL7dD7cuy3mbIkJERvoCjOQW45NMe3ABigJrQ/3z0pfBdz9k\n" +
-                "ek1xXvHBL7jiexBZnig6pByIiTGHMQ4m4nwW0gRRsz+fr8VGOK+xvNfdkSiV5XNA1wQ3v2YLoBFB\n" +
-                "Jf4bS5MDZIzjUrzBzqaboKSk5Az/T29a67g0pLLDKunRqJtYEXfPezuytrPHnngnbIcBA7lLVj+P\n" +
-                "gTzPpyUvSzt48AvpuWLRJ/k2XFIqtJSQo/72LyVtiXHtVhrPWBeAJpnNc17Il8kW6C16VjB8vFqv\n" +
-                "w+uYwy//f2n87N1Y0XhC4IAf7nYVdMvISLYuZQsK0VSvkLhZ+V1Pl+UE5UpxOAMnOS7TzSFa/JpY\n" +
-                "g8kW+ZdJaFPQG5ZbQvV2azcBIE8KkmneUjQAVPVMnzKvA5w5vNYA0oi9DV3U7lrzEckjIXzvb1rJ\n" +
-                "R2SJWrt5i9t0VYYvmQf9YJHEuRk+cZxaWacEJpGA5pUf1u2ZG3ejJ1Su6gREBZcCUPSX3zk2Vx6w\n" +
-                "ghC1xd7APXD2Xqn+RuNyEki7gbBr+YkNdkralbyGVvLF+ogkUweU+Ihe6XX2MGjDvkK6llwdaQcs\n" +
-                "L2BjE3p3fZsyMy5mzf03PT0T5rEQIeMNUpdaH1L3iAkzggd1LOmQ88VdRfxtB0bRO+B9O3wYIt48\n" +
-                "+7xx7k33HWjrH9xeRfTYs5rmAASQeFvVZcDkYBBNc4z9xytK7CrK1NUX+TglBPlabV3B9pPkJZqq\n" +
-                "wBNQcpZUxiZoo2kdGmMQyagrUI5DCh/mnmr81T31JEq1bZAdUjkPDyZ3C6tNA4TpirolvM0OSX9R\n" +
-                "jdrM0aZVB+siX4WU6Mo/Gnduy/iB5m5zGuiTyP59FjVHH6sgP2g9QOrkCQmu+DxdqFTVshCtCjHT\n" +
-                "RN+uEpvNKgwgSzcOPPs9WczhMBgB/b2cLIqdS/I2uvEBoNkg0PIat5kyY9KWd78OOt+uqsrhAwxX\n" +
-                "Pg6wTP5CB9MHH2Wuknlnwn0J2S5xAkozSXWrYYyBAdKxAsvmgw8+HMgTv78Dk+EYfQxqybvONMN/\n" +
-                "t3a1n4zZmSayrVzxKd2Nl4oPmcosaOjuPQx4FHixdTvVPXb12u5lpeyfMiArTS5NcYy2jlOOHLrk\n" +
-                "k7ktbEgumcRMvZ4OXrj6fT+50Pxrulbxw02U371SF3rtekCtJJfonI5nU8VXsv78RX8zrMaXzViD\n" +
-                "GaV/Kvn9e7wg2abiL4hjMq2raAVXaUXJBsDUMNIWhPk2zGwmzDke5GWcDyWTmf+hDnS6DbJ1WY32\n" +
-                "LGcY6sIm4ElRxutHD1zCJ/Zzx/fpBgUXbRc8B8oppXoR4BRRZWvnI6/iXDlIojAU4iFMxe5sPkqi\n" +
-                "ZEuf4dgelXHjxhlxWGjI4Y8yVSnE2Zw8KtGdxCBp+gY9cjsfCOHBWaMJE4+Trm3eizmeAPxNbJGR\n" +
-                "NhWnEfjzLYCVMk4O0WxuqmWGcmMd2wlGp21hohZfO49lmLUPONkhv41ZBz7EQDI2wtQrI93sYyNC\n" +
-                "f2G2LZKnIwwBh1F/S6vYm4L8Npq0vOY7k0eTVASJUbS4CikfB6bOjG2OuoiXo8JTValTDBV0JW2a\n" +
-                "XlYBVfXqyPirYL6zldSxtLrKo2i/zYnuuxyZCQC41yhZhYC3nt1mqy1OkYDGuDQVmsqVwoqY+UOV\n" +
-                "fqV6YGECOVC5jhS0cUsBefZmGifrs3nIULJOWpmQmj3zuSwlcmvTfYmxvrXagxopEAp/ZxYqDSRl\n" +
-                "5aCyZCJdbzwHpOGPfTfQlP13R2LDc1t5C7lRps1cHgcc/sLbdgRmaVa+ME8LRzTsec8iaaNQuxAg\n" +
-                "ij8KFzOkYNXBkKle4CtMZHFqTGYZ4BA3zqpXn315Zd/LORBHibsz7moZbQBS6QmWsYXZ1M54z0Yn\n" +
-                "MUFHQ+XxspA6GQ2gj2l7m7nz0rMBQmpZ/V5v4S5rn54PyVI27/rJX7hZu4PXzajYithri3icapeN\n" +
-                "1kl0Pfhn5/+AyusyZeKD3T5VoTmULcDAh5/O7BUzuWLs7+pyFcxcvQcx97AOrN8pIEVqOGpl9giB\n" +
-                "k1ApBHvfzi8UD8gI9wjrdWZgTfH3HYmJmE5LWghfyxLPK6+CR5NRtMVcpM//NM8Xx5T48pusRXV0\n" +
-                "HZvs19VOMwf9BkZFpcep17zpYrp2k+5pNzWjEXhbXWQU0UV6YbyraS4+G7v54djDCh9D/HbxTech\n" +
-                "DCznf0zc8Rw2p2YyTzcXoYciHEoN5Q2cYAU4EKnMMt9tsMsjsJ5/HNpBv59ftgHpPCHzV2BNSpNI\n" +
-                "lTAGdNHi5ftDW+lgPvjZ/9+hozb6s46SFvSOr0ki21uWiZaBLUWcdcjqxw9zwK2khSI34RqHLuYX\n" +
-                "+s7EvU7hVHu+CLGbKLCqpuyFep7FUSZF9ikzO2EldNjnyBWYkhOjBsYrWDekvv942PLNaoOiCT9j\n" +
-                "/uYa2nGyg/Q7F0hfXA2Ou4Ec/jaMZFKZJE7ZKV6p6XFZOpRE/SyGpgO8Bm035JAbC/x1sAHv2pnT\n" +
-                "2A+OpF35cPP/usHF0H9Sul+LMU46dOZ9hrwOiMTLXJoEWS0tMDscSMFev8nS958ywn2nekxTk7zW\n" +
-                "66YCsvGJf+8PGpZ5FBwmBn2xXDebrbUA3RmgEyfJnFfdfoWgfXOHUOAJbU9q2+Z97Jbu7pGF8N26\n" +
-                "hpbeEw/WT8zKswZWMj/tQcQqKA==";
-        str=decrypt(str,"Oe/X4RZjob4jscnNpm+7ig==");
 		System.out.println(str);
 //		str=decrypt(str);
 //		System.out.println(str);

jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/InvoiceMapper.java

@@ -100,6 +100,7 @@ public interface InvoiceMapper extends BaseMapper<Invoice> {
 
     /** 根据客户系统订单号查询发票  update_by 为0的未删除的 */
     public Invoice selectByOutTradeOrderno(@Param(("companyId")) Long companyId, @Param("out_trade_orderno") String systemOrderNo,@Param("update_by") String updateBy);
+    public Invoice selectByOutTradeOrdernoNoUpdateBy(@Param(("companyId")) Long companyId, @Param("out_trade_orderno") String systemOrderNo);
     public List<Invoice> selectByOutTradeOrdernoList(@Param(("companyId")) Long companyId, @Param("out_trade_orderno") String systemOrderNo,@Param("update_by") String updateBy);
 
 

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java

@@ -223,6 +223,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
         qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表
         qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输
 
+
         if(billInfo.getBdcxsxxList() != null && !billInfo.getBdcxsxxList().isEmpty()){
             qdtxx.setBDCXSXX(billInfo.getBdcxsxxList().get(0)); // 不动产销售信息
         }
@@ -469,6 +470,8 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
         queryBody.put("NSRSBH", companyservice.getSellertax());
         queryBody.put("DDQQLSH", originBillInfo.getSystemOrderno());
         queryBody.put("BSWJ", "0");
+        // TODO kk:2024/7/8 寿仙谷定制 不需要文件流
+//        queryBody.put("BSWJ", "1");
         debugLog("断点4", uuid, timestamp);
 
         AjaxResult queryResult = null;

jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java

@@ -376,7 +376,7 @@ public class InvoiceBackTask {
             String callBackUrl = secretIdProp.getValue();
             log.info(ZQ_BACK_DXHY + "发票回调，订单号{}，回调地址{}",id, callBackUrl);
 
-            Invoice invoice = invoiceMapper.selectByOutTradeOrderno(Long.valueOf(identity), id, "0");
+            Invoice invoice = invoiceMapper.selectByOutTradeOrdernoNoUpdateBy(Long.valueOf(identity), id);
             if (invoice == null) {
                 log.info(ZQ_BACK_DXHY + "发票信息未查询到，id={}", id);
                 invoice = new Invoice();
@@ -398,15 +398,16 @@ public class InvoiceBackTask {
             IInvoiceApiService invoiceService = invoiceServiceFactory.getService("elephantV6_invoice");
             Companyservice companyservice = new Companyservice();
             companyservice.setCompanyid(Long.valueOf(invoiceBack.getIdentity()));
+            companyservice.setSellertax(invoice.getSellerTaxnum());
             BillInfo billInfo = new BillInfo();
-            billInfo.setFpqqlsh(invoice.getFpqqlsh());
+            billInfo.setFpqqlsh("[\"" + invoice.getFpqqlsh() + "\"]");
             billInfo.setOutTradeOrderno(invoice.getOutTradeOrderno());
             log.info("发票回调invoice.getOutTradeOrderno()={}，invoice.getFpqqlsh()={}",id,invoice.getOutTradeOrderno(),invoice.getFpqqlsh());
             HXResponse resultDxhy = invoiceService.batchQueryInvoices(billInfo, "fpqqlsh", companyservice);
 
 
             log.info("发票回调id={}",id);
-            invoice = invoiceMapper.selectByOutTradeOrderno(Long.valueOf(identity), id, "0");
+            invoice = invoiceMapper.selectByOutTradeOrdernoNoUpdateBy(Long.valueOf(identity), id);
             if (invoice == null) {
                 log.info(ZQ_BACK_DXHY + "重新拉取结果后，发票信息未查询到，id={}", id);
                 invoice = new Invoice();
@@ -415,8 +416,14 @@ public class InvoiceBackTask {
                 invoice.setMessage( (invoiceBack.getResultMsg() != null && invoiceBack.getResultMsg().length() > 200) ? invoiceBack.getResultMsg().substring(0, 200) : invoiceBack.getResultMsg() );
                 continue;
             }
+            state = invoice.getState();
             log.info(ZQ_BACK_DXHY + "拉去后查询状态为，id={},state={}",id,state);
 
+            if( state == 20 ){
+                log.info(ZQ_BACK_DXHY + "20为开票中，不回调，id={},state={}",id,state);
+                continue;
+            }
+
             try {
 
                 log.info(ZQ_BACK_DXHY + "发票回调接口，发送数据开始，id={},orderno={},callBackUrl={},param={}", id, invoice.getOutTradeOrderno(), callBackUrl, JSONUtil.toJsonStr(invoice));

jianshui-invoice/src/main/resources/mapper/invoice/InvoiceMapper.xml

@@ -244,6 +244,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.company_id = #{companyId} and a.out_trade_orderno = #{out_trade_orderno} and a.update_by = #{update_by} order by a.id desc limit 1
     </select>
 
+    <select id="selectByOutTradeOrdernoNoUpdateBy" resultMap="InvoiceInvoiceDetailResult">
+        select a.id, a.bill_info_id, a.company_id, a.system_orderno, a.out_trade_orderno, a.fpqqlsh, a.invoice_type, a.state, a.c_invoiceid, a.fpdm, a.fphm, a.kprq, a.buyer_name, a.buyer_taxnum, a.buyer_address, a.buyer_telephone, a.buyer_account, a.buyer_email, a.buyer_phone, a.seller_name, a.seller_taxnum, a.seller_address, a.seller_telephone, a.seller_account, a.message, a.clerk, a.payee, a.checker, a.taxfreeamt, a.tax, a.taxamt, a.origin_fpdm, a.origin_fphm, a.jym, a.qr_code, a.machine_code, a.cipher_text, a.invoice_pdf_url, a.invoice_jpg_url,a.invoice_file_storage, a.invoice_msg, a.invoice_result_msg, a.product_oil_flag, a.qdbz, a.c_ofd_url, a.fjh, a.terminal_number,a.deprecate_type,a.deprecate_reason, a.create_by, a.create_time, a.update_by, a.update_time,
+               b.id as sub_id, b.invoice_id as sub_invoice_id, b.index as sub_index, b.good_name as sub_good_name, b.num as sub_num, b.price as sub_price, b.hsbz as sub_hsbz, b.taxrate as sub_taxrate, b.spec as sub_spec, b.unit as sub_unit, b.spbm as sub_spbm, b.bmbbh as sub_bmbbh, b.zsbm as sub_zsbm, b.fphxz as sub_fphxz, b.yhzcbs as sub_yhzcbs, b.zzstsgl as sub_zzstsgl, b.lslbs as sub_lslbs, b.kce as sub_kce, b.taxfreeamt as sub_taxfreeamt, b.tax as sub_tax, b.taxamt as sub_taxamt, b.tspz as sub_tspz, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by
+        from invoice a
+                 left join invoice_detail b on b.invoice_id = a.id
+        where a.company_id = #{companyId} and a.out_trade_orderno = #{out_trade_orderno}  order by a.id desc limit 1
+    </select>
+
     <select id="selectByOutTradeOrdernoList" resultMap="InvoiceInvoiceDetailResult">
         select a.id, a.bill_info_id, a.company_id, a.system_orderno, a.out_trade_orderno, a.fpqqlsh, a.invoice_type, a.state, a.c_invoiceid, a.fpdm, a.fphm, a.kprq, a.buyer_name, a.buyer_taxnum, a.buyer_address, a.buyer_telephone, a.buyer_account, a.buyer_email, a.buyer_phone, a.seller_name, a.seller_taxnum, a.seller_address, a.seller_telephone, a.seller_account, a.message, a.clerk, a.payee, a.checker, a.taxfreeamt, a.tax, a.taxamt, a.origin_fpdm, a.origin_fphm, a.jym, a.qr_code, a.machine_code, a.cipher_text, a.invoice_pdf_url, a.invoice_jpg_url,a.invoice_file_storage, a.invoice_msg, a.invoice_result_msg, a.product_oil_flag, a.qdbz, a.c_ofd_url, a.fjh, a.terminal_number,a.deprecate_type,a.deprecate_reason, a.create_by, a.create_time, a.update_by, a.update_time,
                b.id as sub_id, b.invoice_id as sub_invoice_id, b.index as sub_index, b.good_name as sub_good_name, b.num as sub_num, b.price as sub_price, b.hsbz as sub_hsbz, b.taxrate as sub_taxrate, b.spec as sub_spec, b.unit as sub_unit, b.spbm as sub_spbm, b.bmbbh as sub_bmbbh, b.zsbm as sub_zsbm, b.fphxz as sub_fphxz, b.yhzcbs as sub_yhzcbs, b.zzstsgl as sub_zzstsgl, b.lslbs as sub_lslbs, b.kce as sub_kce, b.taxfreeamt as sub_taxfreeamt, b.tax as sub_tax, b.taxamt as sub_taxamt, b.tspz as sub_tspz, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by