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())