feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.3</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

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

@@ -3,6 +3,11 @@ package com.huiju.estateagents.common;
 public class CommConstant {
     public final static String ALIOSS_DEFAULT_UPLOAD = "/miniapp/upload/images/";
 
+    /**
+     * 人员类型: 业主
+     */
+    public final static String PERSON_PROPRIETOR = "prop";
+
     /**
      * 人员类型: 置业顾问
      */

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

@@ -168,19 +168,14 @@ public class TaPointsRecordsController extends BaseController {
      */
     @RequestMapping(value="/admin/taPointsRecords",method= RequestMethod.POST)
     public ResponseBean taPointsRecordsAdd(@RequestBody TaPointsRecords taPointsRecords){
-        ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaPointsRecordsService.save(taPointsRecords)){
-                responseBean.addSuccess(taPointsRecords);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
+            iTaPointsRecordsService.addPointsRecords(taPointsRecords);
+            return ResponseBean.success("success");
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPointsRecordsAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
+
+            return ResponseBean.error("自定义积分失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     /**

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

@@ -123,4 +123,10 @@ public class TaPointsExchange implements Serializable {
     
     @TableField(exist = false)
     private String tel;
+
+    @TableField(exist = false)
+    private String roomInfo;
+
+    @TableField(exist = false)
+    private Integer propId;
 }

src/main/java/com/huiju/estateagents/property/controller/MessageBoardController.java

@@ -0,0 +1,91 @@
+package com.huiju.estateagents.property.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.entity.TpMessageBoard;
+import com.huiju.estateagents.property.service.IMessageBoardService;
+import com.huiju.estateagents.property.vo.MessageBoardVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class MessageBoardController extends BaseController {
+
+    @Autowired
+    IMessageBoardService iMessageBoardService;
+
+    @GetMapping("/admin/message-board")
+    public ResponseBean getList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                @RequestParam(required = false) Integer communityId,
+                                @RequestParam(required = false) String name,
+                                @RequestParam(required = false) String phone,
+                                @RequestParam(required = false) String startDate,
+                                @RequestParam(required = false) String endDate,
+                                HttpServletRequest request) {
+        IPage<TpMessageBoard> page = new Page<>(pageNum, pageSize);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("orgId", getOrgId(request));
+        params.put("name", name);
+        params.put("phone", phone);
+        params.put("startDate", startDate);
+        params.put("endDate", endDate);
+        params.put("communityId", communityId);
+
+        IPage<TpMessageBoard> result = iMessageBoardService.getPagedBy(page, params);
+        return ResponseBean.success(result);
+    }
+
+    @GetMapping("/admin/message-board/{id}")
+    public ResponseBean getDetail(@PathVariable Integer id,
+                                  @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  HttpServletRequest request) {
+        IPage<TpMessageBoard> page = new Page<>(pageNum, pageSize);
+        IPage<TpMessageBoard> result = iMessageBoardService.getByMsgId(page, getOrgId(request), id);
+
+        return ResponseBean.success(result);
+    }
+
+    @GetMapping("/wx/message-board")
+    public ResponseBean getWxList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                  HttpServletRequest request) {
+        IPage<TpMessageBoard> page = new Page<>(pageNum, pageSize);
+        IPage<TpMessageBoard> result = iMessageBoardService.getWxList(page, getOrgId(request), getPersonId(request));
+
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/{client}/message-board")
+    public ResponseBean saveMessageOrReply(@PathVariable String client,
+                                           @RequestBody MessageBoardVO params,
+                                           HttpServletRequest request) {
+        String personId = null;
+        Integer userId = null;
+
+        if ("wx".equals(client)) {
+            personId = getPersonId(request);
+        } else {
+            userId = getUserId(request);
+        }
+
+        try {
+            iMessageBoardService.saveMessageOrReply(params, getOrgId(request), userId, personId);
+            return ResponseBean.success("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error("留言失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpBuildingOwnerInfoMapper.java

@@ -84,4 +84,6 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
     int getAvailableProp(Integer orgId, Integer communityId);
 
     Map<String, Object> getVerifyNum(Integer orgId, Integer communityId);
+
+    int countProp(Integer orgId, Integer roomNoId);
 }

src/main/java/com/huiju/estateagents/property/entity/TpMessageBoard.java

@@ -0,0 +1,75 @@
+package com.huiju.estateagents.property.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TpMessageBoard留言本", description="")
+public class TpMessageBoard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "msg_id", type = IdType.AUTO)
+    private Integer msgId;
+
+    @ApiModelProperty(value = "留言内容")
+    private String content;
+
+    @ApiModelProperty(value = "内容类型")
+    private String contentType;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "房间ID")
+    private Integer roomId;
+
+    @ApiModelProperty(value = "留言时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "小区ID")
+    private Integer communityId;
+
+    @ApiModelProperty(value = "机构ID")
+    private Integer orgId;
+
+    @ApiModelProperty(value = "昵称")
+    @TableField(exist = false)
+    private String nickname;
+
+    @ApiModelProperty(value = "业主电话")
+    @TableField(exist = false)
+    private String phone;
+
+    @ApiModelProperty(value = "业主头像")
+    @TableField(exist = false)
+    private String avatar;
+
+    @ApiModelProperty(value = "回复记录ID")
+    @TableField(exist = false)
+    private Integer replyId;
+
+    @ApiModelProperty(value = "物业人员ID")
+    @TableField(exist = false)
+    private Integer userId;
+}

src/main/java/com/huiju/estateagents/property/entity/TpMessageReply.java

@@ -0,0 +1,54 @@
+package com.huiju.estateagents.property.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TpMessageBoard留言回复", description="")
+public class TpMessageReply implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "reply_id", type = IdType.AUTO)
+    private Integer replyId;
+
+    @ApiModelProperty(value = "留言ID")
+    private Integer msgId;
+
+    @ApiModelProperty(value = "留言内容")
+    private String content;
+
+    @ApiModelProperty(value = "内容类型")
+    private String contentType;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "回复人员ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "留言时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "机构ID")
+    private Integer orgId;
+}

src/main/java/com/huiju/estateagents/property/mapper/TpMessageBoardMapper.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.property.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.property.entity.TpMessageBoard;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Mapper
+public interface TpMessageBoardMapper extends BaseMapper<TpMessageBoard> {
+
+    IPage<TpMessageBoard> getPagedBy(IPage<TpMessageBoard> page, @Param("params") Map<String, Object> params);
+
+    IPage<TpMessageBoard> getByMsgId(IPage<TpMessageBoard> page, Integer orgId, Integer id);
+
+    TpMessageBoard getByPersonId(Integer orgId, String personId);
+
+    IPage<TpMessageBoard> getWxList(IPage<TpMessageBoard> page, Integer orgId, String personId);
+}

src/main/java/com/huiju/estateagents/property/mapper/TpMessageReplyMapper.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.property.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.property.entity.TpMessageReply;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Mapper
+public interface TpMessageReplyMapper extends BaseMapper<TpMessageReply> {
+
+    IPage<TpMessageReply> getReplyList(IPage<TpMessageReply> page, Integer orgId, Integer msgId);
+}

src/main/java/com/huiju/estateagents/property/model/TaUserVerify.java

@@ -177,5 +177,10 @@ public class TaUserVerify implements Serializable {
     @TableField(exist = false)
     private String loginName;
 
+    /**
+     * 总积分
+     */
+    @TableField(exist = false)
+    private Integer totalPoints;
 
 }

src/main/java/com/huiju/estateagents/property/service/IMessageBoardService.java

@@ -0,0 +1,30 @@
+package com.huiju.estateagents.property.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.property.entity.TpMessageBoard;
+import com.huiju.estateagents.property.entity.TpMessageReply;
+import com.huiju.estateagents.property.vo.MessageBoardVO;
+
+import java.util.Map;
+
+public interface IMessageBoardService extends IService<TpMessageBoard> {
+    /**
+     * 获取留言板列表
+     * @param page
+     * @param orgId
+     * @param communityId
+     * @return
+     */
+    IPage<TpMessageBoard> getPagedBy(IPage<TpMessageBoard> page, Map<String, Object> params);
+
+    IPage<TpMessageBoard> getByMsgId(IPage<TpMessageBoard> page, Integer orgId, Integer id);
+
+    TpMessageBoard getByPersonId(Integer orgId, String personId);
+
+    IPage<TpMessageReply> getReplyList(IPage<TpMessageReply> page, Integer orgId, Integer msgId);
+
+    void saveMessageOrReply(MessageBoardVO params, Integer orgId, Integer userId, String personId) throws Exception;
+
+    IPage<TpMessageBoard> getWxList(IPage<TpMessageBoard> page, Integer orgId, String personId);
+}

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -11,7 +11,9 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPointsRecords;
 import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.exception.WisdomException;
@@ -98,6 +100,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Autowired
     private TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private TaPointsRecordsMapper taPointsRecordsMapper;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -1190,6 +1195,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 //        if(null!=face) {
 //            taUserVerify.setFaceImg(face.getFaceImg());
 //        }
+
+        // 查询总积分
+        Integer totalPoints = taPointsRecordsMapper.sumPointByPersonId(person.getPersonId());
+        taUserVerify.setTotalPoints(totalPoints);
+
         // 查询多套关联房产
         QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper= new QueryWrapper<>();
         taUserVerifyQueryWrapper.eq("person_id",taUserVerify.getPersonId());

src/main/java/com/huiju/estateagents/property/service/impl/MessageBoardServiceImpl.java

@@ -0,0 +1,99 @@
+package com.huiju.estateagents.property.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.property.entity.TpMessageBoard;
+import com.huiju.estateagents.property.entity.TpMessageReply;
+import com.huiju.estateagents.property.mapper.TpMessageBoardMapper;
+import com.huiju.estateagents.property.mapper.TpMessageReplyMapper;
+import com.huiju.estateagents.property.service.IMessageBoardService;
+import com.huiju.estateagents.property.vo.MessageBoardVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class MessageBoardServiceImpl extends ServiceImpl<TpMessageBoardMapper, TpMessageBoard> implements IMessageBoardService {
+    @Autowired
+    TpMessageBoardMapper tpMessageBoardMapper;
+
+    @Autowired
+    TpMessageReplyMapper tpMessageReplyMapper;
+
+    @Override
+    public IPage<TpMessageBoard> getPagedBy(IPage<TpMessageBoard> page, Map<String, Object> params) {
+        return tpMessageBoardMapper.getPagedBy(page, params);
+    }
+
+    @Override
+    public IPage<TpMessageBoard> getByMsgId(IPage<TpMessageBoard> page, Integer orgId, Integer id) {
+        return tpMessageBoardMapper.getByMsgId(page, orgId, id);
+    }
+
+    @Override
+    public TpMessageBoard getByPersonId(Integer orgId, String personId) {
+        return tpMessageBoardMapper.getByPersonId(orgId, personId);
+    }
+
+    @Override
+    public IPage<TpMessageReply> getReplyList(IPage<TpMessageReply> page, Integer orgId, Integer msgId) {
+        return tpMessageReplyMapper.getReplyList(page, orgId, msgId);
+    }
+
+    @Override
+    public void saveMessageOrReply(MessageBoardVO params, Integer orgId, Integer userId, String personId) throws Exception {
+        if (StringUtils.isEmpty(personId) && null == userId) {
+            throw new Exception("找不到留言人员");
+        }
+
+        TpMessageBoard messageBoard = null;
+        if (!StringUtils.isEmpty(personId)) {
+            messageBoard = getByPersonId(orgId, personId);
+        }
+
+        // 一个人只能有一个主记录
+        if (null != messageBoard && null != params.getMsgId() && !messageBoard.getMsgId().equals(params.getMsgId())) {
+            throw new Exception("数据记录错误, 请联系管理员");
+        }
+
+        if (null == messageBoard && null != params.getMsgId()) {
+            messageBoard = getById(params.getMsgId());
+        }
+
+        // 新增留言主表
+        if (null == messageBoard) {
+            messageBoard = new TpMessageBoard();
+            messageBoard.setContent(params.getContent());
+            messageBoard.setContentType("text");
+            messageBoard.setPersonId(personId);
+            messageBoard.setOrgId(orgId);
+
+            if (null != params.getRoomId()) {
+                // 如果留言板按照小区划分
+                // 暂时没这需求
+            }
+
+            save(messageBoard);
+            return;
+        }
+
+        // 否则新增回复记录
+        TpMessageReply reply = new TpMessageReply();
+        reply.setContent(params.getContent());
+        reply.setContentType("text");
+        reply.setPersonId(StringUtils.ifNull(personId, messageBoard.getPersonId()));
+        reply.setUserId(userId);
+        reply.setMsgId(params.getMsgId());
+        reply.setOrgId(orgId);
+        tpMessageReplyMapper.insert(reply);
+        return;
+    }
+
+    @Override
+    public IPage<TpMessageBoard> getWxList(IPage<TpMessageBoard> page, Integer orgId, String personId) {
+        return tpMessageBoardMapper.getWxList(page, orgId, personId);
+    }
+
+}

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaPersonMapper;
@@ -20,6 +21,7 @@ import com.huiju.estateagents.property.service.ITaUserVerifyService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -73,6 +75,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     @Autowired
     private ApplicationContext applicationContext;
 
+    @Value("${biz.room.limit}")
+    private Integer perRoomLimit;
+
     @Override
     public ResponseBean selectAll(Integer communityId, String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -103,7 +108,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             return responseBean;
         }
         // 设置成用户提交上来的状态结果
-        String status = verifyStatus == true ? Constant.APPROVED : Constant.REJECTED;
+        String status = verifyStatus ? Constant.APPROVED : Constant.REJECTED;
         userVerify.setVerifyStatus(status);
 
         // 校验房产
@@ -111,6 +116,11 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 2020年12月31日 yansen
         hasUserVerify(userElement, userVerify, Integer.valueOf(1).equals(userVerify.getRoleId()));
 
+        int propNum = tpBuildingOwnerInfoMapper.countProp(userVerify.getOrgId(), userVerify.getRoomNoId());
+        if (propNum >= perRoomLimit && verifyStatus) {
+            responseBean.addError("当前房产认证人数超过上限！");
+            return responseBean;
+        }
 
         TaUser user = taUserMapper.selectById(userElement.getUserId());
 
@@ -128,6 +138,8 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 只有审核不通过的时候，写入不通过原因
         if (Constant.REJECTED.equals(status)) {
             userVerify.setRemark(remark);
+        } else {
+            taPerson.setPersonType(CommConstant.PERSON_PROPRIETOR);
         }
 
         userVerify.setVerifyName(user.getUserName());
@@ -207,6 +219,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         TpRoomNo tpRoomNo = tpRoomNoMapper.selectById(userVerify.getRoomNoId());
         TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
         tpBuildingOwnerInfo.setOrgId(userVerify.getOrgId());
+        tpBuildingOwnerInfo.setCommunityId(userVerify.getCommunityId());
         tpBuildingOwnerInfo.setIdCard(userVerify.getIdCard());
         tpBuildingOwnerInfo.setPhaseId(tpPhase.getId());
         tpBuildingOwnerInfo.setPhaseName(tpPhase.getName());
@@ -354,6 +367,13 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             return responseBean;
         }
 
