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

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

@@ -101,6 +101,5 @@ public class TaShareController extends BaseController {
             responseBean.addError(e.getMessage());
         }
         return responseBean;
-
     }
 }

src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java

@@ -51,6 +51,9 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
     @Resource
     private ApplicationContext applicationContext;
 
@@ -143,6 +146,19 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         return ResponseBean.success(result);
     }
 
+    @Override
+    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+        list.forEach(e -> {
+            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+        });
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
+
     @Override
     public void makeSure(String openid, String typeOf, String id, Integer orgId) {
         // 查找分享记录
@@ -186,26 +202,18 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
+    public ResponseBean listLiveShare(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer liveActivityId) {
         Page page = new Page(pageNum,pageSize);
         // 分页查询
-        List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
-        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+        List<TaShare> list = taShareMapper.listLiveShare(page, orgId, personType, shareType, phone, liveActivityId);
+        TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(liveActivityId);
         list.forEach(e -> {
-            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+            e.setSalesBatchName(taLiveActivity.getLiveActivityTitle());
         });
         page.setRecords(list);
         return ResponseBean.success(page);
     }
 
-    @Override
-    public ResponseBean listLiveShare(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer liveActivityId) {
-        Page page = new Page(pageNum,pageSize);
-        List<TaShare> list = taShareMapper.listLiveShare(page, orgId, personType, shareType, phone, liveActivityId);
-        page.setRecords(list);
-        return ResponseBean.success(page);
-    }
-
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }