Merge branch '2.0-dev' of http://139.159.177.244:3000/hurui/hai-server into 2.0-dev

hai-order/src/main/java/com/web/controller/notify/MobileRechargeNotifyController.java

@@ -243,9 +243,9 @@ public class MobileRechargeNotifyController {
                 orderFinish(rechargeOrder);
 
                 // api商户订单
-                if (rechargeOrder.getPayType() == 6) {
+//                if (rechargeOrder.getPayType() == 6) {
-                    apiOrderRecord(rechargeOrder);
+//                    apiOrderRecord(rechargeOrder);
-                }
+//                }
 
             } else {
                 // 充值失败操作

hai-schedule/src/main/java/com/hai/schedule/HighRechargeOrderSchedule.java

@@ -93,7 +93,7 @@ public class HighRechargeOrderSchedule {
         System.out.println("话费定时任务 -> 结束任务");
     }
 
-    @Scheduled(cron = "0 0/30 * * * ?")   //每30分钟执行一次
+    @Scheduled(cron = "0 0/3 * * * ?")   //每30分钟执行一次
     public void failRechargeOrder() {
         List<HighOrder> highOrders = orderService.phoneErrorOrder();
 

hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java

@@ -1224,7 +1224,7 @@ public interface HighOrderMapperExt {
     List<ApiThirdOrderModel> getApiThirdOrderByList(@Param("map") Map<String,Object> map);
 
 
-    @Select("SELECT * FROM high_order WHERE create_time < NOW()-INTERVAL 3 day and product_type = 9 and  order_status = 2;")
+    @Select("SELECT * FROM high_order WHERE create_time < NOW()-INTERVAL 3 day and product_type = 9 and  order_status = 2 and pay_type = 4;")
     @Results({
             @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
             @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR),