diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java b/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
index 7ae4361e..ded7f07c 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
@@ -156,7 +156,7 @@ public class HighThirdPartyController {
                     if (apiStarbucksProducts.getShowPrice() != null) {
                         starbucksProductsList.add(apiStarbucksProducts);
                     }
-            
+
                 }
                 starbucksProducts.setName(s);
                 starbucksProducts.setExt2(SysConst.getSysConfig().getImgUrl() + ProductImgEnum.getNameByImgUrl(s));
diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
index f4fc3dd7..adce9005 100644
--- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
@@ -165,7 +165,8 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
                     DateUtil.format(MapUtils.getString(map, "createTimeS"), "yyyy-MM-dd HH:mm:ss"),
                     DateUtil.format(MapUtils.getString(map, "createTimeE"), "yyyy-MM-dd HH:mm:ss"));
         }
-        if (MapUtils.getBoolean(map , "whetherTimeOut")) {
+
+        if (MapUtils.getBoolean(map , "whetherTimeOut") != null && MapUtils.getBoolean(map , "whetherTimeOut")) {
             // 获取当前时间
             Date date= new Date();
             Calendar calendar = new GregorianCalendar();
@@ -175,7 +176,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
             // 这个时间就是日期往后推一天的结果
             date = calendar.getTime();
             criteria.andCreateTimedLessThan(date);
-
         }