Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/config/CorsConfig.java

@@ -1,28 +1,28 @@
-package com.yunzhi.marketing.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * 解决跨域问题
- */
-@Configuration
-public class CorsConfig {
-    private CorsConfiguration buildConfig() {
-        CorsConfiguration corsConfiguration = new CorsConfiguration();
-        corsConfiguration.addAllowedOrigin("*"); // 1 允许任何域名使用
-        corsConfiguration.addAllowedHeader("*"); // 2 允许任何头
-        corsConfiguration.addAllowedMethod("*"); // 3 允许任何方法（post、get等）
-        return corsConfiguration;
-    }
-
-    @Bean
-    public CorsFilter corsFilter() {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", buildConfig()); // 4
-        return new CorsFilter(source);
-    }
-}
+//package com.yunzhi.marketing.config;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.cors.CorsConfiguration;
+//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+//import org.springframework.web.filter.CorsFilter;
+//
+///**
+// * 解决跨域问题
+// */
+//@Configuration
+//public class CorsConfig {
+//    private CorsConfiguration buildConfig() {
+//        CorsConfiguration corsConfiguration = new CorsConfiguration();
+//        corsConfiguration.addAllowedOrigin("*"); // 1 允许任何域名使用
+//        corsConfiguration.addAllowedHeader("*"); // 2 允许任何头
+//        corsConfiguration.addAllowedMethod("*"); // 3 允许任何方法（post、get等）
+//        return corsConfiguration;
+//    }
+//
+//    @Bean
+//    public CorsFilter corsFilter() {
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        source.registerCorsConfiguration("/**", buildConfig()); // 4
+//        return new CorsFilter(source);
+//    }
+//}

src/main/java/com/yunzhi/marketing/controller/TaPersonController.java

@@ -12,6 +12,7 @@ import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.SMSUtils;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaChannel;
 import com.yunzhi.marketing.entity.TaChannelPerson;
 import com.yunzhi.marketing.entity.TaPerson;
@@ -22,6 +23,8 @@ import com.yunzhi.marketing.service.TaChannelPersonService;
 import com.yunzhi.marketing.service.TaChannelService;
 import com.yunzhi.marketing.third.entity.TaThirdPartyMiniappConfig;
 import com.yunzhi.marketing.third.service.ITaThirdPartyMiniappConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -43,6 +46,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "微信用户表", tags = "xlk-微信用户表")
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
@@ -377,6 +381,17 @@ public class TaPersonController extends BaseController {
         return null;
     }
 
+    /**
+     * 成为驻场顾问
+     *
+     */
+    @ApiOperation(value = "wx-成为驻场顾问", notes = "admin-成为驻场顾问")
+    @PostMapping("/wx/marketing")
+    public ResponseBean marketing(@RequestBody PersonMarketingDTO marketingDTO, HttpServletRequest request) {
+        // 当前人员
+        String openid = getOpenId(request);
+        return taPersonService.marketing(marketingDTO,openid);
+    }
 
     /**
      *

src/main/java/com/yunzhi/marketing/dto/PersonMarketingDTO.java

@@ -0,0 +1,9 @@
+package com.yunzhi.marketing.dto;
+
+import lombok.Data;
+
+@Data
+public class PersonMarketingDTO {
+
+    private String marketingCode;
+}

src/main/java/com/yunzhi/marketing/entity/TaBuilding.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import com.yunzhi.marketing.xlk.entity.Trend;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -365,6 +367,11 @@ public class TaBuilding implements Serializable {
     /** 供暖 */
     private String heatingSupply ;
 
+    /**
+     * 驻场code
+     */
+    private String marketingCode;
+
     /**
      * 项目亮点封面
      */
@@ -376,4 +383,10 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<ExtendContent> extendContent;
+
+    @TableField(exist = false)
+    private List<BuildingSpecialRoom> specialRoomList;
+
+    @TableField(exist = false)
+    private List<Trend> trendList;
 }

src/main/java/com/yunzhi/marketing/entity/TaBuildingApartment.java

