瀏覽代碼

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

傅行帆 5 年之前
父節點
當前提交
8c284d42a3

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaPreselectionController.java 查看文件

220
                 return responseBean;
220
                 return responseBean;
221
             }
221
             }
222
 
222
 
223
-            if (StringUtils.isNotBlank(taPreselection.getPreselectionStartTime()) && StringUtils.isNotBlank(taPreselection.getPreselectionEndTime())) {
223
+            if (taPreselection.getPreselectionStartTime() != null && taPreselection.getPreselectionEndTime() != null) {
224
                 // 更新批次表信息
224
                 // 更新批次表信息
225
                 TaSalesBatch taSalesBatch = new TaSalesBatch();
225
                 TaSalesBatch taSalesBatch = new TaSalesBatch();
226
                 taSalesBatch.setSalesBatchId(taPreselection.getSalesBatchId());
226
                 taSalesBatch.setSalesBatchId(taPreselection.getSalesBatchId());

+ 5
- 2
src/main/java/com/huiju/estateagents/entity/TaPreselection.java 查看文件

3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
 import com.baomidou.mybatisplus.annotation.TableField;
4
 import com.baomidou.mybatisplus.annotation.TableField;
5
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableId;
6
+import com.fasterxml.jackson.annotation.JsonFormat;
6
 import lombok.Data;
7
 import lombok.Data;
7
 import lombok.EqualsAndHashCode;
8
 import lombok.EqualsAndHashCode;
8
 import lombok.experimental.Accessors;
9
 import lombok.experimental.Accessors;
44
     /**
45
     /**
45
      * 预选开始时间
46
      * 预选开始时间
46
      */
47
      */
47
-    private String preselectionStartTime;
48
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
49
+    private LocalDateTime preselectionStartTime;
48
 
50
 
49
     /**
51
     /**
50
      * 预选结束时间
52
      * 预选结束时间
51
      */
53
      */
52
-    private String preselectionEndTime;
54
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
55
+    private LocalDateTime preselectionEndTime;
53
 
56
 
54
     /**
57
     /**
55
      * 状态
58
      * 状态

+ 3
- 2
src/main/java/com/huiju/estateagents/entity/TaSalesBatch.java 查看文件

6
 import lombok.Data;
6
 import lombok.Data;
7
 import lombok.EqualsAndHashCode;
7
 import lombok.EqualsAndHashCode;
8
 import lombok.experimental.Accessors;
8
 import lombok.experimental.Accessors;
9
+import net.sf.cglib.core.Local;
9
 
10
 
10
 import java.io.Serializable;
11
 import java.io.Serializable;
11
 import java.time.LocalDateTime;
12
 import java.time.LocalDateTime;
60
     /**
61
     /**
61
      * 预选开始时间
62
      * 预选开始时间
62
      */
63
      */
63
-    private String preselectionStartTime;
64
+    private LocalDateTime preselectionStartTime;
64
 
65
 
65
     /**
66
     /**
66
      * 预选结束时间
67
      * 预选结束时间
67
      */
68
      */
68
-    private String preselectionEndTime;
69
+    private LocalDateTime preselectionEndTime;
69
 
70
 
70
     /**
71
     /**
71
      * 发布状态
72
      * 发布状态

+ 2
- 1
src/main/resources/mapper/TaRaiseRecordMapper.xml 查看文件

138
             t2.pay_time,
138
             t2.pay_time,
139
             t2.trade_no,
139
             t2.trade_no,
140
             t2.transaction_id,
140
             t2.transaction_id,
141
-            t2.refund_no,
141
+            t4.refund_no,
142
             t2.total_fee
142
             t2.total_fee
143
         FROM
143
         FROM
144
             ta_raise_record t
144
             ta_raise_record t
145
             INNER JOIN ta_order t2 ON t.order_id = t2.order_id
145
             INNER JOIN ta_order t2 ON t.order_id = t2.order_id
146
             LEFT JOIN ta_person t3 ON t2.person_id = t3.person_id
146
             LEFT JOIN ta_person t3 ON t2.person_id = t3.person_id
147
+            left join ta_order t4 on t2.order_id = t4.parent_order_id
147
         WHERE
148
         WHERE
148
             t.org_id = #{bo.orgId}
149
             t.org_id = #{bo.orgId}
149
             AND t.`status` != - 1
150
             AND t.`status` != - 1