ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java

@@ -52,12 +52,12 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler {
             } else if(ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseAudit baseAudit) {
                 baseAudit.setCreateTime(LocalDateTime.now());
                 baseAudit.setUpdateTime(LocalDateTime.now());
+
             }else{
                 Date date = new Date();
                 this.strictInsertFill(metaObject, "createTime", Date.class, date);
                 this.strictInsertFill(metaObject, "updateTime", Date.class, date);
             }
-            this.strictInsertFill(metaObject, "delFlag", String.class, "0");
         } catch (Exception e) {
             throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
         }

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

@@ -1,7 +1,10 @@
 package com.wzj.soopin.order.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.PrePersist;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -10,7 +13,10 @@ import org.dromara.common.core.domain.model.BaseAudit;
 import org.dromara.common.excel.annotation.Excel;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.Random;
 
 /**
  * 订单表对象 oms_order

ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/TransEasypayController.java

@@ -2,6 +2,7 @@ package com.wzj.soopin.transaction.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.wzj.soopin.transaction.domain.bo.PaymentBO;
+import com.wzj.soopin.transaction.domain.bo.SeparateApplyBO;
 import com.wzj.soopin.transaction.domain.bo.easypay.EasyPayRequest;
 import com.wzj.soopin.transaction.domain.vo.EasypayTransResultVO;
 import com.wzj.soopin.transaction.domain.vo.EasypayPrePayVO;

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

@@ -1,11 +1,13 @@
 package com.wzj.soopin.transaction.domain.po;
 
-import com.baomidou.mybatisplus.annotation.*;
+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;
 
 import lombok.*;
-import org.apache.ibatis.type.JdbcType;
 import org.dromara.common.core.domain.model.BaseAudit;
 
 /**
@@ -95,8 +97,6 @@ public class PayOrder extends BaseAudit {
     @Schema(description = "交易状态 0->待支付,1->支付中,2->已支付,3->退款中,4->已退款")
     private Integer transState;
 
-
-    @TableLogic(value = "0", delval = "1")
-    @TableField(value = "del_flag", fill = FieldFill.INSERT, jdbcType = JdbcType.CHAR)
+    @TableLogic
     private String delFlag;
 }

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

@@ -244,6 +244,8 @@ public class EasypayServiceImpl implements IEasypayService {
                         .payId(payOrder.getId())
                         .status(OrderStatusEnum.PAYMENT.getValue())
                         .build());
+                    // 产生待分账记录
+                    generateDivideRecord(payOrder);
                     // 生成返回前端的预支付信息
                     return generatePrePayVO(paymentBO.getPayType(), jsApiRespBody);
                 } else {
@@ -260,7 +262,14 @@ public class EasypayServiceImpl implements IEasypayService {
         }
     }
 
-
+    /**
+     * 生成待分账记录
+     *
+     * @param payOrder
+     */
+    private void generateDivideRecord(PayOrder payOrder) {
+        //TODO 待完善
+    }
 
     /**
      * 根据支付类型校验请求参数是否完整
@@ -505,7 +514,7 @@ public class EasypayServiceImpl implements IEasypayService {
                         payOrderMapper.updateById(PayOrder.builder().id(payOrder.getId()).transState(TransState.PENDING.getCode()).build());
                     }
                 } else {
-                    log.warn("回调通知的订单不存在:{}", respOrderInfo.getOrgTrace());
+                    log.warn("回调通知的支付订单不存在:{}", respOrderInfo.getOrgTrace());
                 }
             } else {
                 log.warn("回调通知的支付订单不存在:{}", respOrderInfo.getOrgTrace());