feats

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

@@ -376,6 +376,20 @@ public class TaBuildingController extends BaseController {
         return taBuildingService.getWxMainBuildingList(cityId, orgId);
     }
 
+
+    /**
+     * 我绑定的楼盘
+     *
+     * @return
+     */
+    @RequestMapping(value = "/wx/building/mine", method = RequestMethod.GET)
+    public ResponseBean getWxMainBuildingList(HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        String personId = getPersonId(request);
+        List<TaBuilding> lst = taBuildingService.getBuilidngsOfPerson(orgId, personId);
+        return ResponseBean.success(lst);
+    }
+
     /**
      * 删除户型
      *

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

@@ -385,7 +385,7 @@ public class TaPersonController extends BaseController {
      * 成为驻场顾问
      *
      */
-    @ApiOperation(value = "森哥看这里-wx-成为驻场顾问", notes = "森哥看这里-wx-成为驻场顾问")
+    @ApiOperation(value = "wx-成为驻场顾问", notes = "森哥看这里-wx-成为驻场顾问")
     @PostMapping("/wx/marketing")
     public ResponseBean marketing(@RequestBody PersonMarketingDTO marketingDTO, HttpServletRequest request) {
         // 当前人员

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

@@ -93,7 +93,7 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/wx/marking/customers")
-    @ApiOperation(value = "森哥看这里-wx-查询驻场的客户列表", notes = "森哥看这里-wx-查询驻场的客户列表")
+    @ApiOperation(value = "wx-查询驻场的客户列表", notes = "森哥看这里-wx-查询驻场的客户列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),

src/main/java/com/yunzhi/marketing/mapper/TaBuildingMapper.java

@@ -193,4 +193,8 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @return
      */
     List<TaBuilding> selectByUserId(Integer userId);
+
+    List<TaBuilding> getBuilidngsOfPerson(Integer orgId, String personId);
+
+    IPage<TaBuilding> getSpecial(IPage<TaBuilding> page, Integer orgId, String cityId);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.marketing.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.entity.TaBuilding;
@@ -189,4 +190,8 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @return
      */
     List<TaBuilding> selectByUserId(Integer userId);
+
+    List<TaBuilding> getBuilidngsOfPerson(Integer orgId, String personId);
+
+    IPage<TaBuilding> getListOfSpecial(IPage<TaBuilding> page, Integer orgId, String cityId);
 }

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

@@ -373,14 +373,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setExtendContent(taExtendContents);
 
         // 添加楼盘特价房源
-        LambdaQueryWrapper<BuildingSpecialRoom> specialRoomLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        specialRoomLambdaQueryWrapper.eq(BuildingSpecialRoom::getBuildingId,id);
-        LocalDateTime now = LocalDateTime.now();
-        specialRoomLambdaQueryWrapper.gt(BuildingSpecialRoom::getStartTime,now);
-        specialRoomLambdaQueryWrapper.lt(BuildingSpecialRoom::getEndTime,now);
-        specialRoomLambdaQueryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
-        List<BuildingSpecialRoom> buildingSpecialRooms = buildingSpecialRoomMapper.selectList(specialRoomLambdaQueryWrapper);
-        building.setSpecialRoomList(buildingSpecialRooms);
+        building.setSpecialRoomList(getSpecialBy(building));
 
         // 添加楼盘项目动态
         LambdaQueryWrapper<Trend> lambdaQueryWrapper =new LambdaQueryWrapper<>();
@@ -425,6 +418,16 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return ResponseBean.success(building);
     }
 
+    private List<BuildingSpecialRoom> getSpecialBy(TaBuilding building) {
+        LambdaQueryWrapper<BuildingSpecialRoom> specialRoomLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        specialRoomLambdaQueryWrapper.eq(BuildingSpecialRoom::getBuildingId, building.getBuildingId());
+        LocalDateTime now = LocalDateTime.now();
+        specialRoomLambdaQueryWrapper.ge(BuildingSpecialRoom::getStartTime,now);
+        specialRoomLambdaQueryWrapper.le(BuildingSpecialRoom::getEndTime,now);
+        specialRoomLambdaQueryWrapper.orderByDesc(BuildingSpecialRoom::getCreateDate);
+        return buildingSpecialRoomMapper.selectList(specialRoomLambdaQueryWrapper);
+    }
+
     @Override
     public ResponseBean buildingUpdate(String parameter, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
@@ -1259,4 +1262,27 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     public List<TaBuilding> selectByUserId(Integer userId) {
         return taBuildingMapper.selectByUserId(userId);
     }
+
+    @Override
+    public List<TaBuilding> getBuilidngsOfPerson(Integer orgId, String personId) {
+        return taBuildingMapper.getBuilidngsOfPerson(orgId, personId);
+    }
+
+    @Override
+    public IPage<TaBuilding> getListOfSpecial(IPage<TaBuilding> page, Integer orgId, String cityId) {
+        IPage<TaBuilding> result = taBuildingMapper.getSpecial(page, orgId, cityId);
+        List<TaBuilding> lst = result.getRecords();
+        if (lst == null || lst.size() < 1) {
+            return result;
+        }
+
+        for (TaBuilding building : lst) {
+            getBuildingAttaches(building);
+
+            // 查询特价房
+            building.setSpecialRoomList(getSpecialBy(building));
+        }
+
+        return result;
+    }
 }

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

