* 微信楼盘详情增加在线选房信息

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

@@ -64,6 +64,7 @@ public class TaBuildingController extends BaseController {
 
     /**
      * 楼盘详情
+     *
      * @param id
      * @return
      */
@@ -72,12 +73,13 @@ public class TaBuildingController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目id")
     })
-    public ResponseBean buildingSelectId(@PathVariable(value = "id") String id){
+    public ResponseBean buildingSelectId(@PathVariable(value = "id") String id) {
         return taBuildingService.buildingSelectId(id);
     }
 
     /**
      * 楼盘列表 查询所有有效的
+     *
      * @param pageNum
      * @param pageSize
      * @param name
@@ -97,21 +99,22 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "isMain", value = "是否主推项目"),
     })
     @GetMapping("/admin/buildinglist")
-    public ResponseBean buildingList(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
-                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
-                                     @RequestParam(value = "name", required = false)String name,
-                                     @RequestParam(value = "code", required = false)String code,
-                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
-                                     @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
-                                     @RequestParam(value = "marketStatus",required = false)String marketStatus,
-                                     @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain,
-                                     HttpServletRequest request){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request),getTaPersonBuildingListByUserId(request));
+    public ResponseBean buildingList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value = "name", required = false) String name,
+                                     @RequestParam(value = "code", required = false) String code,
+                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+                                     @RequestParam(value = "buildingStatus", required = false) String buildingStatus,
+                                     @RequestParam(value = "marketStatus", required = false) String marketStatus,
+                                     @RequestParam(value = "cityId", required = false) Integer cityId,
+                                     @RequestParam(value = "isMain", required = false) Integer isMain,
+                                     HttpServletRequest request) {
+        return taBuildingService.buildingList(pageNum, pageSize, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, getOrgId(request), getTaPersonBuildingListByUserId(request));
     }
 
     /**
      * 楼盘列表
+     *
      * @param pageNum
      * @param pageSize
      * @param name
@@ -131,21 +134,22 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "isMain", value = "是否主推项目"),
     })
     @GetMapping("/admin/buildinglist/select")
-    public ResponseBean buildingListSelect(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
-                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
-                                     @RequestParam(value = "name", required = false)String name,
-                                     @RequestParam(value = "code", required = false)String code,
-                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
-                                     @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
-                                     @RequestParam(value = "marketStatus",required = false)String marketStatus,
-                                     @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain,
-                                           HttpServletRequest request){
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request),getTaPersonBuildingListByUserId(request));
+    public ResponseBean buildingListSelect(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value = "name", required = false) String name,
+                                           @RequestParam(value = "code", required = false) String code,
+                                           @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+                                           @RequestParam(value = "buildingStatus", required = false) String buildingStatus,
+                                           @RequestParam(value = "marketStatus", required = false) String marketStatus,
+                                           @RequestParam(value = "cityId", required = false) Integer cityId,
+                                           @RequestParam(value = "isMain", required = false) Integer isMain,
+                                           HttpServletRequest request) {
+        return taBuildingService.buildingListSelect(pageNum, pageSize, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, getOrgId(request), getTaPersonBuildingListByUserId(request));
     }
 
     /**
      * 更新楼盘
+     *
      * @param parameter
      * @return
      */
@@ -154,12 +158,13 @@ public class TaBuildingController extends BaseController {
 
     })
     @PutMapping("/admin/building/update")
-    public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request){
+    public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request) {
         return taBuildingService.buildingUpdate(parameter, getOrgId(request));
     }
 
     /**
      * 楼盘添加
+     *
      * @param parameter
      * @return
      */
@@ -168,12 +173,13 @@ public class TaBuildingController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
-    public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request){
+    public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request) {
         return taBuildingService.buildingAdd(parameter, getOrgId(request));
     }
 
     /**
      * 楼盘getPersonId(request);
+     *
      * @param parameter
      * @return
      */
@@ -182,12 +188,13 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "status：状态，id：项目id"),
     })
     @RequestMapping(value = "/admin/building/update/status", method = RequestMethod.PUT)
