西格玛许 6 zile în urmă
părinte
comite
ce723e5a32

+ 20 - 0
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/MainBackCandidate.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -41,6 +42,25 @@ public class MainBackCandidate extends BaseEntity {
     @TableField("student_status")
     private String studentStatus;
 
+    /** Offer PDF文件URL */
+    @TableField("offer_file_url")
+    private String offerFileUrl;
+
+    /** Offer PDF文件名 */
+    @TableField("offer_file_name")
+    private String offerFileName;
+
+    /** 企业发送Offer时间 */
+    @TableField("offer_time")
+    private LocalDateTime offerTime;
+
+    /** 学员确认或拒绝 Offer 时间 */
+    @TableField("student_reply_time")
+    private LocalDateTime studentReplyTime;
+
+    /** 状态(兼容旧数据) */
+    private String status;
+
     private String remark;
 
     private Date updateTime;

+ 24 - 0
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/MainOrder.java

@@ -1,5 +1,6 @@
 package org.dromara.main.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -18,12 +19,22 @@ public class MainOrder extends BaseEntity {
     private Long id;
 
     private String orderNo;
+    /** 客户单号 */
+    private String customerSn;
     private Integer orderType;
     private Integer buyerType;
     private Long buyerId;
     private String buyerName;
+    /** 订单来源(小程序/APP/PC) */
+    private String source;
     private Long sellerId;
     private BigDecimal totalAmount;
+    /** 定金金额 */
+    private BigDecimal deposit;
+    /** 尾款金额 */
+    private BigDecimal balance;
+    /** 商品数量 */
+    private Integer quantity;
     private BigDecimal paidAmount;
     private BigDecimal refundAmount;
     private Integer orderStatus;
@@ -35,4 +46,17 @@ public class MainOrder extends BaseEntity {
     private Date cancelTime;
     private String tenantId;
     private String remark;
+
+    // ===== 非数据库字段,用于前端展示(关联查询填充)=====
+    /** 买家手机号(从 main_student 关联查询) */
+    @TableField(exist = false)
+    private String phone;
+
+    /** 买家头像URL(从 main_student 关联查询) */
+    @TableField(exist = false)
+    private String userAvatar;
+
+    /** 商品名称(根据订单类型关联查询) */
+    @TableField(exist = false)
+    private String productName;
 }

+ 1 - 1
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainBackCandidateServiceImpl.java

@@ -43,7 +43,7 @@ public class MainBackCandidateServiceImpl implements IMainBackCandidateService {
 
         Map<Long, String> postNameMap = new HashMap<>();
         if (!postIds.isEmpty()) {
-            List<MainPosition> positions = mainPositionMapper.selectBatchIds(postIds);
+            List<MainPosition> positions = mainPositionMapper.selectByIds(postIds);
             postNameMap.putAll(positions.stream()
                 .collect(Collectors.toMap(MainPosition::getId, MainPosition::getPostName, (v1, v2) -> v1)));
         }

+ 1 - 1
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainOrderServiceImpl.java

@@ -148,6 +148,6 @@ public class MainOrderServiceImpl implements IMainOrderService {
 
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        return baseMapper.deleteBatchIds(ids) > 0;
+        return baseMapper.deleteByIds(ids) > 0;
     }
 }