@@ -1318,6 +1318,11 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         if (null == taBuilding){
             return ResponseBean.error("不合法的驻场码", ResponseBean.ERROR_UNAVAILABLE);
         }
+
+        if (!CommConstant.STATUS_NORMAL.equals(taBuilding.getStatus())) {
+            return ResponseBean.error("该项目状态异常, 不能绑定", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         // 成为驻场顾问并绑定楼盘
         taPerson.setPersonType("marketing");
         taPersonMapper.updateById(taPerson);
@@ -1328,6 +1333,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         taPersonBuilding.setCreateDate(LocalDateTime.now());
         taPersonBuildingMapper.insert(taPersonBuilding);
 
-        return ResponseBean.success("绑定成功");
+        // 返回刚刚绑定的楼盘ID
+        return ResponseBean.success(taBuilding.getBuildingId());
     }
 }

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

@@ -5,6 +5,8 @@ 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.entity.TaBuilding;
+import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.xlk.dto.BuildingSpecialRoomDTO;
 import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
 import com.yunzhi.marketing.xlk.service.IBuildingSpecialRoomService;
@@ -14,14 +16,7 @@ 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -44,6 +39,9 @@ public class BuildingSpecialRoomController extends BaseController {
     @Autowired
     public IBuildingSpecialRoomService iBuildingSpecialRoomService;
 
+    @Autowired
+    public ITaBuildingService iTaBuildingService;
+
 
     /**
      * 分页查询列表
@@ -78,6 +76,19 @@ public class BuildingSpecialRoomController extends BaseController {
         return responseBean;
     }
 
+    @GetMapping("/wx/buildingSpecialRoom/building")
+    public ResponseBean getListOfBuilding(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="cityId", required = false) String cityId,
+                                          HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
+
+        IPage<TaBuilding> result = iTaBuildingService.getListOfSpecial(page, orgId, cityId);
+
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param buildingSpecialRoomDTO 实体对象

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

@@ -1,6 +1,8 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
 
 /**

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

@@ -1,11 +1,17 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.mapper.TaBuildingMapper;
 import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
 import com.yunzhi.marketing.xlk.mapper.BuildingSpecialRoomMapper;
 import com.yunzhi.marketing.xlk.service.IBuildingSpecialRoomService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 特价房源表  服务实现类
@@ -16,5 +22,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BuildingSpecialRoomServiceImpl extends ServiceImpl<BuildingSpecialRoomMapper, BuildingSpecialRoom> implements IBuildingSpecialRoomService {
+    @Autowired
+    TaBuildingMapper taBuildingMapper;
 
 }

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

@@ -101,7 +101,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
     @Override
     public ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params) {
         // 渠道推荐的客户
-        if ("channel".equals(params.getType())) {
+        if ("report".equals(params.getType())) {
             ChannelCustomer customer = channelCustomerMapper.selectById(params.getId());
             // 审核通过 先查看在ta_recommend_customer 手机号是否存在
             LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();

src/main/resources/mapper/TaBuildingMapper.xml

@@ -766,5 +766,33 @@
         INNER JOIN ( SELECT x.institution_code FROM xlk_user_institution t LEFT JOIN xlk_institution x ON t.institution_id = x.institution_id WHERE t.user_id = #{userId}) g ON i.institution_code LIKE g.institution_code
         )
     </select>
+    <select id="getBuilidngsOfPerson" resultType="com.yunzhi.marketing.entity.TaBuilding">
+        SELECT
+            *
+        FROM
+            ta_building t
+                INNER JOIN ta_person_building s ON t.building_id = s.building_id
+                AND s.person_id = #{personId}
+        WHERE
+            t.org_id = #{orgId}
+          AND t.`status` = 1
+        ORDER BY
+            t.create_date DESC
+    </select>
+    <select id="getSpecial" resultType="com.yunzhi.marketing.entity.TaBuilding">
+        SELECT
+            DISTINCT t.*
+        FROM
+        ta_building t
+        INNER JOIN xlk_building_special_room s ON t.org_id = s.org_id
+            AND t.building_id = s.building_id
+            AND s.start_time &lt;= now( )
+            AND s.end_time &gt;= now( )
+        WHERE
+            t.org_id = 1
+            AND t.`status` = 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -949,10 +949,14 @@ FROM
             t.phone,
             t.picture,
             t.sex,
-            "customer" AS type
+            "customer" AS type,
+            t.building_id as buildingId,
+            t.realty_consultant as consultant,
+            t.status as customerStatus,
+            null as channelStatus
         FROM
             ta_recommend_customer t
-        INNER JOIN ta_person p ON t.recommend_person = p.person_id
+--         INNER JOIN ta_person p ON t.recommend_person = p.person_id
         WHERE
             t.building_id = #{buildingId}
         <if test="keywords != null and keywords !=''">
@@ -965,7 +969,11 @@ FROM
             phone,
             picture,
             sex,
-            "channel" AS type
+            "report" AS type,
+            null as buildingId,
+            null as consultant,
+            null as customerStatus,
+            status as channelStatus
         FROM
             xlk_channel_customer
         WHERE