bug修改《支付回调查询要检查qcldou的order）

@@ -5,4 +5,6 @@ import org.influxdb.dto.QueryResult;
 public interface PaymentMapper {
 
 	QueryResult selectAlipayCountAll(int minute);
+
+	QueryResult selectAlipayCountAllFromQcloud(int minute);
 }

@@ -22,4 +22,19 @@ public class PaymentMapperImpl extends InfluxDBQuery implements PaymentMapper {
 		return query(InfluxDBContants.ORDER, command, InfluxDBContants.YOHO_ORDER);
 	}
 
+	/**
+	 * qcloud
+	 * 查询最近时间内支付宝回调次数
+	 * @param minute
+	 * @return
+	 */
+	@Override
+	public QueryResult selectAlipayCountAllFromQcloud(int minute) {
+
+		String command = "SELECT count(ip) FROM payment " +
+				"WHERE time > now() - " + minute + "m " +
+				"AND event = 'payment' AND type = 'alipay'";
+		return query(InfluxDBContants.Q_CLOUD, command, InfluxDBContants.YOHO_ORDER);
+	}
+
 }

@@ -54,11 +54,17 @@ public class AlipayTask {
                 min = 30;
             }
 
+            QueryResult queryResult_qcloud = paymentMapper.selectAlipayCountAllFromQcloud(min);
+            int count_qcloud = QueryResultUtil.getCount(queryResult_qcloud);
+            DEBUG.debug("order from qcloud start alipay task count {}",count_qcloud);
+
             QueryResult queryResult = paymentMapper.selectAlipayCountAll(min);
             int count = QueryResultUtil.getCount(queryResult);
-            DEBUG.info("start alipay task count {}",count);
+            DEBUG.debug("order start alipay task count {}", count);
+
+
 
-            if (count == 0) {
+            if (count == 0&&count_qcloud==0) {
                 boolean needVoice = true;
 
                 QueryResult queryResult1 = smsUpMapper.select(30);