* bug fix

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

@@ -52,18 +52,23 @@ public class TaLiveActivityController extends BaseController {
      * @param buildingId        所属楼盘
      * @param liveDetailType    详情类型 0是模板，1是自定义
      * @param status            状态
+     * @param source            查询来源，1:直播等活动，2:开屏广告
      * @param request
      * @return
      */
     @RequestMapping(value = "/admin/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                           String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                           String liveActivityTitle,
+                                           String cityId,
+                                           String buildingId,
+                                           Integer status,
+                                           @RequestParam(value = "source", defaultValue = "1") Integer source,
                                            HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request));
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request), source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -161,8 +166,8 @@ public class TaLiveActivityController extends BaseController {
                 iExtendContentService.updateBatchById(list);
             }
 
-            if(!StringUtils.isEmpty(taLiveActivity.getLiveRoomParam())){
-                taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html",""));
+            if (!StringUtils.isEmpty(taLiveActivity.getLiveRoomParam())) {
+                taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
             }
 
             if (iTaLiveActivityService.updateById(taLiveActivity)) {
@@ -254,14 +259,18 @@ public class TaLiveActivityController extends BaseController {
     @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                     String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                                     String liveActivityTitle,
+                                                     String cityId,
+                                                     String buildingId,
+                                                     Integer status,
+                                                     @RequestParam(value = "source", defaultValue = "1") Integer source,
                                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, null, null);
+                    liveActivityTitle, cityId, buildingId, status, null, null, source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
-    * 引流项目  前端控制器
-    * </p>
+ * 引流项目  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-10-18
@@ -48,7 +48,7 @@ public class TaDrainageController extends BaseController {
 
     @Autowired
     public ITaDrainageService iTaDrainageService;
-    
+
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
@@ -66,56 +66,68 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
+     * @param drainageId
+     * @param name
+     * @param isMiniapp
+     * @param status
+     * @param buildingId
+     * @param source     查询来源,1:H5等活动，2:开屏广告
+     * @param request
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage",method= RequestMethod.GET)
-    public ResponseBean taDrainageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value ="drainageId",required = false) Integer drainageId,
-                                       @RequestParam(value ="name",required = false) String name,
-                                       @RequestParam(value ="isMiniapp",required = false) Integer isMiniapp,
-                                       @RequestParam(value ="status",required = false) Integer status,
-                                       @RequestParam(value ="buildingId",required = false) String buildingId,
-                                       HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage", method = RequestMethod.GET)
+    public ResponseBean taDrainageList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "drainageId", required = false) Integer drainageId,
+                                       @RequestParam(value = "name", required = false) String name,
+                                       @RequestParam(value = "isMiniapp", required = false) Integer isMiniapp,
+                                       @RequestParam(value = "status", required = false) Integer status,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "source", defaultValue = "1") Integer source,
+                                       HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
             //使用分页插件
-		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
+            IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq(null != isMiniapp,"is_miniapp",isMiniapp);
-            if (null == status){
-                queryWrapper.gt("status",-1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq(null != isMiniapp, "is_miniapp", isMiniapp);
+            if (null == status) {
+                queryWrapper.gt("status", -1);
+            }
+            queryWrapper.eq(null != status, "status", status);
+            if(2 == source){
+                queryWrapper.isNull(StringUtils.isEmpty(buildingId), "building_id");
+            }else{
+                queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
             }
-            queryWrapper.eq(null != status,"status",status);
-            queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
-            queryWrapper.isNull(StringUtils.isEmpty(buildingId),"building_id");
-            queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
-            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
-            queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
+            queryWrapper.eq(null != drainageId, "drainage_id", drainageId);
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id", taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user", getUserId(request)));
+            queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);
             List<TaDrainage> records = result.getRecords();
             records.forEach(e -> {
                 QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-                taThirdPartyMiniappConfigQueryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
-                taThirdPartyMiniappConfigQueryWrapper.eq("target_id",e.getDrainageId());
-                taThirdPartyMiniappConfigQueryWrapper.eq("org_id",getOrgId(request));
+                taThirdPartyMiniappConfigQueryWrapper.eq("target_type", CommConstant.TARGET_TYPE_H5);
+                taThirdPartyMiniappConfigQueryWrapper.eq("target_id", e.getDrainageId());
+                taThirdPartyMiniappConfigQueryWrapper.eq("org_id", getOrgId(request));
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-                if (null != taThirdPartyMiniappConfig){
+                if (null != taThirdPartyMiniappConfig) {
                     e.setAppid(taThirdPartyMiniappConfig.getAppid());
                     e.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
                 }
             });
             result.setRecords(records);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageList -=- {}",e.toString());
+            logger.error("taDrainageList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -123,27 +135,28 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/add",method= RequestMethod.POST)
-    public ResponseBean taDrainageAdd(@RequestBody TaDrainage taDrainage,HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/add", method = RequestMethod.POST)
+    public ResponseBean taDrainageAdd(@RequestBody TaDrainage taDrainage, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setOrgId(getOrgId(request));
             taDrainage.setCreateDate(LocalDateTime.now());
             taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
-            if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())){
+            if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())) {
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
             }
             taDrainage.setCreateUser(getUserId(request));