+        // 查询当前房产下的业主个数
+        int propNum = tpBuildingOwnerInfoMapper.countProp(taUserVerify.getOrgId(), taUserVerify.getRoomNoId());
+        if (propNum >= perRoomLimit) {
+            responseBean.addError("当前房产认证业主超过限制, 请更换！");
+            return responseBean;
+        }
+
         // 查询 期/栋/单元/楼层/户号 -> 设置 相应 id 和 name
         TpPhase phase = tpPhaseMapper.selectById(taUserVerify.getPhaseId());
         TpBuilding building = tpBuildingMapper.selectById(taUserVerify.getBuildingId());

src/main/java/com/huiju/estateagents/property/vo/MessageBoardVO.java

@@ -0,0 +1,10 @@
+package com.huiju.estateagents.property.vo;
+
+import lombok.Data;
+
+@Data
+public class MessageBoardVO {
+    private Integer msgId;
+    private String content;
+    private Integer roomId;
+}

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

@@ -120,4 +120,5 @@ public interface ITaPersonService extends IService<TaPerson> {
     ResponseBean updateUserPhoto(String photoUrl, String openId);
 
     IPage<TaPerson> getPersonBy(IPage<TaPerson> page, Integer orgId, String name, String phone, String recommended);
+
 }

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

@@ -93,4 +93,6 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * @param orgId
 	 */
 	void payment(TpBillOrder source, Integer orgId);
+
+	void addPointsRecords(TaPointsRecords taPointsRecords) throws Exception;
 }

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

@@ -106,6 +106,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(taShare.getPersonId());
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
@@ -130,6 +136,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         if (null == person) {
             return;
         }
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
@@ -169,6 +181,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(taPersonSign.getPersonId());
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
@@ -199,6 +217,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(taActivityDynamicEnlist.getPersonId());
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
@@ -206,6 +230,11 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
     @Override
     public void signUpPoints(TaPerson taPerson, Integer orgId) {
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())) {
+            return;
+        }
+
         //
         String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
         // 是否开启积分规则
@@ -256,7 +285,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
-        if (null != taPerson && savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())) {
+            return;
+        }
+
+        if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(taPerson.getPersonId(), pointsAmount);
         }
     }
@@ -280,6 +315,11 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
             origPoints = 0;
         }
 
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())) {
+            return;
+        }
+
         // 积分不足
         if (minusPoints > origPoints) {
             return;
@@ -293,7 +333,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         String changeParams = String.join("&", params);
 
         // 发放积分
-        Integer pointsAmount = 0 - minusPoints;
+        int pointsAmount = -minusPoints;
         if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(taPerson.getPersonId(), pointsAmount);
         }
@@ -384,6 +424,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(taDocumentVerify.getPersonId());
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
@@ -413,6 +459,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
@@ -471,6 +523,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(userVerify.getPersonId());
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, null, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
@@ -500,6 +558,12 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(source.getPersonId());
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, null, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
@@ -529,8 +593,24 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(source.getCreateUser());
+
+        // 2021年2月1日 只有业主有积分
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+            return;
+        }
+
         if (savePoints(person, changeType, null, pointsAmount * money, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }
     }
+
+    @Override
+    public void addPointsRecords(TaPointsRecords taPointsRecords) throws Exception {
+        TaPerson taPerson = taPersonMapper.getById(taPointsRecords.getPersonId());
+
+        boolean isSuccess = savePoints(taPerson, taPointsRecords.getChangeType(), null, taPointsRecords.getPointsAmount(), taPerson.getOrgId());
+        if (isSuccess) {
+            taPersonMapper.setPointsIncrement(taPerson.getPersonId(), taPointsRecords.getPointsAmount());
+        }
+    }
 }

src/main/resources/application.yml

@@ -17,4 +17,9 @@ wx:
     ticket: /pages/WoDe/YeZhuBaoXiu/index?id=
   mp:
     festivalH5: https://xs.njyunzhi.com/jierih5.html
-    birthdayH5: https://xs.njyunzhi.com/shengrih5.html
+    birthdayH5: https://xs.njyunzhi.com/shengrih5.html
+
+biz:
+  room:
+    # 单个房间最多4个业主
+    limit: 4

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -20,11 +20,13 @@
             t.org_id,
             t.building_id,
             t.verify_date,
-            p.person_type
+            null as person_type,
+            CONCAT(p.phase_name, p.building_name, p.unit_name, p.room_no_name) as room_info,
+            p.id as prop_id
         FROM
             ta_points_exchange t
