ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java

@@ -76,9 +76,12 @@ 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->无效订单")
 
     /**
-     *  订单状态枚举类型见{@link com.wzj.soopin.order.emum.OrderStatusEnum}
+     * 订单状态：0->待支付；1->支付中；2->已支付；3->已关闭；4->已退款；9->已分账；10->无效订单
+     *  枚举类型见{@link com.wzj.soopin.order.emum.OrderStatusEnum}
      */
     private Integer status;
 

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

@@ -9,7 +9,6 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum OrderStatusEnum {
-
     UNPAID(0, "待支付"),
     PAYMENT(1, "支付中"),
     PAID(2, "已支付"),

ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java

@@ -3,7 +3,6 @@ package com.wzj.soopin.transaction.domain.po;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
@@ -91,7 +90,6 @@ public class Divide extends BaseEntity {
     @ExcelProperty(value = "订单编号", order = 9)
     private String orderSn;
 
-    @TableLogic
     private String delFlag;
 
 

ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java

@@ -3,7 +3,6 @@ package com.wzj.soopin.transaction.domain.po;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.wzj.soopin.transaction.enums.DivideRuleFeeType;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -68,7 +67,6 @@ public class DivideRule extends BaseEntity {
     @ExcelProperty(value ="类型", order = 8)
     private Integer type;
 
-    @TableLogic
     private String delFlag;
 
 

ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/PayOrder.java

@@ -2,7 +2,6 @@ package com.wzj.soopin.transaction.domain.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Date;
@@ -97,6 +96,6 @@ public class PayOrder extends BaseAudit {
     @Schema(description = "交易状态 0->待支付,1->支付中,2->已支付,3->退款中,4->已退款")
     private Integer transState;
 
-    @TableLogic
+    @TableField(value = "del_flag")
     private String delFlag;
 }

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, "已支付"),
 

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

@@ -47,13 +47,16 @@ 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;
@@ -236,7 +239,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()
@@ -394,17 +397,14 @@ public class EasypayServiceImpl implements IEasypayService {
     public EasypayTransResultVO paymentQuery(Long orderId) throws ServerException {
         Order order = orderMapper.selectById(orderId);
         Assert.notNull(order, () -> new ServiceException("订单不存在"));
+        PayOrder payOrder = payOrderMapper.selectById(order.getPayId());
+        Assert.notNull(payOrder, () -> new ServiceException("订单不存在"));
         EasypayTransResultVO paymentResultVO = EasypayTransResultVO.builder()
             .orderId(order.getId())
             .payId(order.getPayId())
             .totalAmount(order.getTotalAmount())
             .transState(TransState.PENDING.getCode())
             .build();
-        PayOrder payOrder = payOrderMapper.selectById(order.getPayId());
-        if(payOrder == null){
-            return paymentResultVO;
-        }
-        paymentResultVO.setTransState(TransState.PAYMENT.getCode());
         EasyPayRequestHeader reqHeader = generateEasyPayRequestHeader();
         TradeQueryReqBody queryReqBody = TradeQueryReqBody.builder()
             .reqInfo(ReqInfo.builder().mchtCode(easypayConfig.getMchtCode()).build())