-            if (iTaDrainageService.save(taDrainage)){
+            if (iTaDrainageService.save(taDrainage)) {
                 // 根据ORGID查询当前小程序表的miniapp_id
-                QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
-                taMiniappQuery.eq("org_id",getOrgId(request));
+                QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+                taMiniappQuery.eq("org_id", getOrgId(request));
                 TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
                 // 生成二维码
-                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
+                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0", taDrainage.getDrainageId().toString()).replace("#1", "h5"), taMiniapp.getMiniappId());
                 taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
                 iTaDrainageService.updateById(taDrainage);
 
@@ -157,33 +170,35 @@ public class TaDrainageController extends BaseController {
                 taThirdPartyMiniappConfig.setTargetId(taDrainage.getDrainageId().toString());
                 iTaThirdPartyMiniappConfigService.save(taThirdPartyMiniappConfig);
                 responseBean.addSuccess(taDrainage);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageAdd -=- {}",e.toString());
+            logger.error("taDrainageAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
-    
+
     /**
      * 获取uuid
+     *
      * @return
      */
     private String getUUIDS() {
-        String uuid= UUID.randomUUID().toString().replace("-", "");
+        String uuid = UUID.randomUUID().toString().replace("-", "");
         return uuid;
     }
-    
+
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/admin/taDrainage/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taDrainageDelete(@PathVariable Integer id, HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taDrainageDelete(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
 
@@ -195,24 +210,24 @@ public class TaDrainageController extends BaseController {
             }
 
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",drainage.getOrgId());
-            queryWrapper.eq("content_type",CommConstant.EVENT_H5);
-            queryWrapper.eq("target_id",drainage.getDrainageId());
+            queryWrapper.eq("org_id", drainage.getOrgId());
+            queryWrapper.eq("content_type", CommConstant.EVENT_H5);
+            queryWrapper.eq("target_id", drainage.getDrainageId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (null != drainage.getStatus() && drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0){
+            if (null != drainage.getStatus() && drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0) {
                 responseBean.addError("删除项目会删除全部数据，不建议删除数据。可以点击下架按钮终止活动。");
                 return responseBean;
             }
 
             drainage.setStatus(-1);
-            if(iTaDrainageService.updateById(drainage)){
+            if (iTaDrainageService.updateById(drainage)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -220,30 +235,31 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.PUT)
     public ResponseBean taDrainageUpdate(@PathVariable Integer id,
-                                        @RequestBody TaDrainage taDrainage){
+                                         @RequestBody TaDrainage taDrainage) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setDrainageId(id);
-            if (!taDrainage.getIsMiniapp()){
+            if (!taDrainage.getIsMiniapp()) {
                 taDrainage.setShareImg("");
                 taDrainage.setH5Address("");
                 taDrainage.setShareTitle("");
                 taDrainage.setMiddleImg("");
             }
-            if (iTaDrainageService.updateById(taDrainage)){
+            if (iTaDrainageService.updateById(taDrainage)) {
                 responseBean.addSuccess(taDrainage);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageUpdate -=- {}",e.toString());
+            logger.error("taDrainageUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -251,26 +267,27 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.GET)
-    public ResponseBean taDrainageGet(@PathVariable Integer id,HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.GET)
+    public ResponseBean taDrainageGet(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaDrainage taDrainage = iTaDrainageService.getById(id);
             QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
-            queryWrapper.eq("target_id",taDrainage.getDrainageId());
-            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("target_type", CommConstant.TARGET_TYPE_H5);
+            queryWrapper.eq("target_id", taDrainage.getDrainageId());
+            queryWrapper.eq("org_id", getOrgId(request));
             TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
-            if (null != taThirdPartyMiniappConfig){
+            if (null != taThirdPartyMiniappConfig) {
                 taDrainage.setAppid(taThirdPartyMiniappConfig.getAppid());
                 taDrainage.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
             }
             responseBean.addSuccess(taDrainage);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -278,32 +295,33 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 更改上架下架状态
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/exchange/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taDrainage/exchange/{id}", method = RequestMethod.PUT)
     public ResponseBean exchangeDrainage(@PathVariable Integer id,
-                                         @RequestBody TaDrainage taDrainage){
+                                         @RequestBody TaDrainage taDrainage) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setDrainageId(id);
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",taDrainage.getOrgId());
-            queryWrapper.eq("content_type",CommConstant.EVENT_H5);
-            queryWrapper.eq("target_id",taDrainage.getDrainageId());
+            queryWrapper.eq("org_id", taDrainage.getOrgId());
+            queryWrapper.eq("content_type", CommConstant.EVENT_H5);
+            queryWrapper.eq("target_id", taDrainage.getDrainageId());
 
             queryWrapper.gt("status", CommConstant.STATUS_DELETE); // fix bug #6816
 
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
+            if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)) {
                 taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
                 //如果H5有被轮播图或开屏广告选中则轮播图和开屏广告都要下架
                 list.forEach(e -> {
                     e.setStatus(CommConstant.STATUS_UNACCALIMED);
                 });
-            }else{
-                if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isBefore(LocalDateTime.now())){
+            } else {
+                if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isBefore(LocalDateTime.now())) {
                     responseBean.addError("已过下架时间，无法上架");
                     return responseBean;
                 }
@@ -313,17 +331,17 @@ public class TaDrainageController extends BaseController {
                     e.setStatus(CommConstant.STATUS_NORMAL);
                 });
             }
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
-            if (iTaDrainageService.updateById(taDrainage)){
+            if (iTaDrainageService.updateById(taDrainage)) {
                 responseBean.addSuccess(taDrainage);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageUpdate -=- {}",e.toString());
+            logger.error("taDrainageUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -331,21 +349,22 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 微信端获取数据
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/wx/taDrainage/{id}",method= RequestMethod.GET)
+    @RequestMapping(value = "/wx/taDrainage/{id}", method = RequestMethod.GET)
     @ReportCustomer(type = "h5")
     public ResponseBean wxDrainageGet(@PathVariable Integer id,
                                       @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
                                       @RequestParam(value = "channelId", required = false) String channelId,
                                       @RequestParam(value = "sceneId", required = false) String sceneId,
-                                      HttpServletRequest request){
+                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaDrainageService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/mapper/TaLiveActivityMapper.java

@@ -30,7 +30,15 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
      */
     Boolean addVisitNum(@Param("id") String id);
 
-    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, @Param("userId") Integer userId);
+    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,
+                                                    @Param("userId") Integer userId,
+                                                    @Param("source") Integer source);
     /**
      * 批量更新直播活动状态
      *

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerAspect.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.fastjson.JSONObject;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
@@ -47,7 +48,9 @@ public class ReportCustomerAspect extends BaseController {
     ReportCustomerImpl reportCustomerImpl;
 
 
-    /** 以自定义 @ReportCustomer 注解为切点 */
+    /**
+     * 以自定义 @ReportCustomer 注解为切点
+     */
     @Pointcut("@annotation(com.huiju.estateagents.reportCustomerAop.ReportCustomer)")
     public void reportCustomer() {
 
@@ -55,9 +58,10 @@ public class ReportCustomerAspect extends BaseController {
 
     @After("reportCustomer()")
     public ResponseBean doAround(JoinPoint proceedingJoinPoint) throws Throwable {
+        logger.info("ReportCustomerAspect 开始");
         ResponseBean responseBean = new ResponseBean();
-        try{
-            ReportCustomer reportCustomer = ((MethodSignature)proceedingJoinPoint.getSignature()).getMethod().getAnnotation(ReportCustomer.class);
+        try {
+            ReportCustomer reportCustomer = ((MethodSignature) proceedingJoinPoint.getSignature()).getMethod().getAnnotation(ReportCustomer.class);
             //获取请求参数
             Object[] args = proceedingJoinPoint.getArgs();
             String targetType = reportCustomer.type();
@@ -65,10 +69,12 @@ public class ReportCustomerAspect extends BaseController {
             String qrCodeId = String.valueOf(args[1]);
             String channelId = String.valueOf(args[2]);
             String sceneId = String.valueOf(args[3]);
-            HttpServletRequest request = (HttpServletRequest)args[4];
+            HttpServletRequest request = (HttpServletRequest) args[4];
+
+            logger.info("ReportCustomerAspect 接收参数，args：{}", JSONObject.toJSONString(args));
 
             Map<String, Object> stringObjectMap = getBuildingByIdAndType(targetId, targetType);
-            if (request == null){
+            if (request == null) {
                 responseBean.addError("未授权，不进行操作");
                 return responseBean;
             }
@@ -76,11 +82,13 @@ public class ReportCustomerAspect extends BaseController {
             String consultantPersonId = request.getHeader("x-consultant");
             String recommend = request.getHeader("x-recommender");
 
+            logger.info("ReportCustomerAspect 获取header信息，consultantPersonId：{}，recommend：{}", consultantPersonId, recommend);
+
             List<TaPerson> persons = getPersonsByOpenId(getOpenId(request));
             TaPerson taPerson = persons.get(0);
             Integer orgId = getOrgId(request);
 
-            TaCustomerFrom  taCustomerFrom = assembleVO(taPerson, targetType, targetId, stringObjectMap.get("targetName").toString(), orgId, sceneId, channelId, qrCodeId);
+            TaCustomerFrom taCustomerFrom = assembleVO(taPerson, targetType, targetId, stringObjectMap.get("targetName").toString(), orgId, sceneId, channelId, qrCodeId);
             // 推广人
             TaPerson recPerson = StringUtils.isEmpty(recommend) ? null : taPersonMapper.getById(recommend);
             // 是否置业顾问
@@ -97,14 +105,15 @@ public class ReportCustomerAspect extends BaseController {
             iTaRecommendCustomerService.newCustomer(orgId, taPerson, recPerson, consultantInfo, building, taCustomerFrom);
             responseBean.addSuccess("绑定成功");
 
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("绑定失败");
             responseBean.addError("失败");
         }
+        logger.info("ReportCustomerAspect 结束");
         return responseBean;
     }
 
-    public TaCustomerFrom assembleVO(TaPerson person, String targetType, String targetId, String targetName, Integer orgId, String sceneId, String channelId, String qrCodeId){
+    public TaCustomerFrom assembleVO(TaPerson person, String targetType, String targetId, String targetName, Integer orgId, String sceneId, String channelId, String qrCodeId) {
         // 客户来源
         TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
@@ -114,10 +123,10 @@ public class ReportCustomerAspect extends BaseController {
         customerFrom.setTargetName(targetName);
         customerFrom.setOrgId(orgId);
         customerFrom.setSceneId(sceneId);
-        if (!StringUtils.isEmpty(channelId)){
+        if (!StringUtils.isEmpty(channelId)) {
             customerFrom.setChannelId(Integer.valueOf(channelId));
         }
-        if(!StringUtils.isEmpty(qrCodeId)){
+        if (!StringUtils.isEmpty(qrCodeId)) {
             customerFrom.setQrCodeId(Integer.valueOf(qrCodeId));
         }
         customerFrom.setCreateDate(LocalDateTime.now());
@@ -125,14 +134,14 @@ public class ReportCustomerAspect extends BaseController {
         return customerFrom;
     }
 
-    public List<TaPerson> getPersonsByOpenId(String openId){
+    public List<TaPerson> getPersonsByOpenId(String openId) {
         return taPersonMapper.getPersonByOpenId(openId);
     }
 
-    public Map<String, Object> getBuildingByIdAndType(String targetId, String targetType){
+    public Map<String, Object> getBuildingByIdAndType(String targetId, String targetType) {
         Map<String, Object> buildingAndNameInfo = null;
 
-        switch (targetType){
+        switch (targetType) {
             case CommConstant.FAVOR_ACTIVITY:
                 buildingAndNameInfo = reportCustomerImpl.selectActivityBuildingInfo(targetId);
                 break;

src/main/java/com/huiju/estateagents/service/ITaLiveActivityService.java

@@ -41,7 +41,8 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @return
      */
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId);
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId,
+                                                      Integer userId,Integer source);
 
     /**
      * 访问量自增

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

@@ -104,13 +104,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
 
     @Override
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId) {
-        logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
-                    "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
-                liveActivityTitle, cityId, buildingId, status);
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId,
+                                                             Integer userId, Integer source) {
+        logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{},iveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{},source:{}",
+                pageNum, pageSize, liveActivityTitle, cityId, buildingId, status, source);
 
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId, userId);
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId, taPersonBuildingListByUserId, userId, source);
     }
 
     @Override

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

@@ -175,6 +175,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaPerson consultant, TaBuilding building, TaCustomerFrom from) throws Exception {
+        logger.info("newCustomer 接收参数：orgId：{}，person：{}，recommender：{}，consultant：{}，building：{}，from：{}",
+                orgId, JSONObject.toJSONString(person), JSONObject.toJSONString(recommender), JSONObject.toJSONString(consultant), JSONObject.toJSONString(building), JSONObject.toJSONString(from));
+
         // 如果置业推荐了非自己绑定楼盘, 会生成 2 条客户记录
         List<TaRecommendCustomer> result = new ArrayList<>();
         List<TaBuilding> consultBuildings = null;
@@ -206,6 +209,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 置业与内容楼盘是否有关联关系
         boolean builingAssociated = false;
 
+        logger.info("newCustomer checkCustomer查询结果：hasOrgCust：{}，hasConsultBuildingCust：{}，hasConsultCust：{}，hasBuildingCust：{}",
+                hasOrgCust, hasConsultBuildingCust, hasConsultCust, hasBuildingCust);
+
         // 职业顾问不插入客户表
         boolean personIsConsultant = CommConstant.PERSON_REALTY_CONSULTANT.equals(person.getPersonType()) ? true : false;
         if (personIsConsultant) {
@@ -1314,4 +1320,5 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taCustomerFollowUpRecord.setCustomerSex(taRecommendCustomer.getSex());
         customerFollowUpRecordMapper.insert(taCustomerFollowUpRecord);
     }
+
 }

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -22,34 +22,48 @@
     </update>
 
     <select id="selectLiveListByCondition" resultType="com.huiju.estateagents.entity.TaLiveActivity">
-     select a.building_name,b.name as city_name,c.user_name as createName,d.user_name as updateName, t.* From ta_live_activity t
-     left join ta_building a on t.building_id = a.building_id
-     LEFT JOIN td_city b on t.city_id = b.id
-     left join ta_user c on t.create_user = c.user_id
-     left join ta_user d on t.update_user = d.user_id
+     select
+        a.building_name,
+        b.name as city_name,
+        c.user_name as createName,
+        d.user_name as updateName,
+        t.*
+     From
+        ta_live_activity t
+         left join ta_building a on t.building_id = a.building_id
+         LEFT JOIN td_city b on t.city_id = b.id
+         left join ta_user c on t.create_user = c.user_id
+         left join ta_user d on t.update_user = d.user_id
      where t.org_id = #{orgId} and t.status != -1
-     <if test="status != null">
-         and t.status = #{status}
-     </if>
-     <if test="liveActivityTitle != null and liveActivityTitle != ''">
-         and t.live_Activity_Title like CONCAT('%', #{liveActivityTitle}, '%')
-     </if>
-     <if test="cityId != null and cityId != ''">
-         and t.city_id = #{cityId}
-     </if><if test="buildingId != null and buildingId != ''">
-         and t.building_id = #{buildingId}
-    </if>
-    <if test="buildingId == null or buildingId == ''">
-        and t.building_id is null
-    </if>
-    <if test="personBuildingList != null and personBuildingList.size > 0">
-        AND (t.building_id in
-        <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-            #{personBuilding.buildingId}
-        </foreach>
-        or t.create_user = #{userId})
-    </if>
-        order by t.weight desc
+         <if test="status != null">
+             and t.status = #{status}
+         </if>
+         <if test="liveActivityTitle != null and liveActivityTitle != ''">
+             and t.live_Activity_Title like CONCAT('%', #{liveActivityTitle}, '%')
+         </if>
+         <if test="cityId != null and cityId != ''">
+             and t.city_id = #{cityId}
+         </if>
+         <choose>
+             <when test = 'source == 2'>
+                 <if test="buildingId == null or buildingId == ''">
+                     and t.building_id is null
+                 </if>
+             </when>
+             <otherwise>
+                 <if test="buildingId != null and buildingId != ''">
+                     and t.building_id = #{buildingId}
+                 </if>
+             </otherwise>
+         </choose>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND (t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+            or t.create_user = #{userId})
+        </if>
+            order by t.weight desc
     </select>
     <select id="getDetailById" resultType="com.huiju.estateagents.entity.TaLiveActivity">
         select t.*,a.live_plat_name as liveAppName From ta_live_activity t