bug fix

src/main/java/com/huiju/estateagents/controller/TaPreselectionController.java

@@ -220,7 +220,7 @@ public class TaPreselectionController extends BaseController {
                 return responseBean;
             }
 
-            if (StringUtils.isNotBlank(taPreselection.getPreselectionStartTime()) && StringUtils.isNotBlank(taPreselection.getPreselectionEndTime())) {
+            if (taPreselection.getPreselectionStartTime() != null && taPreselection.getPreselectionEndTime() != null) {
                 // 更新批次表信息
                 TaSalesBatch taSalesBatch = new TaSalesBatch();
                 taSalesBatch.setSalesBatchId(taPreselection.getSalesBatchId());

src/main/java/com/huiju/estateagents/entity/TaPreselection.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -44,12 +45,14 @@ public class TaPreselection implements Serializable {
     /**
      * 预选开始时间
      */
-    private String preselectionStartTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime preselectionStartTime;
 
     /**
      * 预选结束时间
      */
-    private String preselectionEndTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime preselectionEndTime;
 
     /**
      * 状态

src/main/java/com/huiju/estateagents/entity/TaSalesBatch.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import net.sf.cglib.core.Local;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -60,12 +61,12 @@ public class TaSalesBatch implements Serializable {
     /**
      * 预选开始时间
      */
-    private String preselectionStartTime;
+    private LocalDateTime preselectionStartTime;
 
     /**
      * 预选结束时间
      */
-    private String preselectionEndTime;
+    private LocalDateTime preselectionEndTime;
 
     /**
      * 发布状态

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -138,12 +138,13 @@
             t2.pay_time,
             t2.trade_no,
             t2.transaction_id,
-            t2.refund_no,
+            t4.refund_no,
             t2.total_fee
         FROM
             ta_raise_record t
             INNER JOIN ta_order t2 ON t.order_id = t2.order_id
             LEFT JOIN ta_person t3 ON t2.person_id = t3.person_id
+            left join ta_order t4 on t2.order_id = t4.parent_order_id
         WHERE
             t.org_id = #{bo.orgId}
             AND t.`status` != - 1