From f5ec7117a5498ca8405997fc6cf6b3b2bcf13d17 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Mon, 17 Mar 2025 09:40:06 +0800 Subject: [PATCH] =?UTF-8?q?h5-=E8=AE=A2=E5=8D=95-=E5=BE=85=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/OrderMobileSearchTypeEnum.java | 26 +++++++++++++++++++ .../order/mobile/dto/OrderListMobileDTO.java | 13 +++++++--- .../impl/OrderInfoMobileBusinessImpl.java | 2 +- 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/constants/OrderMobileSearchTypeEnum.java 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;