From 4a44c85177dd57b257cd1f9c4413129a442ae55a Mon Sep 17 00:00:00 2001 From: huk Date: Fri, 5 Sep 2025 10:29:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor(order):=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 Order 类中冗余的订单状态字段注释 - 更新 OrderStatusEnum 枚举类注释 - 修正 EasypayServiceImpl 中的交易状态代码 - 统一 TransState 枚举中的状态码命名 --- .../main/java/com/wzj/soopin/order/domain/entity/Order.java | 5 +---- .../java/com/wzj/soopin/order/emum/OrderStatusEnum.java | 1 + .../java/com/wzj/soopin/transaction/enums/TransState.java | 2 +- .../soopin/transaction/service/impl/EasypayServiceImpl.java | 6 ++---- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java index 9dace55fc..f9f795336 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java @@ -76,12 +76,9 @@ public class Order extends BaseAudit { @Excel(name = "支付方式：0->未支付；1->支付宝；2->微信") private Integer payType; - @Schema(description = "订单状态：0->待支付；1->支付中；2->已支付；3->已关闭；4->已退款；9->已分账；10->无效订单") - @Excel(name = "订单状态：0->待支付；1->支付中；2->已支付；3->已关闭；4->已退款；9->已分账；10->无效订单") /** - * 订单状态：0->待支付；1->支付中；2->已支付；3->已关闭；4->已退款；9->已分账；10->无效订单 - * 枚举类型见{@link com.wzj.soopin.order.emum.OrderStatusEnum} + * 订单状态枚举类型见{@link com.wzj.soopin.order.emum.OrderStatusEnum} */ private Integer status; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/emum/OrderStatusEnum.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/emum/OrderStatusEnum.java index 24fbd8f2f..406eff194 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/emum/OrderStatusEnum.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/emum/OrderStatusEnum.java @@ -9,6 +9,7 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum OrderStatusEnum { + UNPAID(0, "待支付"), PAYMENT(1, "支付中"), PAID(2, "已支付"), diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/TransState.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/TransState.java index 92700b9e8..eb9e64561 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/TransState.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/enums/TransState.java @@ -12,7 +12,7 @@ public enum TransState { PENDING(0, "待支付"), - Payment(1, "支付中"), + PAYMENT(1, "支付中"), PAID(2, "已支付"), diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java index 2239a0ecf..19eda63ce 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java @@ -47,16 +47,13 @@ import com.wzj.soopin.transaction.domain.po.DivideDetail; import com.wzj.soopin.transaction.domain.po.DivideRule; import com.wzj.soopin.transaction.domain.po.PayOrder; import com.wzj.soopin.transaction.domain.vo.*; -import com.wzj.soopin.transaction.enums.DivideRuleFeeType; import com.wzj.soopin.transaction.enums.DivideRuleStatus; import com.wzj.soopin.transaction.enums.DivideStatus; import com.wzj.soopin.transaction.enums.TransState; import com.wzj.soopin.transaction.enums.easypay.*; -import com.wzj.soopin.transaction.mapper.DivideDetailMapper; import com.wzj.soopin.transaction.mapper.DivideMapper; import com.wzj.soopin.transaction.mapper.DivideRuleMapper; import com.wzj.soopin.transaction.mapper.PayOrderMapper; -import com.wzj.soopin.transaction.service.IDivideRuleService; import com.wzj.soopin.transaction.service.IEasypayService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -239,7 +236,7 @@ public class EasypayServiceImpl implements IEasypayService { payOrder.setPayType(paymentBO.getPayType().getValue()); payOrder.setStartTransDate(new Date()); payOrder.setEasypayTrace(respOrderInfo.getOutTrace()); - payOrder.setTransState(TransState.Payment.getCode()); + payOrder.setTransState(TransState.PAYMENT.getCode()); payOrderMapper.updateById(payOrder); //关联订单的最新支付单 orderMapper.updateById(Order.builder() @@ -407,6 +404,7 @@ public class EasypayServiceImpl implements IEasypayService { if(payOrder == null){ return paymentResultVO; } + paymentResultVO.setTransState(TransState.PAYMENT.getCode()); EasyPayRequestHeader reqHeader = generateEasyPayRequestHeader(); TradeQueryReqBody queryReqBody = TradeQueryReqBody.builder() .reqInfo(ReqInfo.builder().mchtCode(easypayConfig.getMchtCode()).build())