合并

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -373,4 +373,15 @@ public class CommConstant {
     // 私客
     public static final String CUTOMER_TYPE_PRIVATE = "private";
 
+
+    //项目
+    public static final String POSTER_CONTENT_TYPE_BUILDING = "building";
+    //活动
+    public static final String POSTER_CONTENT_TYPE_ACTIVITY = "activity";
+    //资讯
+    public static final String POSTER_CONTENT_TYPE_NEWS = "news";
+    //人员
+    public static final String POSTER_CONTENT_TYPE_PERSON = "person";
+
+
 }

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

@@ -466,7 +466,7 @@ public class TaPersonController extends BaseController {
      * @param channelCode 渠道码
      * @return
      */
-    @RequestMapping(value="/wx/customer/recommend/beComeChannel/{channelCode}",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/customer/recommend/becomeChannel/{channelCode}",method= RequestMethod.PUT)
     public ResponseBean taRecommendAgentBecomeChannel(@PathVariable String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -231,4 +231,10 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<TaBuildingProjectType> buildingProjectType;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
 }

src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java

@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -181,4 +182,10 @@ public class TaBuildingDynamic implements Serializable {
      * 公司Id
      */
     private Integer orgId;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
 }

src/main/java/com/huiju/estateagents/entity/TaNews.java

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -116,4 +117,10 @@ public class TaNews implements Serializable {
 
     @TableField(exist = false)
     private Integer isSave;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
 }

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -258,4 +258,10 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private int inviteCount;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
 }

src/main/java/com/huiju/estateagents/entity/TaPoster.java

@@ -36,6 +36,8 @@ public class TaPoster implements Serializable {
      */
     private String targetId;
 
+    private String targetType;
+
     /**
      * 海报模板
      */

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

@@ -4,6 +4,8 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPoster;
 
+import java.util.List;
+
 /**
  * <p>
  * 分享海报表  服务类
@@ -14,4 +16,6 @@ import com.huiju.estateagents.entity.TaPoster;
  */
 public interface TaPosterService extends IService<TaPoster> {
 
+    List<TaPoster> getPostersForTarget(String targetId,String targetType);
+
 }

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

@@ -4,6 +4,8 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaShareContent;
 
+import java.util.List;
+
 /**
  * <p>
  *   服务类
@@ -13,5 +15,5 @@ import com.huiju.estateagents.entity.TaShareContent;
  * @since 2019-09-21
  */
 public interface TaShareContentService extends IService<TaShareContent> {
-
+    List<TaShareContent> getPostersForTarget(String targetId, String targetType);
 }

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

@@ -1,12 +1,18 @@
 package com.huiju.estateagents.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.mapper.TaShareContentMapper;
+import com.huiju.estateagents.service.TaPosterService;
 import com.huiju.estateagents.service.TaShareContentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *   服务实现类
@@ -17,5 +23,17 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ShareContentServiceImpl extends ServiceImpl<TaShareContentMapper, TaShareContent> implements TaShareContentService {
+    @Autowired
+    TaShareContentMapper taShareContentMapper;
+
+    @Override
+    public List<TaShareContent> getPostersForTarget(String targetId, String targetType){
+        QueryWrapper<TaShareContent>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id",targetId);
+        queryWrapper.eq("share_content_type",targetType);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaShareContent> data = taShareContentMapper.selectList(queryWrapper);
+        return data;
+    }
 
 }

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

@@ -1,12 +1,17 @@
 package com.huiju.estateagents.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPoster;
 import com.huiju.estateagents.mapper.TaPosterMapper;
 import com.huiju.estateagents.service.TaPosterService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 分享海报表  服务实现类
@@ -18,4 +23,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPosterServiceImpl extends ServiceImpl<TaPosterMapper, TaPoster> implements TaPosterService {
 
+    @Autowired
+    TaPosterMapper taPosterMapper;
+
+
+    @Override
+    public List<TaPoster> getPostersForTarget(String targetId, String targetType){
+        QueryWrapper<TaPoster>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id",targetId);
+        queryWrapper.eq("target_type",targetType);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaPoster> data =taPosterMapper.selectList(queryWrapper);
+        return data;
+
+    }
+
 }