abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]修改用户订单的枚举

Browse Source
This commit is contained in:
wangqx 2025-09-11 15:57:26 +08:00
parent bfd6bc390d
commit cfa44d714e
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/Constants.java
View File

@ -205,17 +205,8 @@ public class Constants
public static final String CART = "cart";
}
/**
* 订单状态 0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
*/
public static class OrderStatus {
public static final Integer NOTPAID = 0;
public static final Integer SEND = 1;
public static final Integer GET = 2;
public static final Integer CONFIRM = 3;
public static final Integer CLOSED = 4;
public static final Integer UNVAILD = 5;
}
/**
* H5订单查询状态

8
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java
View File

@ -54,5 +54,13 @@ public class AccountBillVO extends BaseAudit {
@Excel(name = "来源")
private Integer source;
private Long memberId;
private String userName;
private String avatar;
private String orderSn;
}

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java
View File

@ -38,7 +38,7 @@ public class OrderBo extends BaseBO<Order> {
@Schema(description ="支付方式：0->未支付；1->支付宝；2->微信 精确匹配")
private Integer payType;
@Schema(description ="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配")
@Schema(description ="订单状态：0->待付款；1->待核销；2->已完成；3->已关闭；4->退款中；5->已退款 6->已取消 9->已分账；10->无效订单 精确匹配")
private Integer status;
@Schema(description ="退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 精确匹配")

8
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/emum/OrderStatusEnum.java
View File

@ -4,17 +4,19 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 订单状态：0->待支付；1->支付中；2->已支付；3->已关闭；4->已退款；9->已分账；10->无效订单
* 订单状态：0->待付款；1->待核销；2->已完成；3->已关闭；4->退款中；5->已退款 6->已取消 9->已分账；10->无效订单 精确匹配
*/
@Getter
@AllArgsConstructor
public enum OrderStatusEnum {
UNPAID(0, "待支付"),
PAYMENT(1, "支付中"),
VERIFY(1, "待核销"),
PAID(2, "已支付"),
CLOSED(3, "已关闭"),
REFUNDED(4, "已退款"),
REFUNDED(4, "退款中"),
REFUNDED_SUCCESS(5, "已退款"),
CANCELLED(6, "已取消"),
DIVIDED(9, "已分账"),
INVALID(10, "无效订单");

2
ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java
View File

@ -251,7 +251,7 @@ public class EasypayServiceImpl implements IEasypayService {
orderMapper.updateById(Order.builder()
.id(payOrder.getOrderId())
.payId(payOrder.getId())
.status(OrderStatusEnum.PAYMENT.getValue())
.status(OrderStatusEnum.VERIFY.getValue())
.build());
// 生成返回前端的预支付信息
return generatePrePayVO(paymentBO.getPayType(), jsApiRespBody);