diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/constants/OrderMobileSearchTypeEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/constants/OrderMobileSearchTypeEnum.java
new file mode 100644
index 00000000..7ef43354
--- /dev/null
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/constants/OrderMobileSearchTypeEnum.java
@@ -0,0 +1,26 @@
+package com.bonus.canteen.core.order.common.constants;
+
+import lombok.Generated;
+
+public enum OrderMobileSearchTypeEnum {
+   ALL(1, ""),
+   REFUNDED(2, "已退款"),
+   WAIT_COMMEND(3, "待评价"),
+   WAIT_PAY(4, "待支付");
+
+   private final Integer key;
+   private final String desc;
+
+   private OrderMobileSearchTypeEnum(Integer key, String desc) {
+      this.key = key;
+      this.desc = desc;
+   }
+
+   public Integer getKey() {
+      return this.key;
+   }
+
+   public String getDesc() {
+      return this.desc;
+   }
+}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/OrderListMobileDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/OrderListMobileDTO.java
index f04c8023..732043cc 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/OrderListMobileDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/OrderListMobileDTO.java
@@ -1,6 +1,8 @@
 package com.bonus.canteen.core.order.mobile.dto;
 
 import cn.hutool.core.collection.CollUtil;
+import com.bonus.canteen.core.order.common.constants.OrderMobileSearchTypeEnum;
+import com.bonus.canteen.core.pay.common.constants.PayStateEnum;
 import com.bonus.common.houqin.constant.LeConstants;
 import com.bonus.canteen.core.common.page.PageDTO;
 import com.bonus.canteen.core.order.common.constants.OrderRefundStateEnum;
@@ -49,11 +51,14 @@ public class OrderListMobileDTO extends PageDTO implements OrderQueryParam {
       orderSearchParam.setCanteenSearchInfo(this.searchText);
       orderSearchParam.setPayStateList(this.payStateList);
       orderSearchParam.setOrderTypeList(this.getOrderTypeList());
-      if (this.searchType != null && this.searchType == 2) {
-         orderSearchParam.setOrderRefundStateList(CollUtil.toList(new Integer[]{OrderRefundStateEnum.FINISH.getKey(), OrderRefundStateEnum.PART_SUCC.getKey()}));
-      } else if (this.searchType != null && this.searchType == 3) {
-         orderSearchParam.setOrderStateList(CollUtil.toList(new Integer[]{OrderStateEnum.FINISH.getKey()}));
+      if (OrderMobileSearchTypeEnum.REFUNDED.getKey().equals(this.searchType)) {
+         orderSearchParam.setOrderRefundStateList(CollUtil.toList(OrderRefundStateEnum.FINISH.getKey(), OrderRefundStateEnum.PART_SUCC.getKey()));
+      } else if (OrderMobileSearchTypeEnum.WAIT_COMMEND.getKey().equals(this.searchType)) {
+         orderSearchParam.setOrderStateList(CollUtil.toList(OrderStateEnum.FINISH.getKey()));
          orderSearchParam.setCommentState(LeConstants.COMMON_NO);
+         orderSearchParam.setOrderTypeList(CollUtil.toList(OrderTypeEnum.CURR_MEAL.getKey(), OrderTypeEnum.RESERVE_MEAL.getKey(), OrderTypeEnum.BOOK_MEAL.getKey()));
+      } else if (OrderMobileSearchTypeEnum.WAIT_PAY.getKey().equals(this.searchType)) {
+         orderSearchParam.setPayStateList(CollUtil.toList(PayStateEnum.UN_PAY.getKey(), PayStateEnum.PART_PAY.getKey()));
       }
 
       return orderSearchParam;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/service/impl/OrderInfoMobileBusinessImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/service/impl/OrderInfoMobileBusinessImpl.java
index e94b06c5..de06d8e7 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/service/impl/OrderInfoMobileBusinessImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/service/impl/OrderInfoMobileBusinessImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.bonus.canteen.core.common.utils.AesEncryptUtil;
 import com.bonus.common.houqin.constant.LeConstants;
 import com.bonus.canteen.core.common.page.PageVO;
 import com.bonus.canteen.core.device.api.DeviceApi;
@@ -38,7 +39,6 @@ import com.bonus.canteen.core.order.weight.vo.RefundDetailStateVO;
 import com.bonus.canteen.core.pay.api.TradeRecordApi;
 import com.bonus.canteen.core.pay.api.vo.UnifyPaySelectVO;
 import com.bonus.canteen.core.pay.common.model.TradeRecord;
-import com.bonus.common.houqin.utils.AesEncryptUtil;
 import com.bonus.canteen.core.menu.model.MenuDishesTypeModel;
 import com.github.pagehelper.page.PageMethod;
 import org.slf4j.Logger;