bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

h5-订单-待支付列表

This commit is contained in:
gaowdong 2025-03-17 09:40:06 +08:00
parent d099199a8e
commit f5ec7117a5
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/constants/OrderMobileSearchTypeEnum.java Normal file
View File

@ -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;
}
}

13
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/OrderListMobileDTO.java
View File

@ -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;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/service/impl/OrderInfoMobileBusinessImpl.java
View File

@ -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;