-    public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request){
+    public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request) {
         return taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
     }
 
     /**
      * 楼盘删除
+     *
      * @param id
      * @param request
      * @return
@@ -197,35 +204,38 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目id"),
     })
     @RequestMapping(value = "/admin/building/delete/{id}", method = RequestMethod.DELETE)
-    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request){
+    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request) {
         return taBuildingService.buildingdelete(id, getOrgId(request));
     }
 
     /**
      * 添加户型
+     *
      * @param parameter
      * @param session
      * @return
      */
     @ApiOperation(value = "添加户型", notes = "添加户型")
     @RequestMapping(value = "/admin/buildingApartment/add", method = RequestMethod.POST)
-    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session){
+    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session) {
         return taBuildingService.buildingApartmentAdd(parameter);
     }
 
     /**
      * 户型编辑
+     *
      * @param parameter
      * @return
      */
     @ApiOperation(value = "户型编辑", notes = "户型编辑")
     @RequestMapping(value = "/admin/buildingApartment/update", method = RequestMethod.PUT)
-    public ResponseBean buildingApartmentUpdate(@RequestBody String parameter){
+    public ResponseBean buildingApartmentUpdate(@RequestBody String parameter) {
         return taBuildingService.buildingApartmentUpdate(parameter);
     }
 
     /**
      * 户型详情
+     *
      * @param id
      * @return
      */
@@ -234,12 +244,13 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "户型id"),
     })
     @RequestMapping(value = "/admin/buildingApartment/{id}", method = RequestMethod.GET)
-    public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id){
+    public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id) {
         return taBuildingService.buildingApartmentSelectId(id);
     }
 
     /**
      * 依据项目ID 查户型
+     *
      * @param id
      * @return
      */
@@ -250,18 +261,19 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/buildingApartment/buildingId/{id}", method = RequestMethod.GET)
     public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id,