@@ -65,7 +65,7 @@ public class TaBuildingApartment implements Serializable {
     /**
      * 销售状态
      */
-    private Integer marketStatus;
+    private String marketStatus;
 
     private Double insideArea;
 

src/main/java/com/yunzhi/marketing/po/LiveAndVideoVO.java

@@ -20,4 +20,6 @@ public class LiveAndVideoVO {
     private String type;
 
     private String kind;
+
+    private String images;
 }

src/main/java/com/yunzhi/marketing/service/ITaPersonService.java

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.entity.TaCustomerFrom;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -121,4 +122,12 @@ public interface ITaPersonService extends IService<TaPerson> {
                    TaCustomerFrom customerFrom) throws Exception;
 
     ResponseBean updateUserPhoto(String photoUrl, String openId);
+
+    /**
+     * 成为驻场顾问
+     * @param marketingDTO
+     * @param openid
+     * @return
+     */
+    ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid);
 }

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,6 +16,10 @@ import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.mapper.*;
 import com.yunzhi.marketing.service.*;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import com.yunzhi.marketing.xlk.entity.Trend;
+import com.yunzhi.marketing.xlk.mapper.BuildingSpecialRoomMapper;
+import com.yunzhi.marketing.xlk.mapper.TrendMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -126,6 +131,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private IExtendContentService iExtendContentService;
 
+    @Autowired
+    private BuildingSpecialRoomMapper buildingSpecialRoomMapper;
+
+    @Autowired
+    private TrendMapper trendMapper;
+
+    private String MARKETING_CODE;
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -356,6 +368,19 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<ExtendContent> taExtendContents = iExtendContentService.list(taExtendContentQueryWrapper);
         building.setExtendContent(taExtendContents);
 
+        // 添加楼盘特价房源
+        LambdaQueryWrapper<BuildingSpecialRoom> specialRoomLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        specialRoomLambdaQueryWrapper.eq(BuildingSpecialRoom::getBuildingId,id);
+        specialRoomLambdaQueryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
+        List<BuildingSpecialRoom> buildingSpecialRooms = buildingSpecialRoomMapper.selectList(specialRoomLambdaQueryWrapper);
+        building.setSpecialRoomList(buildingSpecialRooms);
+
+        // 添加楼盘项目动态
+        LambdaQueryWrapper<Trend> lambdaQueryWrapper =new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Trend::getBuildingId,id);
+        lambdaQueryWrapper.orderByDesc(Trend::getCreateDate);
+        List<Trend> trends = trendMapper.selectList(lambdaQueryWrapper);
+        building.setTrendList(trends);
 
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
         taSalesBatch.stream().forEach(record -> {
@@ -574,6 +599,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setStatus(2);
         building.setOrgId(orgId);
         building.setName(building.getBuildingName());
+        // 生成楼盘驻场码
+        getMyMarktingCode();
+        building.setMarketingCode(MARKETING_CODE);
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -681,6 +709,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return ResponseBean.success("");
     }
 
+    /**
+     * 生成六位推荐码 重复重新生成
+     * @return
+     */
+    private void getMyMarktingCode() {
+        String code = String.valueOf((int) ((Math.random() * 9 + 1) * Math.pow(10, 5)));
+        // 查询这个code 在库里存不存在
+        LambdaQueryWrapper<TaBuilding> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaBuilding::getMarketingCode,code);
+        List<TaBuilding> userInfos = taBuildingMapper.selectList(queryWrapper);
+        if (userInfos.size() > 0){
+            getMyMarktingCode();
+        }
+        MARKETING_CODE = code;
+    }
+
     @Override
     public ResponseBean buildingdelete(String id, Integer orgId) {
         TaBuilding building = new TaBuilding();

src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.service.impl;
 
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,6 +15,7 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.DateUtils;
 import com.yunzhi.marketing.common.MD5Utils;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.PersonMarketingDTO;
 import com.yunzhi.marketing.event.EventBus;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.entity.*;
@@ -1292,4 +1294,40 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         responseBean.addSuccess("修改成功");
         return responseBean;
     }
