Преглед изворни кода

Merge remote-tracking branch 'origin/dev' into dev

顾绍勇 пре 5 година
родитељ
комит
717a96532b

+ 1
- 1
pom.xml Прегледај датотеку

@@ -10,7 +10,7 @@
10 10
 	</parent>
11 11
 	<groupId>com.huiju</groupId>
12 12
 	<artifactId>estateagents</artifactId>
13
-	<version>v3.5.8</version>
13
+	<version>v3.5.10</version>
14 14
 	<name>estateages</name>
15 15
 	<description>置业经纪人</description>
16 16
 

+ 15
- 1
src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java Прегледај датотеку

@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
6 6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.common.StringUtils;
9 10
 import com.huiju.estateagents.entity.*;
10 11
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
11 12
 import com.huiju.estateagents.mapper.TaPosterMapper;
12 13
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
13 14
 import com.huiju.estateagents.service.ITaBuildingRoomService;
15
+import com.huiju.estateagents.service.ITaHousingResourcesService;
14 16
 import com.huiju.estateagents.service.ITaSalesBatchService;
15 17
 import org.apache.commons.collections.CollectionUtils;
16 18
 import org.checkerframework.checker.units.qual.A;
@@ -55,6 +57,9 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
55 57
     @Autowired
56 58
     private TaHousingResourcesMapper taHousingResourcesMapper;
57 59
 
60
+    @Autowired
61
+    private ITaHousingResourcesService taHousingResourcesService;
62
+
58 63
     @Autowired
59 64
     private ITaBuildingRoomService taBuildingRoomService;
60 65
 
@@ -75,12 +80,21 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
75 80
         List<TaHousingResources> housingList =taHousingResourcesMapper.selectHousingList(orgId,taSalesBatchList);
76 81
         List<TaBuildingRoom> taBuildingRoomList = new ArrayList<>();
77 82
         housingList.forEach(e -> {
83
+            e.setStatus(CommConstant.STATUS_DELETE);
78 84
             TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
79 85
             taBuildingRoom.setRoomId(e.getRoomId());
80 86
             taBuildingRoom.setStatus(CommConstant.STATUS_DELETE);
81 87
             taBuildingRoomList.add(taBuildingRoom);
82 88
         });
83
-        taBuildingRoomService.updateBatchById(taBuildingRoomList);
89
+
90
+        //房源改为无效
91
+        if (CollectionUtils.isNotEmpty(housingList)){
92
+            taHousingResourcesService.updateBatchById(housingList);
93
+        }
94
+
95
+        if (CollectionUtils.isNotEmpty(taBuildingRoomList)){
96
+            taBuildingRoomService.updateBatchById(taBuildingRoomList);
97
+        }
84 98
 
85 99
         //删除销售批次
86 100
         taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);

+ 1
- 1
src/main/resources/mapper/TaShareCountMapper.xml Прегледај датотеку

@@ -67,7 +67,7 @@
67 67
                 when e.building_name != null || e.building_name != '' then e.building_name
68 68
                 when f.news_name != null || f.news_name != '' then f.news_name
69 69
                 when h.sales_batch_name != null || h.sales_batch_name !='' then h.sales_batch_name
70
-                when a.`name` != null || a.`name` != '' then a.`name`
70
+                WHEN y.`name` != NULL || y.`name` != '' THEN y.`name`
71 71
                 else '空'
72 72
                 end as shareTitle,
73 73
                         z.phone as personPhone,