lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/controller/admin/SysOrderController.java

@@ -113,7 +113,7 @@ public class SysOrderController {
     /**
      * 更新订单状态
      */
-    @Inner(value = false)
+    @Inner
     @GetMapping("/orderStatusTask")
     public void orderStatusTask() {
 
@@ -123,7 +123,7 @@ public class SysOrderController {
     /**
      * 查询订单是否首冲
      */
-    @Inner(value = false)
+    @Inner
     @GetMapping("/orderFirstCharge")
     public void orderFirstCharge() {
 

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/mq/RabbiLhbBindQueueListener.java

@@ -63,7 +63,7 @@ public class RabbiLhbBindQueueListener {
 				channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
 				return;
 			}
-			if(notify.getNotifyCount() > BasicConstants.MAX_NOTIFY_TIMES){
+			if(notify.getNotifyCount() >= BasicConstants.MAX_NOTIFY_TIMES){
 				log.error("推送信息已超过最大推送次数{}", parse.getNotifyId());
 				notify.setStatus(-1);
 				notifyService.updateById(notify);

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/mq/RabbiLhbOrderQueueListener.java

@@ -48,44 +48,44 @@ public class RabbiLhbOrderQueueListener {
 
 
 
-	public static void main(String[] args) {
-
-
-
-
-		String signStr = "23232";
-		String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCPs8Mn9EtUNqz9eg+Zv9Hu4gwjKgqma+Ud5A+LpiMQFK83fQX1zmg9oGtaXL11guQBJT9pui3vBn4cZXkadOd03x22lxDd18hBmEWBA8b2MTC4u2gZ7jKGjMBurDZ4Uit8yk2Ls8Qe6Jzf7f2cdTwzw6JrLGyZ6jx+Xl7zHcylvY6YHio8t1zW/ZuP2PuY6XWXL/1gbChhxUIs/LhZbHzPazvnjqxM7ioZkLU0Of3W0keO6AcJo01DGqUHZ/l9FsZU/8697o1W3IyhQ9PDTg9mVWS46hIMhd70nNpCTlDKn6iiv2H0GtZ1FbczX7uoTXI9oqP2uU1qahk10CdbeLW1AgMBAAECggEADnMnBpd8E6XD02E4vF8bfwff7JFHrOBgk5bhMUutbuqFi/DYbpUoyjmdUeLNckmNH8hdDgaYo9ZlS/mwKcbjl07wL/IU0hnmmyHyqzxz/0GHAqxllWXsUrdIilhqycKJeOzmy0tyRyFg1OubeuYW/aWIaXp4GSoClzpqFcxDTc8RE7rSn5JxwfBug9p1dNrv0/RfeXSecJ2puqWO3w6+sJxCyMt7/SmIa5sczc9ehSDYhWH0Zs5FBwfhfpyxECyQWeHoIM6I+AkJqjbNRBKT5TCho66Ie5H/PwHVJ0GxhEyc7xKn+/9ZA+5AAYCrlqDzZyqQQUDK8cDyjZfLFx6fAQKBgQDRpnAD+jRE6wJ1fSBEPUe8J3x7IxlFR2K4k6XXj+hNHdqDP/Oo1lssj64U4eeXHyvbe9bJVbVvJ28jM1cSsGHmcQMj3bHLWhWHlwOYqIc9FZgGB9T//NyMhVUsSUhZ4LPPA5eJOJeDCnKPPwevK2Iaj1iopeO2+DQPffPNYyRPlQKBgQCveN7tX3NFH9944iATS8RZX2C1reXjIf6wH3dLg5ttLJhH9Une//RvKPEjlnPL7sJnyt8jGiXQOma6Xr3cHztDjdCdaEC6lZmoiUL4aN1amUjz7cET2BeJjtv9fRG+bk5RSCemcHyuvALMmLeRwm8cAfdWnNsEv+ikshkUyZHFoQKBgQC8SmtYZyMCsr8mnhaYsyD2T9BxF3jey9pSQ+kyzUCp4iIatxkzjjGct/51Kt9AzvIo0fR6Jswo5JXgW3/cfSWwPdfAIqBILsQfXvYP6Wxs5DQBVo9qycObQTTZ7YdZkYJsbqFu0LDjNELnfIh+PsyBZjUOYs89yXWYZFrPIDfAcQKBgHZDVqxRapUqGCmW7dtTc3Bw0fNg0tG0db0qV/KzLqv0JGZLMZB0nb/VrkA4BK9rqebeWmmEE/w1gEsX04pqGj07dWDBhO68KSXn7RUTSCzppruQgFLpj2OMv0QnaTAZk/tAUEjjA4WY/aH7Q62fh9culA7yBMM8vIVT64eRGwhBAoGAc5vyY2in0OCwDVApi5IO+ilorfHMKWSVub1oG/9R85V21n9Ux6SWkLCs+tTY80VvQzfjrWS/vAkaOV9usfuJL7cotroyUgxFp8+I5bPdgThD0uP2078n92huoacVp49eKL+WGGmHBl1aSz9YJguQ0neaTxJUlEuAokfMO6dhHro=";
-		String publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj7PDJ/RLVDas/XoPmb/R7uIMIyoKpmvlHeQPi6YjEBSvN30F9c5oPaBrWly9dYLkASU/abot7wZ+HGV5GnTndN8dtpcQ3dfIQZhFgQPG9jEwuLtoGe4yhozAbqw2eFIrfMpNi7PEHuic3+39nHU8M8Oiayxsmeo8fl5e8x3Mpb2OmB4qPLdc1v2bj9j7mOl1ly/9YGwoYcVCLPy4WWx8z2s7546sTO4qGZC1NDn91tJHjugHCaNNQxqlB2f5fRbGVP/Ove6NVtyMoUPTw04PZlVkuOoSDIXe9JzaQk5Qyp+oor9h9BrWdRW3M1+7qE1yPaKj9rlNamoZNdAnW3i1tQIDAQAB";
-//		String privateKey = "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANwULxPHjpmtY3giSsvaS7ZaoOkcSChhxn5krunLcT9G2aP+tP4zbs33giN4Chm9QxrDHA6gG9kGUv/h9WSWul78eml6dQaNGtEmTsFPwlDXI1v310+mA/7TrumeudTrGVmUTv8juWNJaGZk/zIi1cMqJ1/tfUi3h3EOkplS0kQ5AgMBAAECgYEAnAbXRX+iUsOBlMdDHfla2iKwl/QMGE0Ri8RX2br5Q/I4FLNcoCfYs795DSpqhssOiyeueZP7ikaYi38oGbNe1u11HWzE2VgcLoQwZwQCX0U+uJNpm0AOX3hXs/hgRIe3DPkNUvSz87U1DwIbXFDoSgG+fFQOP4ZNCOBWqnQN2XECQQD9/Z3RC0y92OgwPBLkbIz9HYV7anD+aFBbMXY7i9LCKOmabz31Vg8Vurb2GSxerv+qQET0Y6o0LsmsCDkUcgDlAkEA3dHjkbsEJcNocEIDuYFfjdhLjoNHoOei3Ph4j4bG1h/StHR2h4DdTk2LVnz+PnFWuGFuwzNO2ZT9gYTYZYQExQJBANS7VjJfn4AnK5oyxrQRgykBT+qlpUxAPIWU8O1A2F6M+9PAtolE8k+F2nZXcUVAl5yWRerXixg30+xF2uEX900CQAeUByFQcVjU7zl+l9/7kocnD5XD2Guf3kmMV5oXsa1ZEvrFS9NfTLBDJ/KBfLInbx4HfiA/HX+DfpGxNy9orj0CQQCmgnRhaZqpy0acdr9csh8UxAogiGSgc+7l3ujI4vntbbfphOwCkav7voDjhS66ZHdYVOpZAzcWXr7pKu/X0Izo";
-//		String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcFC8Tx46ZrWN4IkrL2ku2WqDpHEgoYcZ+ZK7py3E/Rtmj/rT+M27N94IjeAoZvUMawxwOoBvZBlL/4fVklrpe/HppenUGjRrRJk7BT8JQ1yNb99dPpgP+067pnrnU6xlZlE7/I7ljSWhmZP8yItXDKidf7X1It4dxDpKZUtJEOQIDAQAB";
-
-		RSA rsa = SecureUtil.rsa(privateKey, publicKey);
-		String publicKeyBase64 = rsa.getPublicKeyBase64();
-		String privateKeyBase64 = rsa.getPrivateKeyBase64();
-        try {
-			String encrypt1 = Base64.getEncoder().encodeToString(rsa.encrypt(signStr.getBytes(), KeyType.PublicKey));
-			Sign sign1 = SecureUtil.sign(SignAlgorithm.SHA256withRSA, privateKey, publicKey);
-			byte[] sign2 = sign1.sign(signStr);
-			String sign3 = new String(Base64.getEncoder().encode(sign2));
-			String decryptStr = rsa.decryptStr(encrypt1, KeyType.PrivateKey);
-
-			String sign = RsaUtil.sign(privateKey, signStr);
-
-			String encrypt = RsaUtil.encrypt(publicKey, signStr);
-			boolean verify = RsaUtil.verify(publicKey, signStr, sign3);
-			String decrypt = RsaUtil.decrypt(privateKey, encrypt1);
-			System.out.println(verify);
-			System.out.println(encrypt);
-			System.out.println(encrypt1);
-			System.out.println(decrypt);
-			System.out.println(decryptStr);
-
-		} catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-
-    }
+//	public static void main(String[] args) {
+//
+//
+//
+//
+//		String signStr = "23232";
+//		String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCPs8Mn9EtUNqz9eg+Zv9Hu4gwjKgqma+Ud5A+LpiMQFK83fQX1zmg9oGtaXL11guQBJT9pui3vBn4cZXkadOd03x22lxDd18hBmEWBA8b2MTC4u2gZ7jKGjMBurDZ4Uit8yk2Ls8Qe6Jzf7f2cdTwzw6JrLGyZ6jx+Xl7zHcylvY6YHio8t1zW/ZuP2PuY6XWXL/1gbChhxUIs/LhZbHzPazvnjqxM7ioZkLU0Of3W0keO6AcJo01DGqUHZ/l9FsZU/8697o1W3IyhQ9PDTg9mVWS46hIMhd70nNpCTlDKn6iiv2H0GtZ1FbczX7uoTXI9oqP2uU1qahk10CdbeLW1AgMBAAECggEADnMnBpd8E6XD02E4vF8bfwff7JFHrOBgk5bhMUutbuqFi/DYbpUoyjmdUeLNckmNH8hdDgaYo9ZlS/mwKcbjl07wL/IU0hnmmyHyqzxz/0GHAqxllWXsUrdIilhqycKJeOzmy0tyRyFg1OubeuYW/aWIaXp4GSoClzpqFcxDTc8RE7rSn5JxwfBug9p1dNrv0/RfeXSecJ2puqWO3w6+sJxCyMt7/SmIa5sczc9ehSDYhWH0Zs5FBwfhfpyxECyQWeHoIM6I+AkJqjbNRBKT5TCho66Ie5H/PwHVJ0GxhEyc7xKn+/9ZA+5AAYCrlqDzZyqQQUDK8cDyjZfLFx6fAQKBgQDRpnAD+jRE6wJ1fSBEPUe8J3x7IxlFR2K4k6XXj+hNHdqDP/Oo1lssj64U4eeXHyvbe9bJVbVvJ28jM1cSsGHmcQMj3bHLWhWHlwOYqIc9FZgGB9T//NyMhVUsSUhZ4LPPA5eJOJeDCnKPPwevK2Iaj1iopeO2+DQPffPNYyRPlQKBgQCveN7tX3NFH9944iATS8RZX2C1reXjIf6wH3dLg5ttLJhH9Une//RvKPEjlnPL7sJnyt8jGiXQOma6Xr3cHztDjdCdaEC6lZmoiUL4aN1amUjz7cET2BeJjtv9fRG+bk5RSCemcHyuvALMmLeRwm8cAfdWnNsEv+ikshkUyZHFoQKBgQC8SmtYZyMCsr8mnhaYsyD2T9BxF3jey9pSQ+kyzUCp4iIatxkzjjGct/51Kt9AzvIo0fR6Jswo5JXgW3/cfSWwPdfAIqBILsQfXvYP6Wxs5DQBVo9qycObQTTZ7YdZkYJsbqFu0LDjNELnfIh+PsyBZjUOYs89yXWYZFrPIDfAcQKBgHZDVqxRapUqGCmW7dtTc3Bw0fNg0tG0db0qV/KzLqv0JGZLMZB0nb/VrkA4BK9rqebeWmmEE/w1gEsX04pqGj07dWDBhO68KSXn7RUTSCzppruQgFLpj2OMv0QnaTAZk/tAUEjjA4WY/aH7Q62fh9culA7yBMM8vIVT64eRGwhBAoGAc5vyY2in0OCwDVApi5IO+ilorfHMKWSVub1oG/9R85V21n9Ux6SWkLCs+tTY80VvQzfjrWS/vAkaOV9usfuJL7cotroyUgxFp8+I5bPdgThD0uP2078n92huoacVp49eKL+WGGmHBl1aSz9YJguQ0neaTxJUlEuAokfMO6dhHro=";
+//		String publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj7PDJ/RLVDas/XoPmb/R7uIMIyoKpmvlHeQPi6YjEBSvN30F9c5oPaBrWly9dYLkASU/abot7wZ+HGV5GnTndN8dtpcQ3dfIQZhFgQPG9jEwuLtoGe4yhozAbqw2eFIrfMpNi7PEHuic3+39nHU8M8Oiayxsmeo8fl5e8x3Mpb2OmB4qPLdc1v2bj9j7mOl1ly/9YGwoYcVCLPy4WWx8z2s7546sTO4qGZC1NDn91tJHjugHCaNNQxqlB2f5fRbGVP/Ove6NVtyMoUPTw04PZlVkuOoSDIXe9JzaQk5Qyp+oor9h9BrWdRW3M1+7qE1yPaKj9rlNamoZNdAnW3i1tQIDAQAB";
+////		String privateKey = "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANwULxPHjpmtY3giSsvaS7ZaoOkcSChhxn5krunLcT9G2aP+tP4zbs33giN4Chm9QxrDHA6gG9kGUv/h9WSWul78eml6dQaNGtEmTsFPwlDXI1v310+mA/7TrumeudTrGVmUTv8juWNJaGZk/zIi1cMqJ1/tfUi3h3EOkplS0kQ5AgMBAAECgYEAnAbXRX+iUsOBlMdDHfla2iKwl/QMGE0Ri8RX2br5Q/I4FLNcoCfYs795DSpqhssOiyeueZP7ikaYi38oGbNe1u11HWzE2VgcLoQwZwQCX0U+uJNpm0AOX3hXs/hgRIe3DPkNUvSz87U1DwIbXFDoSgG+fFQOP4ZNCOBWqnQN2XECQQD9/Z3RC0y92OgwPBLkbIz9HYV7anD+aFBbMXY7i9LCKOmabz31Vg8Vurb2GSxerv+qQET0Y6o0LsmsCDkUcgDlAkEA3dHjkbsEJcNocEIDuYFfjdhLjoNHoOei3Ph4j4bG1h/StHR2h4DdTk2LVnz+PnFWuGFuwzNO2ZT9gYTYZYQExQJBANS7VjJfn4AnK5oyxrQRgykBT+qlpUxAPIWU8O1A2F6M+9PAtolE8k+F2nZXcUVAl5yWRerXixg30+xF2uEX900CQAeUByFQcVjU7zl+l9/7kocnD5XD2Guf3kmMV5oXsa1ZEvrFS9NfTLBDJ/KBfLInbx4HfiA/HX+DfpGxNy9orj0CQQCmgnRhaZqpy0acdr9csh8UxAogiGSgc+7l3ujI4vntbbfphOwCkav7voDjhS66ZHdYVOpZAzcWXr7pKu/X0Izo";
+////		String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcFC8Tx46ZrWN4IkrL2ku2WqDpHEgoYcZ+ZK7py3E/Rtmj/rT+M27N94IjeAoZvUMawxwOoBvZBlL/4fVklrpe/HppenUGjRrRJk7BT8JQ1yNb99dPpgP+067pnrnU6xlZlE7/I7ljSWhmZP8yItXDKidf7X1It4dxDpKZUtJEOQIDAQAB";
+//
+//		RSA rsa = SecureUtil.rsa(privateKey, publicKey);
+//		String publicKeyBase64 = rsa.getPublicKeyBase64();
+//		String privateKeyBase64 = rsa.getPrivateKeyBase64();
+//        try {
+//			String encrypt1 = Base64.getEncoder().encodeToString(rsa.encrypt(signStr.getBytes(), KeyType.PublicKey));
+//			Sign sign1 = SecureUtil.sign(SignAlgorithm.SHA256withRSA, privateKey, publicKey);
+//			byte[] sign2 = sign1.sign(signStr);
+//			String sign3 = new String(Base64.getEncoder().encode(sign2));
+//			String decryptStr = rsa.decryptStr(encrypt1, KeyType.PrivateKey);
+//
+//			String sign = RsaUtil.sign(privateKey, signStr);
+//
+//			String encrypt = RsaUtil.encrypt(publicKey, signStr);
+//			boolean verify = RsaUtil.verify(publicKey, signStr, sign3);
+//			String decrypt = RsaUtil.decrypt(privateKey, encrypt1);
+//			System.out.println(verify);
+//			System.out.println(encrypt);
+//			System.out.println(encrypt1);
+//			System.out.println(decrypt);
+//			System.out.println(decryptStr);
+//
+//		} catch (Exception e) {
+//            throw new RuntimeException(e);
+//        }
+//
+//
+//    }
 
 	/**
 	 * 监听 套餐订单队列
@@ -110,7 +110,7 @@ public class RabbiLhbOrderQueueListener {
 				channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
 				return;
 			}
-			if(notify.getNotifyCount() > BasicConstants.MAX_NOTIFY_TIMES){
+			if(notify.getNotifyCount() >= BasicConstants.MAX_NOTIFY_TIMES){
 				log.error("推送信息已超过最大推送次数{}", parse.getNotifyId());
 				notify.setStatus(-1);
 				notifyService.updateById(notify);

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbOrderServiceImpl.java

@@ -417,6 +417,7 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
     public void orderStatusTask() {
         List<LhbOrder> orders = list(Wrappers.lambdaQuery(LhbOrder.class)
                 .eq(LhbOrder::getIsAct, CommonConstants.FAIL)
+                .notIn(LhbOrder::getOutStatus, 2, 3)
                 .eq(LhbOrder::getStatus, OrderStatusEnum.PAY.getCode()));
 
         orders.forEach(order -> {