+
+    /**
+     * 成为驻场顾问
+     *
+     * @param marketingDTO
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean marketing(PersonMarketingDTO marketingDTO, String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+
+        // 校验marketingCode 是否正确
+        LambdaQueryWrapper<TaBuilding> taBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        taBuildingLambdaQueryWrapper.eq(TaBuilding::getMarketingCode,marketingDTO.getMarketingCode());
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingLambdaQueryWrapper);
+        if (null == taBuilding){
+            return ResponseBean.error("不合法的驻场码", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        // 成为驻场顾问并绑定楼盘
+        taPerson.setPersonType("marketing");
+        taPersonMapper.updateById(taPerson);
+
+        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+        taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
+        taPersonBuilding.setPersonId(taPerson.getPersonId());
+        taPersonBuilding.setCreateDate(LocalDateTime.now());
+        taPersonBuildingMapper.insert(taPersonBuilding);
+
+        return ResponseBean.success("绑定成功");
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingSpecialRoomController.java

@@ -0,0 +1,175 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.dto.BuildingSpecialRoomDTO;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import com.yunzhi.marketing.xlk.service.IBuildingSpecialRoomService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 特价房源表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "特价房源表", tags = "xlk-特价房源表")
+public class BuildingSpecialRoomController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(BuildingSpecialRoomController.class);
+
+    @Autowired
+    public IBuildingSpecialRoomService iBuildingSpecialRoomService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-查询特价房源列表", notes = "admin-查询特价房源列表")
+    @RequestMapping(value="/buildingSpecialRoom",method= RequestMethod.GET)
+    public ResponseBean buildingSpecialRoomList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value ="buildingId") String buildingId,
+                                                @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<BuildingSpecialRoom> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<BuildingSpecialRoom> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(BuildingSpecialRoom::getOrgId,getOrgId(request));
+            queryWrapper.eq(BuildingSpecialRoom::getBuildingId,buildingId);
+            queryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
+
+            IPage<BuildingSpecialRoom> result = iBuildingSpecialRoomService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param buildingSpecialRoomDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-保存特价房源", notes = "admin-保存特价房源")
+    @RequestMapping(value="/buildingSpecialRoom",method= RequestMethod.POST)
+    public ResponseBean buildingSpecialRoomAdd(@RequestBody BuildingSpecialRoomDTO buildingSpecialRoomDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            BuildingSpecialRoom buildingSpecialRoom = new BuildingSpecialRoom();
+            BeanUtils.copyProperties(buildingSpecialRoomDTO,buildingSpecialRoom);
+            buildingSpecialRoom.setOrgId(orgId);
+            buildingSpecialRoom.setCreateDate(LocalDateTime.now());
+            if (iBuildingSpecialRoomService.save(buildingSpecialRoom)){
+                responseBean.addSuccess(buildingSpecialRoom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-删除特价房源", notes = "admin-删除特价房源")
+    @ResponseBody
+    @RequestMapping(value="/buildingSpecialRoom/{id}", method= RequestMethod.DELETE)
+    public ResponseBean buildingSpecialRoomDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iBuildingSpecialRoomService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param buildingSpecialRoomDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-修改特价房源", notes = "admin-修改特价房源")
+    @RequestMapping(value="/buildingSpecialRoom/{id}",method= RequestMethod.PUT)
+    public ResponseBean buildingSpecialRoomUpdate(@PathVariable String id,
+                                                  @RequestBody BuildingSpecialRoomDTO buildingSpecialRoomDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            BuildingSpecialRoom buildingSpecialRoom = new BuildingSpecialRoom();
+            BeanUtils.copyProperties(buildingSpecialRoomDTO,buildingSpecialRoom);
+            buildingSpecialRoom.setSpecialRoomId(id);
+            if (iBuildingSpecialRoomService.updateById(buildingSpecialRoom)){
+                responseBean.addSuccess(buildingSpecialRoom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-获取特价房源详情", notes = "admin-获取特价房源详情")
+    @RequestMapping(value="/buildingSpecialRoom/{id}",method= RequestMethod.GET)
+    public ResponseBean buildingSpecialRoomGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iBuildingSpecialRoomService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingSpecialRoomDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.yunzhi.marketing.xlk.entity.Video;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -48,6 +51,9 @@ public class CurriculumController extends BaseController {
     @Autowired
     public ICurriculumService iCurriculumService;
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
 
     /**
      * 分页查询列表
@@ -183,4 +189,68 @@ public class CurriculumController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "wx-查询课程表列表", notes = "wx-查询课程表列表")
+    @RequestMapping(value="/wx/curriculum",method= RequestMethod.GET)
+    public ResponseBean wxCurriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="name",required = false) String name,
+                                       @RequestParam(value ="roleId",required = false) Integer roleId,
+                                       @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
+            queryWrapper.eq(!StringUtils.isEmpty(name),Curriculum::getName,name);
+            queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
+            queryWrapper.orderByDesc(Curriculum::getWeight);
+            queryWrapper.orderByDesc(Curriculum::getCreatedTime);
+
+            IPage<Curriculum> result = iCurriculumService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "wx-查询我收藏的课程表列表", notes = "wx-查询我收藏的课程表列表")
+    @RequestMapping(value="/wx/curriculum/save",method= RequestMethod.GET)
+    public ResponseBean saveCurriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            String openid = getOpenId(request);
+            List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = persons.get(0);
+            IPage<Curriculum> result = iCurriculumService.selectMySaveList(pageNum,pageSize,person);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/controller/SearchHouseController.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.dto.SearchHouseReplayDTO;
@@ -53,6 +56,8 @@ public class SearchHouseController extends BaseController {
     @Autowired
     public ITaPersonService taPersonService;
 
+    @Autowired
+    private ITaBuildingService taBuildingService;
 
     /**
      * 分页查询列表
@@ -103,7 +108,24 @@ public class SearchHouseController extends BaseController {
             searchHouse.setOrgId(orgId);
             searchHouse.setCreatedTime(LocalDateTime.now());
             if (iSearchHouseService.save(searchHouse)){
-                responseBean.addSuccess(searchHouse);
+                SearchHouseVO searchHouseVO = new SearchHouseVO();
+                BeanUtils.copyProperties(searchHouse,searchHouseVO);
+                // 获取价格相近的楼盘
+                LambdaQueryWrapper<TaBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(!StringUtils.isEmpty(searchHouseDTO.getIntentArea()),TaBuilding::getBuildingArea,searchHouseDTO.getIntentArea());
+                lambdaQueryWrapper.between(TaBuilding::getPrice,searchHouseDTO.getMinPrice(),searchHouseDTO.getMaxPrice());
+                lambdaQueryWrapper.ne(TaBuilding::getStatus,-1);
+                lambdaQueryWrapper.last(" limit 2");
+                List<TaBuilding> list = taBuildingService.list(lambdaQueryWrapper);
+                if (list.size() < 1){
+                    lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                    lambdaQueryWrapper.eq(!StringUtils.isEmpty(searchHouseDTO.getIntentArea()),TaBuilding::getBuildingArea,searchHouseDTO.getIntentArea());
+                    lambdaQueryWrapper.ne(TaBuilding::getStatus,-1);
+                    lambdaQueryWrapper.last(" limit 2");
+                    list = taBuildingService.list(lambdaQueryWrapper);
+                }
+                searchHouseVO.setTaBuildingList(list);
+                responseBean.addSuccess(searchHouseVO);
             }else {
                 responseBean.addError("fail");
             }

src/main/java/com/yunzhi/marketing/xlk/controller/TrendController.java

@@ -0,0 +1,174 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.dto.TrendDTO;
+import com.yunzhi.marketing.xlk.entity.Trend;
+import com.yunzhi.marketing.xlk.service.ITrendService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 项目动态表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "项目动态表", tags = "xlk-项目动态表")
+public class TrendController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TrendController.class);
+
+    @Autowired
+    public ITrendService iTrendService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "admin-查询项目动态列表", notes = "admin-查询项目动态列表")
+    @RequestMapping(value="/trend",method= RequestMethod.GET)
+    public ResponseBean trendList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @RequestParam(value ="buildingId") String buildingId,
+                                  @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<Trend> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<Trend> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Trend::getOrgId,getOrgId(request));
+            queryWrapper.eq(Trend::getBuildingId,buildingId);
+            queryWrapper.orderByDesc(Trend::getCreateDate);
+
+            IPage<Trend> result = iTrendService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param trendDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-保存项目动态表", notes = "admin-保存项目动态表")
+    @RequestMapping(value="/trend",method= RequestMethod.POST)
+    public ResponseBean trendAdd(@RequestBody TrendDTO trendDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Trend trend = new Trend();
+            BeanUtils.copyProperties(trendDTO,trend);
+            trend.setOrgId(getOrgId(request));
+            trend.setCreateDate(LocalDateTime.now());
+            if (iTrendService.save(trend)){
+                responseBean.addSuccess(trend);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-删除项目动态", notes = "admin-删除项目动态")
+    @ResponseBody
+    @RequestMapping(value="/trend/{id}", method= RequestMethod.DELETE)
+    public ResponseBean trendDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTrendService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param trendDTO 实体对象
+     * @return
+     */
+    @ApiOperation(value = "admin-修改项目动态", notes = "admin-修改项目动态")
+    @RequestMapping(value="/trend/{id}",method= RequestMethod.PUT)
+    public ResponseBean trendUpdate(@PathVariable String id,
+                                    @RequestBody TrendDTO trendDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Trend trend = new Trend();
+            BeanUtils.copyProperties(trendDTO,trend);
+            trend.setTrendId(id);
+            if (iTrendService.updateById(trend)){
+                responseBean.addSuccess(trend);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "admin-查询项目动态详情", notes = "admin-查询项目动态详情")
+    @RequestMapping(value="/trend/{id}",method= RequestMethod.GET)
+    public ResponseBean trendGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTrendService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("trendDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/dto/BuildingSpecialRoomDTO.java

@@ -0,0 +1,73 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 特价房源表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_building_special_room")
+public class BuildingSpecialRoomDTO implements Serializable {
+
+    /**
+     * 房源名称
+     */
+    private String roomName;
+
+    /**
+     * 户型
+     */
+    private String unitType;
+
+    /**
+     * 面积
+     */
+    private String area;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 原始价格
+     */
+    private String originalPrice;
+
+    /**
+     * 现价格
+     */
+    private String currentPrice;
+
+    /**
+     * 节省价格
+     */
+    private String thriftPrice;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/dto/TrendDTO.java

@@ -0,0 +1,48 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目动态表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_trend")
+public class TrendDTO implements Serializable {
+
+    /**
+     * 动态时间
+     */
+    private LocalDateTime trendTime;
+
+    /**
+     * 动态标题
+     */
+    private String trendTitle;
+
+    /**
+     * 动态内容
+     */
+    private String trendContent;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/BuildingSpecialRoom.java

@@ -0,0 +1,91 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 特价房源表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_building_special_room")
+public class BuildingSpecialRoom implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 特价房源id
+     */
+    @TableId(type = IdType.UUID)
+    private String specialRoomId;
+
+    /**
+     * 房源名称
+     */
+    private String roomName;
+
+    /**
+     * 户型
+     */
+    private String unitType;
+
+    /**
+     * 面积
+     */
+    private String area;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 原始价格
+     */
+    private String originalPrice;
+
+    /**
+     * 现价格
+     */
+    private String currentPrice;
+
+    /**
+     * 节省价格
+     */
+    private String thriftPrice;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Trend.java

@@ -0,0 +1,66 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目动态表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_trend")
+public class Trend implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 动态id
+     */
+    @TableId(type = IdType.UUID)
+    private String trendId;
+
+    /**
+     * 动态时间
+     */
+    private LocalDateTime trendTime;
+
+    /**
+     * 动态标题
+     */
+    private String trendTitle;
+
+    /**
+     * 动态内容
+     */
+    private String trendContent;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/BuildingSpecialRoomMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 特价房源表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Mapper
+public interface BuildingSpecialRoomMapper extends BaseMapper<BuildingSpecialRoom> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/CurriculumMapper.java

@@ -1,8 +1,10 @@
 package com.yunzhi.marketing.xlk.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CurriculumMapper extends BaseMapper<Curriculum> {
 
+    IPage<Curriculum> selectMySaveList(IPage<Curriculum> pg,@Param("personId") String personId);
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/TrendMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.Trend;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目动态表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Mapper
+public interface TrendMapper extends BaseMapper<Trend> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/IBuildingSpecialRoomService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+
+/**
+ * <p>
+ * 特价房源表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+public interface IBuildingSpecialRoomService extends IService<BuildingSpecialRoom> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/ICurriculumService.java

@@ -1,5 +1,7 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICurriculumService extends IService<Curriculum> {
 
+    /**
+     * 获取我的收藏列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param person
+     * @return
+     */
+    IPage<Curriculum> selectMySaveList(Integer pageNum, Integer pageSize, TaPerson person);
 }

src/main/java/com/yunzhi/marketing/xlk/service/ITrendService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.Trend;
+
+/**
+ * <p>
+ * 项目动态表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+public interface ITrendService extends IService<Trend> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/BuildingSpecialRoomServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
+import com.yunzhi.marketing.xlk.mapper.BuildingSpecialRoomMapper;
+import com.yunzhi.marketing.xlk.service.IBuildingSpecialRoomService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 特价房源表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Service
+public class BuildingSpecialRoomServiceImpl extends ServiceImpl<BuildingSpecialRoomMapper, BuildingSpecialRoom> implements IBuildingSpecialRoomService {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/CurriculumServiceImpl.java

@@ -1,9 +1,13 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.yunzhi.marketing.xlk.mapper.CurriculumMapper;
 import com.yunzhi.marketing.xlk.service.ICurriculumService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class CurriculumServiceImpl extends ServiceImpl<CurriculumMapper, Curriculum> implements ICurriculumService {
 
+    /**
+     * 获取我的收藏列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param person
+     * @return
+     */
+    @Override
+    public IPage<Curriculum> selectMySaveList(Integer pageNum, Integer pageSize, TaPerson person) {
+        IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
+        IPage<Curriculum> result = this.baseMapper.selectMySaveList(pg,person.getPersonId());
+        return result;
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/TrendServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.entity.Trend;
+import com.yunzhi.marketing.xlk.mapper.TrendMapper;
+import com.yunzhi.marketing.xlk.service.ITrendService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目动态表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-12
+ */
+@Service
+public class TrendServiceImpl extends ServiceImpl<TrendMapper, Trend> implements ITrendService {
+
+}

src/main/java/com/yunzhi/marketing/xlk/vo/SearchHouseVO.java

@@ -1,12 +1,14 @@
 package com.yunzhi.marketing.xlk.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.xlk.entity.SearchHouse;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -29,4 +31,6 @@ public class SearchHouseVO extends SearchHouse implements Serializable {
     private String phone;
 
     private String gender;
+
+    private List<TaBuilding> taBuildingList;
 }

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -76,6 +76,7 @@
             t.live_activity_title AS title,
             t.live_start_date AS start_time,
             t.live_end_date AS end_time,
+            t.detail_img as images,
             a.building_name,
             b.NAME AS city_name,
             "live" as type
@@ -93,6 +94,7 @@
             t.NAME AS title,
             t.CREATED_TIME AS startTime,
             t.CREATED_TIME AS endTime,
+            t.vide_img as images,
             a.building_name,
             b.NAME AS city_name,
             "video" as type

src/main/resources/mapper/xlk/BuildingSpecialRoomMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.marketing.xlk.mapper.BuildingSpecialRoomMapper">
+
+</mapper>

src/main/resources/mapper/xlk/CurriculumMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.CurriculumMapper">
 
+    <select id="selectMySaveList" resultType="com.yunzhi.marketing.xlk.entity.Curriculum">
+        SELECT
+        x.*
+        FROM
+        ta_save t
+        LEFT JOIN xlk_curriculum x ON t.save_id = x.curriculum_id
+        WHERE
+        t.saved_target = "curriculum"
+        AND t.person_id = #{personId}
+    </select>
 </mapper>

src/main/resources/mapper/xlk/TrendMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.marketing.xlk.mapper.TrendMapper">
+
+</mapper>