-            LEFT JOIN ta_person p ON t.person_id = p.person_id
-        where 1=1
+            INNER JOIN ta_user_verify p ON t.person_id = p.person_id
+        where p.verify_status = 1
         <if test="taPointsExchange.status != null and taPointsExchange.status != '' or taPointsExchange.status ==0">
             and  t.`status` = #{taPointsExchange.status}
         </if>
@@ -32,17 +34,17 @@
             and  t.org_id = #{taPointsExchange.orgId}
         </if>
         <if test="taPointsExchange.personName != null and taPointsExchange.personName != ''">
-            and  t.person_name like concat('%',#{taPointsExchange.personName},'%')
+            and  p.owner_name like concat('%',#{taPointsExchange.personName},'%')
         </if>
         <if test="taPointsExchange.phone != null and taPointsExchange.phone != ''">
-            and  t.phone like concat('%',#{taPointsExchange.phone},'%')
+            and  p.phone like concat('%',#{taPointsExchange.phone},'%')
         </if>
         <if test="taPointsExchange.tel != null and taPointsExchange.tel != ''">
-            and  t.phone = #{taPointsExchange.tel}
-        </if>
-        <if test="taPointsExchange.personType != null and taPointsExchange.personType != ''">
-            and  p.person_type = #{taPointsExchange.personType}
+            and  p.phone = #{taPointsExchange.tel}
         </if>
+<!--        <if test="taPointsExchange.personType != null and taPointsExchange.personType != ''">-->
+<!--            and  p.person_type = #{taPointsExchange.personType}-->
+<!--        </if>-->
         <if test="taPointsExchange.targetName != null and taPointsExchange.targetName != ''">
             and  t.target_name like concat('%',#{taPointsExchange.targetName},'%')
         </if>

src/main/resources/mapper/property/BillMapper.xml

@@ -24,7 +24,7 @@
         <if test="bill.isTicket">
             and t.is_ticket = 1
         </if>
-        <if test="!bill.isTicket">
+        <if test="bill.isTicket == false">
             and t.is_ticket = 0
         </if>
         order by t.id DESC

src/main/resources/mapper/property/TpBuildingOwnerInfoMapper.xml

@@ -140,4 +140,14 @@
             t.org_id = #{orgId}
             AND t.community_id = #{communityId}
     </select>
+    <select id="countProp" resultType="java.lang.Integer">
+        SELECT
+            count( * )
+        FROM
+            tp_building_owner_info t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.room_no_id = #{roomNoId}
+            AND t.verify_status IN ( '0', '1' )
+    </select>
 </mapper>

src/main/resources/mapper/property/TpMessageBoardMapper.xml

@@ -0,0 +1,124 @@
+<?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.huiju.estateagents.property.mapper.TpMessageBoardMapper">
+
+    <sql id="compactQuery">
+        SELECT
+            t.msg_id,
+            NULL AS repy_id,
+            t.content,
+            t.content_type,
+            t.org_id,
+            t.create_date,
+            t.person_id,
+            NULL AS user_id
+        FROM
+            tp_message_board t
+        WHERE
+            t.org_id = #{orgId}
+        UNION
+        SELECT
+            s.msg_id,
+            s.reply_id,
+            s.content,
+            s.content_type,
+            s.org_id,
+            s.create_date,
+            s.person_id,
+            s.user_id
+        FROM
+            tp_message_reply s
+        WHERE
+            s.org_id = #{orgId}
+    </sql>
+
+    <select id="getPagedBy" resultType="com.huiju.estateagents.property.entity.TpMessageBoard">
+        SELECT
+            t.msg_id,
+            t.org_id,
+            s.reply_id,
+            IFNULL( s.content, t.content ) AS content,
+            IFNULL( s.content_type, t.content_type ) AS content_type,
+            IFNULL( s.create_date, t.create_date ) AS create_date,
+            t.person_id,
+            s.user_id,
+            m.nickname,
+            m.phone,
+            m.avatarurl AS avatar
+        FROM
+            tp_message_board t
+            INNER JOIN ta_person m ON m.person_id = t.person_id
+            LEFT JOIN (
+                SELECT
+                    *
+                FROM
+                    tp_message_reply a
+                WHERE
+                    a.org_id = #{params.orgId}
+                    AND a.user_id IS NULL
+                    HAVING 1
+                    ORDER BY a.create_date DESC
+                ) s ON s.msg_id = t.msg_id
+        WHERE
+            t.org_id = #{params.orgId}
+            <if test="null != params.name and '' != params.name">
+                AND m.nickname like CONCAT('%', #{params.name}, '%')
+            </if>
+            <if test="null != params.phone and '' != params.phone">
+                AND m.phone like CONCAT('%', #{params.phone}, '%')
+            </if>
+            <if test="null != params.startDate and '' != params.startDate">
+                AND DATE_FORMAT(IFNULL( s.create_date, t.create_date ), '%Y-%m-%d') &gt;= #{params.startDate}
+            </if>
+            <if test="null != params.endDate and '' != params.endDate">
+                AND DATE_FORMAT(IFNULL( s.create_date, t.create_date ), '%Y-%m-%d') &lt;= #{params.endDate}
+            </if>
+        GROUP BY
+            s.msg_id
+        ORDER BY
+            IFNULL( s.create_date, t.create_date ) DESC
+    </select>
+    <select id="getByMsgId" resultType="com.huiju.estateagents.property.entity.TpMessageBoard">
+        SELECT
+            a.*,
+            b.nickname,
+            b.phone,
+            b.avatarurl AS avatar
+        FROM
+            (<include refid="compactQuery" />) a
+            INNER JOIN ta_person b
+        WHERE
+            b.person_id = a.person_id
+            AND a.msg_id = #{id}
+        ORDER BY
+            a.create_date DESC
+    </select>
+    <select id="getByPersonId" resultType="com.huiju.estateagents.property.entity.TpMessageBoard">
+        SELECT
+            t.*,
+            s.nickname,
+            s.phone,
+            s.avatarurl as avatar
+        FROM
+            tp_message_board t
+            LEFT JOIN ta_person s ON t.org_id = s.org_id
+            AND t.person_id = s.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+    </select>
+    <select id="getWxList" resultType="com.huiju.estateagents.property.entity.TpMessageBoard">
+        SELECT
+            a.*,
+            b.nickname,
+            b.phone,
+            b.avatarurl AS avatar
+        FROM
+            (<include refid="compactQuery" />) a
+            INNER JOIN ta_person b ON b.person_id = a.person_id
+        WHERE
+            b.person_id = #{personId}
+        ORDER BY
+            a.create_date DESC
+    </select>
+</mapper>

src/main/resources/mapper/property/TpMessageReplyMapper.xml

@@ -0,0 +1,16 @@
+<?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.huiju.estateagents.property.mapper.TpMessageReplyMapper">
+
+    <select id="getReplyList" resultType="com.huiju.estateagents.property.entity.TpMessageReply">
+        SELECT
+            *
+        FROM
+            tp_message_reply t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.msg_id = #{msgId}
+        ORDER BY
+            t.create_date DESC
+    </select>
+</mapper>