Bläddra i källkod

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

# Conflicts:
#	src/main/java/com/huiju/estateagents/service/impl/TaLiveActivityServiceImpl.java
weichaochao 5 år sedan
förälder
incheckning
af0773987c

+ 1
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java Visa fil

@@ -440,6 +440,7 @@ public class CommConstant {
440 440
 	public static final Object GROUP_ACTIVITY = "groupActivity";
441 441
 	public static final String TARGET_TYPE_H5 = "H5";
442 442
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
443
+    public static final String LIVE_ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/live/index\"}";
443 444
     public static final String DRAINAGE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
444 445
     public static final String HOUSE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/houseList/index\"}";
445 446
     

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java Visa fil

@@ -61,7 +61,7 @@ public class TaLiveActivityController extends BaseController {
61 61
         ResponseBean responseBean = new ResponseBean();
62 62
         try {
63 63
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
64
-                    liveActivityTitle, cityId, buildingId, status);
64
+                    liveActivityTitle, cityId, buildingId, status,getTaPersonBuildingListByUserId(request));
65 65
             responseBean.addSuccess(result);
66 66
 
67 67
         } catch (Exception e) {
@@ -253,7 +253,7 @@ public class TaLiveActivityController extends BaseController {
253 253
         try {
254 254
             status = status == null ? 1 : status;
255 255
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
256
-                    liveActivityTitle, cityId, buildingId, status);
256
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
257 257
             responseBean.addSuccess(result);
258 258
 
259 259
         } catch (Exception e) {

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java Visa fil

@@ -67,7 +67,7 @@ public class TaSalesBatchController extends BaseController {
67 67
             //使用分页插件
68 68
             IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
69 69
 
70
-            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request));
70
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request),getTaPersonBuildingListByUserId(request));
71 71
             responseBean.addSuccess(result);
72 72
         } catch (Exception e) {
73 73
             e.printStackTrace();

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaLiveActivityMapper.java Visa fil

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.huiju.estateagents.entity.TaLiveActivity;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 7
 import org.apache.ibatis.annotations.Mapper;
7 8
 import org.apache.ibatis.annotations.Param;
8 9
 import org.springframework.stereotype.Component;
@@ -29,7 +30,7 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
29 30
      */
30 31
     Boolean addVisitNum(@Param("id") String id);
31 32
 
32
-    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId")Integer orgId);
33
+    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
33 34
     /**
34 35
      * 批量更新直播活动状态
35 36
      *

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaSalesBatchMapper.java Visa fil

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.huiju.estateagents.entity.TaPersonBuilding;
5 6
 import com.huiju.estateagents.entity.TaSalesBatch;
6 7
 import org.apache.ibatis.annotations.Mapper;
7 8
 import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@ import java.util.Map;
19 20
  */
20 21
 @Mapper
21 22
 public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
22
-    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId);
23
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList")  List<TaPersonBuilding> personBuildingList);
23 24
 
24 25
     /**
25 26
      * 根据批次号统计预选数据

+ 4
- 2
src/main/java/com/huiju/estateagents/service/ITaLiveActivityService.java Visa fil

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
4 4
 import com.baomidou.mybatisplus.extension.service.IService;
5 5
 import com.huiju.estateagents.base.ResponseBean;
6 6
 import com.huiju.estateagents.entity.TaLiveActivity;
7
+import com.huiju.estateagents.entity.TaPersonBuilding;
7 8
 
8 9
 import java.util.List;
9 10
 
@@ -28,18 +29,19 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
28 29
     /**
29 30
      * 条件查询直播活动列表
30 31
      *
32
+     * @param liveDetailType
31 33
      * @param pageNum
32 34
      * @param pageSize
33 35
      * @param orgId
34 36
      * @param liveActivityTitle
35 37
      * @param cityId
36 38
      * @param buildingId
37
-     * @param liveDetailType
38 39
      * @param status
40
+     * @param taPersonBuildingListByUserId
39 41
      * @return
40 42
      */
41 43
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
42
-                                                      String cityId, String buildingId, Integer status);
44
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
43 45
 
44 46
     /**
45 47
      * 访问量自增

+ 2
- 2
src/main/java/com/huiju/estateagents/service/ITaSalesBatchService.java Visa fil

@@ -1,9 +1,9 @@
1 1
 package com.huiju.estateagents.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 4
 import com.baomidou.mybatisplus.extension.service.IService;
6 5
 import com.huiju.estateagents.base.ResponseBean;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
7 7
 import com.huiju.estateagents.entity.TaSalesBatch;
8 8
 
9 9
 import java.util.List;
@@ -17,7 +17,7 @@ import java.util.List;
17 17
  * @since 2020-02-10
18 18
  */
19 19
 public interface ITaSalesBatchService extends IService<TaSalesBatch> {
20
-    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId);
20
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId);
21 21
 
22 22
     ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList);
23 23
 

+ 11
- 17
src/main/java/com/huiju/estateagents/service/impl/TaLiveActivityServiceImpl.java Visa fil

@@ -17,7 +17,6 @@ import org.slf4j.Logger;
17 17
 import org.slf4j.LoggerFactory;
18 18
 import org.springframework.beans.factory.annotation.Autowired;
19 19
 import org.springframework.stereotype.Service;
20
-import org.springframework.transaction.annotation.Transactional;
21 20
 
22 21
 import java.time.LocalDateTime;
23 22
 import java.util.ArrayList;
@@ -71,7 +70,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
71 70
         taLiveActivity.setCreateDate(LocalDateTime.now());
72 71
         taLiveActivity.setUpdateDate(LocalDateTime.now());
73 72
         if (StringUtils.isNotBlank(taLiveActivity.getLiveRoomParam())) {
74
-            taLiveActivity.setLiveAppName(taLiveActivity.getLiveRoomParam().replace(".html", ""));
73
+            taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
75 74
         }
76 75
 
77 76
         Boolean result = save(taLiveActivity);
@@ -79,19 +78,14 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
79 78
             responseBean.addError("fail");
80 79
             return responseBean;
81 80
         }
82
-
83
-//        // 生成二维码
84
-//        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
85
-//        taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
86
-//        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
87
-//        /**
88
-//         *  TODO 部分信息待修改
89
-//         */
90
-//        ResponseBean taMiniappQrcode = miniAppService.getQrCode
91
-//                (CommConstant.ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
92
-//                        .replace("#1", "live"), taMiniapp.getMiniappId());
93
-//        taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
94
-//        updateById(taLiveActivity);
81
+        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
82
+        taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
83
+        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
84
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode
85
+                (CommConstant.LIVE_ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
86
+                        .replace("#1", "live"), taMiniapp.getMiniappId());
87
+        taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
88
+        updateById(taLiveActivity);
95 89
 
96 90
         // 设置默认海报数据
97 91
         TaShareContent shareContent = new TaShareContent();
@@ -110,13 +104,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
110 104
 
111 105
     @Override
112 106
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
113
-                                                             String cityId, String buildingId, Integer status) {
107
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
114 108
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数:pageNum:{},pageSize:{},orgId:{}," +
115 109
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
116 110
                 liveActivityTitle, cityId, buildingId, status);
117 111
 
118 112
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
119
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId);
113
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId);
120 114
     }
121 115
 
122 116
     @Override

+ 2
- 4
src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java Visa fil

@@ -6,7 +6,6 @@ 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;
10 9
 import com.huiju.estateagents.entity.*;
11 10
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
12 11
 import com.huiju.estateagents.mapper.TaPosterMapper;
@@ -16,7 +15,6 @@ import com.huiju.estateagents.service.ITaBuildingService;
16 15
 import com.huiju.estateagents.service.ITaHousingResourcesService;
17 16
 import com.huiju.estateagents.service.ITaSalesBatchService;
18 17
 import org.apache.commons.collections.CollectionUtils;
19
-import org.checkerframework.checker.units.qual.A;
20 18
 import org.slf4j.Logger;
21 19
 import org.slf4j.LoggerFactory;
22 20
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,8 +66,8 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
68 66
     private ITaBuildingService taBuildingService;
69 67
 
70 68
     @Override
71
-    public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
72
-        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
69
+    public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
70
+        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId,taPersonBuildingListByUserId);
73 71
     }
74 72
 
75 73
     @Override

+ 6
- 0
src/main/resources/mapper/TaLiveActivityMapper.xml Visa fil

@@ -38,6 +38,12 @@
38 38
          and t.city_id = #{cityId}
39 39
      </if><if test="buildingId != null and buildingId != ''">
40 40
          and t.building_id = #{buildingId}
41
+    </if>
42
+    <if test="personBuildingList != null and personBuildingList.size > 0">
43
+        AND t.building_id in
44
+        <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
45
+            #{personBuilding.buildingId}
46
+        </foreach>
41 47
     </if>
42 48
         order by t.weight desc
43 49
     </select>

+ 6
- 0
src/main/resources/mapper/TaSalesBatchMapper.xml Visa fil

@@ -23,6 +23,12 @@
23 23
         <if test="status != null">
24 24
             and t.status = #{status}
25 25
         </if>
26
+        <if test="personBuildingList != null and personBuildingList.size > 0">
27
+            AND t.building_id in
28
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
29
+                #{personBuilding.buildingId}
30
+            </foreach>
31
+        </if>
26 32
     </select>
27 33
 
28 34
     <select id="countPreSelectRecord" resultType="java.lang.Integer">