-                                                    @RequestParam(value = "apartmentType", required = false) String apartmentType){
+                                                    @RequestParam(value = "apartmentType", required = false) String apartmentType) {
         return taBuildingService.buildingApartmentBuildingId(id, apartmentType);
     }
 
     /**
      * 微信楼盘列表
+     *
      * @return
      */
     @RequestMapping(value = "/wx/building/list", method = RequestMethod.GET)
     public ResponseBean getWxBuildingList(
             @RequestParam(defaultValue = "1") Integer pageNumber,
-            @RequestParam(defaultValue = "10")Integer pageSize,
+            @RequestParam(defaultValue = "10") Integer pageSize,
             @RequestParam(defaultValue = "false") Boolean mine,
             @RequestParam(required = false) Integer cityId,
             @RequestParam(required = false) String name,
@@ -275,7 +287,7 @@ public class TaBuildingController extends BaseController {
 //            @RequestParam(required = false) Double minBuildingArea, // 最小面积
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
             HttpServletRequest request
-    ){
+    ) {
         Integer orgId = getOrgId(request);
         List<String> targets = null;
         if (null != mine && mine) {
@@ -293,12 +305,13 @@ public class TaBuildingController extends BaseController {
         List<String[]> priceList = getParamListOf(price);
         List<String[]> areaList = getParamListOf(area);
 
-        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
+        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId, mine, houseTypeList, buildingTypeList, priceList, areaList, orgId, priceType);
     }
 
 
     /**
      * 先按照 逗号 拆分, 再按照 横线 拆分
+     *
      * @param params
      * @return
      */
@@ -310,7 +323,7 @@ public class TaBuildingController extends BaseController {
         }
 
         String[] paramsArray = params.split(",");
-        for(String param : paramsArray) {
+        for (String param : paramsArray) {
             paramList.add(param.split("-"));
         }
 
@@ -320,31 +333,34 @@ public class TaBuildingController extends BaseController {
 
     /**
      * 微信推荐楼盘列表
+     *
      * @return
      */
     @RequestMapping(value = "/wx/building/main", method = RequestMethod.GET)
-    public ResponseBean getWxMainBuildingList(String cityId, HttpServletRequest request){
+    public ResponseBean getWxMainBuildingList(String cityId, HttpServletRequest request) {
         Integer orgId = getOrgId(request);
         return taBuildingService.getWxMainBuildingList(cityId, orgId);
     }
 
     /**
      * 删除户型
+     *
      * @param id
      * @return
      */
     @RequestMapping(value = "/admin/apartment/deleted/{id}", method = RequestMethod.DELETE)
-    public ResponseBean apartmentDeleted(@PathVariable(value = "id") String id){
+    public ResponseBean apartmentDeleted(@PathVariable(value = "id") String id) {
         return taBuildingService.apartmentDel(id);
     }
 
     /**
      * 微信楼盘详情
+     *
      * @param id
      * @return
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,HttpServletRequest request){
+    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id, HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
@@ -352,14 +368,15 @@ public class TaBuildingController extends BaseController {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = persons.get(0);
-        return taBuildingService.buildingAllSelectId(id,person.getPersonId(), orgId);
+        return taBuildingService.buildingAllSelectId(id, person.getPersonId(), orgId);
     }
+
     /**
      * 查询当前所有项目
      */
     @RequestMapping(value = "/admin/buildingAll", method = RequestMethod.GET)
-    public  ResponseBean buildingAll(HttpServletRequest request){
-        ResponseBean taBuilding= taBuildingService.buildingAll(getOrgId(request));
+    public ResponseBean buildingAll(HttpServletRequest request) {
+        ResponseBean taBuilding = taBuildingService.buildingAll(getOrgId(request));
         return taBuilding;
     }
 

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

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaPreselectionRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaPreselectionRecordController.class);

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

@@ -340,6 +340,9 @@ public class TaBuilding implements Serializable {
     /**
      * 项目亮点封面
      */
-    @TableField(strategy=FieldStrategy.IGNORED)
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String highlightsCover;
+
+    @TableField(exist = false)
+    private TaSalesBatch salesBatch;
 }

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

@@ -94,7 +94,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     private TaShareContentService taShareContentService;
 
     @Autowired
-    private  TaOrgMapper  taOrgMapper;
+    private TaOrgMapper taOrgMapper;
 
     @Autowired
     private ITaBuildingMapRelationService iTaBuildingMapRelationService;
@@ -105,16 +105,19 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaBuildingPanoramaService taBuildingPanoramaService;
 
+    @Autowired
+    private ITaSalesBatchService iTaSalesBatchService;
+
     @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) {
+    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<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId,taPersonBuildingList);
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
 
         if (null != buildings) {
-            for(TaBuilding taBuilding: buildings) {
+            for (TaBuilding taBuilding : buildings) {
                 //查询当前图片
                 QueryWrapper<TaBuildingImg> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("building_id", taBuilding.getBuildingId());
@@ -139,18 +142,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         return ResponseBean.success(page);
     }
+
     @Override
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
+    public ResponseBean buildingListSelect(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<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
         page.setRecords(building);
         return ResponseBean.success(page);
     }
 
     /**
      * 查询项目图片
+     *
      * @param buildingId
      * @param imgType
      * @return
@@ -162,15 +167,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingImgQueryWrapper.eq("img_type", imgType);
         buildingImgQueryWrapper.orderByAsc("order_no");
         List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-        return  buildingImg.size() > 0 ? buildingImg : null;
+        return buildingImg.size() > 0 ? buildingImg : null;
     }
 
     @Override
     public ResponseBean buildingSelectId(String id) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().gt(TaBuilding::getStatus,-1);
-        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);
+        buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
+        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId, id);
         TaBuilding building = taBuildingMapper.selectOne(buildingtWrapper);
 
         //查询当前图片
@@ -185,7 +190,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         // 查询tag
         QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
         BuildingTagQueryWrapper.eq("building_id", id);
-        List<TaBuildingTag> buildingTags= taBuildingTagMapper.selectList(BuildingTagQueryWrapper);
+        List<TaBuildingTag> buildingTags = taBuildingTagMapper.selectList(BuildingTagQueryWrapper);
         building.setBuildingTag(buildingTags);
 
         // 项目类型
@@ -193,8 +198,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingProjectTypeQueryWrapper.eq("building_id", building.getBuildingId());
         List<TaBuildingProjectType> taBuildingProjectTypes = taBuildingProjectTypeMapper.selectList(buildingProjectTypeQueryWrapper);
         building.setBuildingProjectType(taBuildingProjectTypes);
-        building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
-        building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setPosters(taPosterService.getPostersForTarget(id, CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setShareContents(taShareContentService.getPostersForTarget(id, CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
         // 查询 周边数据
         QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
@@ -207,15 +212,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id,String personId, Integer orgId) {
+    public ResponseBean buildingAllSelectId(String id, String personId, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().gt(TaBuilding::getStatus,-1);
-        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);
+        buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
+        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId, id);
         TaBuilding building = taBuildingMapper.selectOne(buildingtWrapper);
 
-        if (null == building){
-            return ResponseBean.error("项目不存在",ResponseBean.ERROR_UNAVAILABLE);
+        if (null == building) {
+            return ResponseBean.error("项目不存在", ResponseBean.ERROR_UNAVAILABLE);
         }
         //查询当前图片
         building.setBuildingImg(getBuildingImg(id, CommConstant.BUILDING_IMG_BANNER));
@@ -242,7 +247,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         AppointmentQueryWrapper.eq("status", 1);
         AppointmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> appoint = taBuildingApartmentMapper.selectList(AppointmentQueryWrapper);
-        for (TaBuildingApartment apar:appoint) {
+        for (TaBuildingApartment apar : appoint) {
             List<TaBuildingImg> imgs = taBuildingImgMapper.getBuildingImgByApartment(apar.getApartmentId());
             apar.setBuildingImgList(imgs);
         }
@@ -250,13 +255,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         getBuildingAttaches(building);
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
-        saveQueryWrapper.eq("tagert_type",CommConstant.FAVOR_PROJECT);
-        saveQueryWrapper.eq("person_id",personId);
-        saveQueryWrapper.eq("saved_target",building.getBuildingId());
+        saveQueryWrapper.eq("tagert_type", CommConstant.FAVOR_PROJECT);
+        saveQueryWrapper.eq("person_id", personId);
+        saveQueryWrapper.eq("saved_target", building.getBuildingId());
         Integer num = taSaveMapper.selectCount(saveQueryWrapper);
-        if (num>0){
+        if (num > 0) {
             building.setIsSave(CommConstant.STATUS_NORMAL);
-        }else {
+        } else {
             building.setIsSave(CommConstant.STATUS_UNACCALIMED);
         }
 
@@ -268,8 +273,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setBuildingProjectType(buildingProjectTypes);
 
         // 海报和分享
-        building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
-        building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setPosters(taPosterService.getPostersForTarget(id, CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setShareContents(taShareContentService.getPostersForTarget(id, CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
         // 助力活动
         QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
@@ -304,18 +309,25 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingPanorama> panoramaList = taBuildingPanoramaService.list(panoramaQueryWrapper);
         building.setPanoramaList(panoramaList);
 
+        // 查询关联的销售批次
+        QueryWrapper<TaSalesBatch> salesBatchQueryWrapper = new QueryWrapper<>();
+        salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getBuildingId, id);
+        salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getStatus, CommConstant.STATUS_NORMAL);
+        TaSalesBatch taSalesBatch = iTaSalesBatchService.getOne(salesBatchQueryWrapper);
+        building.setSalesBatch(taSalesBatch);
+
         return ResponseBean.success(building);
     }
 
     @Override
     public ResponseBean buildingUpdate(String parameter, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        JSONObject object= JSONObject.parseObject(parameter);
+        JSONObject object = JSONObject.parseObject(parameter);
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
-        if (!isMainMoreThanTenFlag){
+        if (!isMainMoreThanTenFlag) {
             responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
             return responseBean;
         }
@@ -334,7 +346,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
             buildingIdQueryWrapper.eq("org_id", orgId);
             building.setName(building.getBuildingName());
-            taBuildingMapper.update(building,buildingIdQueryWrapper);
+            taBuildingMapper.update(building, buildingIdQueryWrapper);
             QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
             BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
             BuildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_BANNER);
@@ -375,7 +387,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             insertTagBatch(buildingTags, building.getBuildingId());
         }
 
-        if(null != building.getCityId()){
+        if (null != building.getCityId()) {
             TdCity city = tdCityMapper.selectById(building.getCityId());
             city.setStatus("1");
             tdCityMapper.updateById(city);
@@ -456,22 +468,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     public ResponseBean buildingAdd(String parameter, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
-        JSONObject object= JSONObject.parseObject(parameter);
+        JSONObject object = JSONObject.parseObject(parameter);
         // 根据orgId查询当前楼盘最大数
         TaOrg taOrg = taOrgMapper.selectById(orgId);
         // 查询当前org楼盘总数
-        QueryWrapper<TaBuilding>  taBuildingQuery = new QueryWrapper<>();
-        taBuildingQuery.eq("org_id",orgId);
-        taBuildingQuery.gt("status",-1);
-        int orgNum= taBuildingMapper.selectCount(taBuildingQuery);
-        if (orgNum >= taOrg.getBuildingNum()){
-            return ResponseBean.error("当前系统仅供维护"+taOrg.getBuildingNum()+"个项目，需要维护更多项目，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
+        QueryWrapper<TaBuilding> taBuildingQuery = new QueryWrapper<>();
+        taBuildingQuery.eq("org_id", orgId);
+        taBuildingQuery.gt("status", -1);
+        int orgNum = taBuildingMapper.selectCount(taBuildingQuery);
+        if (orgNum >= taOrg.getBuildingNum()) {
+            return ResponseBean.error("当前系统仅供维护" + taOrg.getBuildingNum() + "个项目，需要维护更多项目，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "add");
-        if (!isMainMoreThanTenFlag){
+        if (!isMainMoreThanTenFlag) {
             responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
             return responseBean;
         }
@@ -483,7 +495,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-        if(null != building.getCityId()){
+        if (null != building.getCityId()) {
             TdCity city = tdCityMapper.selectById(building.getCityId());
             city.setStatus("1");
             tdCityMapper.updateById(city);
@@ -531,13 +543,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
 
         //添加默认意向值
-        iTaBuildingIntentionService.saveDefaultIntention(building.getOrgId(),building.getBuildingId());
+        iTaBuildingIntentionService.saveDefaultIntention(building.getOrgId(), building.getBuildingId());
 
         return ResponseBean.success(building);
     }
 
     /**
      * 批量插入 周边地图数据
+     *
      * @param list
      * @param buildingId
      * @param orgId
@@ -561,31 +574,31 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
-        Integer  status= jsonobject.getInteger("status");
+        Integer status = jsonobject.getInteger("status");
         String id = jsonobject.getString("id");
         QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
         buildingIdQueryWrapper.eq("building_id", id);
         buildingIdQueryWrapper.eq("org_id", orgId);
-        TaBuilding  building = taBuildingMapper.selectOne(buildingIdQueryWrapper);
+        TaBuilding building = taBuildingMapper.selectOne(buildingIdQueryWrapper);
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, status, "updateStatus");
-        if (!isMainMoreThanTenFlag){
+        if (!isMainMoreThanTenFlag) {
             responseBean.addError("当前城市最多只能推荐10个项目至首页哦");
             return responseBean;
         }
         building.setStatus(status);
-        taBuildingMapper.update(building,buildingIdQueryWrapper);
+        taBuildingMapper.update(building, buildingIdQueryWrapper);
         return ResponseBean.success("");
     }
 
     @Override
     public ResponseBean buildingdelete(String id, Integer orgId) {
-        TaBuilding  building = new TaBuilding();
+        TaBuilding building = new TaBuilding();
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);
-        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
+        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId, id);
+        TaBuilding bui = taBuildingMapper.selectOne(buildingtWrapper);
 
-        if (bui.getStatus().equals(1)){
+        if (bui.getStatus().equals(1)) {
             return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
         }
         QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
@@ -593,14 +606,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingIdQueryWrapper.eq("org_id", orgId);
         building.setBuildingId(String.valueOf(id));
         building.setStatus(-1);
-        taBuildingMapper.update(building,buildingIdQueryWrapper);
+        taBuildingMapper.update(building, buildingIdQueryWrapper);
 
         return ResponseBean.success("");
     }
 
     @Override
     public ResponseBean buildingApartmentAdd(String parameter) {
-        TaBuildingApartment building = JSONObject.parseObject(parameter,TaBuildingApartment.class);
+        TaBuildingApartment building = JSONObject.parseObject(parameter, TaBuildingApartment.class);
         building.setStatus(1);
         building.setCreateDate(LocalDateTime.now());
         if (taBuildingApartmentMapper.insert(building) < 1) {
@@ -622,7 +635,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Override
     public ResponseBean buildingApartmentUpdate(String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        TaBuildingApartment building = JSONObject.parseObject(parameter,TaBuildingApartment.class);
+        TaBuildingApartment building = JSONObject.parseObject(parameter, TaBuildingApartment.class);
         if (StringUtils.isEmpty(building.getApartmentId())) {
             responseBean.addError("id不存在!");
             return responseBean;
@@ -638,7 +651,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("apartment_id", building.getApartmentId());
         building.setInsideArea(building.getInsideArea() == null ? 0d : building.getInsideArea());
         building.setBuildingArea(building.getBuildingArea() == null ? 0d : building.getBuildingArea());
-        taBuildingApartmentMapper.update(building,buildingApartmentQueryWrapper);
+        taBuildingApartmentMapper.update(building, buildingApartmentQueryWrapper);
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
         //图片数组
@@ -658,21 +671,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("apartment_id", id);
         //拿到当前户型信息
         TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
-        if ( null == buildingApartment ){
+        if (null == buildingApartment) {
             return ResponseBean.success("", "没有发现户型图上传");
         }
 
         //根据户型ID查楼盘户型对应图片表
-        ArrayList arrayList= new ArrayList<>();
+        ArrayList arrayList = new ArrayList<>();
         QueryWrapper<TaApartmentImg> ApartmentImgQueryWrapper = new QueryWrapper<>();
         ApartmentImgQueryWrapper.eq("apartment_id", buildingApartment.getApartmentId());
-        List<TaApartmentImg> buildingImg= taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
-        for (TaApartmentImg apartmentImg:buildingImg){
+        List<TaApartmentImg> buildingImg = taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
+        for (TaApartmentImg apartmentImg : buildingImg) {
             QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
-            buildingImgQueryWrapper.eq("img_id",apartmentImg.getImgId());
-            buildingImgQueryWrapper.eq("img_type",CommConstant.BUILDING_IMG_APARMENT);
-            List<TaBuildingImg> buildingImgList= taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-            for (TaBuildingImg buImg:buildingImgList) {
+            buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+            buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+            List<TaBuildingImg> buildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+            for (TaBuildingImg buImg : buildingImgList) {
                 arrayList.add(buImg);
             }
         }
@@ -697,10 +710,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String[] buildingTypeList,
             List<String[]> priceList,
             List<String[]> areaList,
-            Integer orgId,String priceType) {
+            Integer orgId, String priceType) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
-        if(CollectionUtils.isEmpty(targets) && mine){
+        if (CollectionUtils.isEmpty(targets) && mine) {
             return ResponseBean.success(page);
         }
 
@@ -715,11 +728,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList, orgId, priceType);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {
-            for (TaBuilding build:buildingList) {
+            for (TaBuilding build : buildingList) {
                 getBuildingAttaches(build);
 
                 // 兼容 3.0/3.5 版本（3.0/3.5 封面取的全是 buildingListImg 的第一张），因为在3.5.1新增了封面图
@@ -799,9 +812,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             // tags
             if (!StringUtils.isEmpty(building.getTags())) {
                 List<TaBuildingTag> tags = new ArrayList<>();
-                String[] tagsArray =  building.getTags().split(",");
+                String[] tagsArray = building.getTags().split(",");
                 if (null != tagsArray) {
-                    for(String tagName: tagsArray) {
+                    for (String tagName : tagsArray) {
                         TaBuildingTag tag = new TaBuildingTag();
                         tag.setBuildingId(buildingId);
                         tag.setTagName(tagName);
@@ -875,14 +888,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     public ResponseBean buildingApartmentBuildingId(String id, String apartmentType) {
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("building_id", id);
-        buildingApartmentQueryWrapper.eq("status",1);
-        buildingApartmentQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(apartmentType),"apartment_type",apartmentType);
+        buildingApartmentQueryWrapper.eq("status", 1);
+        buildingApartmentQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(apartmentType), "apartment_type", apartmentType);
         buildingApartmentQueryWrapper.orderByDesc("create_date");
-        List<TaBuildingApartment> buildingApartment= taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
+        List<TaBuildingApartment> buildingApartment = taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
         buildingApartment.forEach(e -> {
             QueryWrapper<TaApartmentImg> ApartmentImgQueryWrapper = new QueryWrapper<>();
             ApartmentImgQueryWrapper.eq("apartment_id", e.getApartmentId());
-            List<TaApartmentImg> buildingImg= taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
+            List<TaApartmentImg> buildingImg = taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
 
             List<TaBuildingImg> buildingImag = buildingImg.stream().map(img -> {
                 QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
@@ -907,21 +920,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
 //        TaBuilding  building= new TaBuilding();
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,buildingApartment.getBuildingId());
+        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId, buildingApartment.getBuildingId());
 //        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
 //        if (bui.getStatus().equals(1)){
 //            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
 //        }
 
         buildingApartment.setStatus(-1);
-       taBuildingApartmentMapper.update(buildingApartment,buildingApartmentQueryWrapper);
+        taBuildingApartmentMapper.update(buildingApartment, buildingApartmentQueryWrapper);
 
-       return ResponseBean.success("");
+        return ResponseBean.success("");
     }
 
     @Override
     public ResponseBean buildingAll(Integer orgId) {
-        List<TaBuilding> taBuilding= taBuildingMapper.buildingAll(orgId);
+        List<TaBuilding> taBuilding = taBuildingMapper.buildingAll(orgId);
         return ResponseBean.success(taBuilding);
     }
 
@@ -936,8 +949,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getBuildingListById(Integer orgId,Integer cityId) {
-        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId,cityId);
+    public ResponseBean getBuildingListById(Integer orgId, Integer cityId) {
+        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId, cityId);
         return ResponseBean.success(buildings);
     }
 
@@ -948,6 +961,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     /**
      * 推荐到首页楼盘不能超过10个
+     *
      * @param taBuilding
      * @return
      */
@@ -956,13 +970,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         queryWrapper.eq("building_id", taBuilding.getBuildingId());
         queryWrapper.eq("org_id", orgId);
         TaBuilding info = taBuildingMapper.selectOne(queryWrapper);
-        if (taBuilding.getIsMain() != 1){
+        if (taBuilding.getIsMain() != 1) {
             return true;
         }
 //        if (operte.equals("update") && (info.getStatus() == 2)){
 //            return true;
 //        }
-        if (operte.equals("updateStatus") && status == 2){
+        if (operte.equals("updateStatus") && status == 2) {
             return true;
         }
         QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
@@ -971,19 +985,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingQueryWrapper.eq("org_id", orgId);
         taBuildingQueryWrapper.ne("status", "-1");
         taBuildingQueryWrapper.ne("status", "2");
-        if (taBuilding.getBuildingId() != null){
+        if (taBuilding.getBuildingId() != null) {
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }
         List<TaBuilding> taBuildings = taBuildingMapper.selectList(taBuildingQueryWrapper);
-        if (taBuildings != null && taBuildings.size() >= 10){
+        if (taBuildings != null && taBuildings.size() >= 10) {
             return false;
         }
         return true;
     }
 
 
-
-
     private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         return imgs.stream().map(img -> {
             TaBuildingImg Images = new TaBuildingImg();
@@ -1011,7 +1023,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     int insertApartmentImgBatch(List<TaBuildingImg> imgs, String buildingId, String apartmentId) {
         int rows = 0;
-        for (TaBuildingImg img: imgs){
+        for (TaBuildingImg img : imgs) {
             TaBuildingImg Images = new TaBuildingImg();
             Images.setBuildingId(buildingId);
             Images.setImgType(img.getImgType());
@@ -1022,9 +1034,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
             if (taBuildingImgMapper.insert(Images) < 1) {
                 continue;
-            };
+            }
+            ;
 
-            TaApartmentImg apartmentImg= new TaApartmentImg();
+            TaApartmentImg apartmentImg = new TaApartmentImg();
             apartmentImg.setApartmentId(apartmentId);
             apartmentImg.setImgId(Images.getImgId());
             apartmentImg.setStatus(1);