Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -122,6 +122,16 @@ public class CommonController extends BaseController {
         }
     }
 
+    @PostMapping("{plat}/check/captcha")
+    public ResponseBean sendCaptcha(@RequestParam String tel,@RequestParam String captcha) {
+        boolean success = smsUtils.checkCaptcha(tel,captcha);
+        if (success) {
+            return ResponseBean.success("验证码校验成功");
+        } else {
+            return ResponseBean.error("验证码校验失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     @GetMapping("/center/dict/templateType")
     public ResponseBean getAllTplTypes() {
         return ResponseBean.success(iTdMiniappTemplateTypeService.getAllTypes());

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

@@ -189,6 +189,8 @@ public class TaRaiseRecordController extends BaseController {
                 record.setInvalidReason(raiseRecord.getInvalidReason());
                 record.setUpdateDate(LocalDateTime.now());
                 record.setStatus(0);
+                //发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -230,6 +232,8 @@ public class TaRaiseRecordController extends BaseController {
                 }
                 record.setStatus(CommConstant.STATUS_DELETE);
                 record.setUpdateDate(LocalDateTime.now());
+                //发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -294,6 +298,8 @@ public class TaRaiseRecordController extends BaseController {
                 }
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
                 record.setUpdateDate(LocalDateTime.now());
+                //发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹已缴费","点击详情查看认筹单","您的认筹已成功缴费",false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -364,6 +370,8 @@ public class TaRaiseRecordController extends BaseController {
                 record.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
                 record.setRefundReason(refundReason);
                 record.setUpdateDate(LocalDateTime.now());
+                //发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"在线选房认筹通知","认筹已退费","点击详情查看认筹单","您的认筹已成功退费",false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {

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

@@ -229,6 +229,31 @@ public class TaSalesBatchController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             taSalesBatch.setSalesBatchId(id);
+
+            if (taSalesBatch.getStatus() != null && taSalesBatch.getStatus() != 1) {
+                // 校验批次下是否有预选记录
+                QueryWrapper<TaPreselection> preselectionQueryWrapper = new QueryWrapper<>();
+                preselectionQueryWrapper.eq("org_id", getOrgId(request));
+                preselectionQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
+                preselectionQueryWrapper.eq("status", 1);
+                TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
+                if (preselection != null) {
+                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", taSalesBatch.getSalesBatchName()));
+                    return responseBean;
+                }
+
+                // 校验批次下是否有认筹
+                QueryWrapper<TaRaise> raiseQueryWrapper = new QueryWrapper<>();
+                raiseQueryWrapper.eq("org_id", getOrgId(request));
+                raiseQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
+                raiseQueryWrapper.eq("status", 1);
+                TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
+                if (raise != null) {
+                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的预选模块", taSalesBatch.getSalesBatchName()));
+                    return responseBean;
+                }
+            }
+
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", getOrgId(request));
             queryWrapper.eq("content_type", CommConstant.SALES_BATCH);

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

@@ -50,12 +50,12 @@ public class TaRaise implements Serializable {
     /**
      * 认筹开始时间
      */
-    private String raiseStartTime;
+    private LocalDateTime raiseStartTime;
 
     /**
      * 认筹结束时间
      */
-    private String raiseEndTime;
+    private LocalDateTime raiseEndTime;
 
     /**
      * 锁房方式 auto自动锁房，manual手动锁房

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

@@ -233,4 +233,11 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private TaUser consultantInfo;
+
+    /**
+     * 验证码
+     *
+     */
+    @TableField(exist = false)
+    private String captcha;
 }

src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java

@@ -82,6 +82,13 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      */
     Boolean updateForSubtractHeat(@Param("houseId") Integer houseId);
 
+    /**
+     * 减少认筹热度值
+     * @param houseId
+     * @return
+     */
+    Boolean updateForSubtractRaiseHeat(@Param("houseId") Integer houseId);
+
     /**
      * 根据房源ID获取房源详情
      *
@@ -133,7 +140,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
                                  @Param("orgId") Integer orgId);
 
     /**
-     * 批量更新房源认筹基础认读
+     * 批量更新房源认筹基础热度
      *
      * @param housingResourcesList
      * @param heat

src/main/java/com/huiju/estateagents/mapper/TaSalesBatchMapper.java

@@ -51,5 +51,15 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
      * @return
      */
     List<TaBuilding> getBuildingById(@Param("salesBatchId") String salesBatchId,
+                                     @Param("orgId") Integer orgId);
+
+    /**
+     * 出售房源自增
+     *
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    Boolean addSalesNumberById(@Param("salesBatchId") Integer salesBatchId,
                                @Param("orgId") Integer orgId);
 }

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

@@ -59,4 +59,6 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      */
     ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId, Integer userId);
 
+    Boolean updateForSubtractRaiseHeat(Integer houseId);
+
 }

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

@@ -80,4 +80,9 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
      * @return
      */
     Boolean addHouseNum(Integer raiseRecordId, Integer orgId, Integer userId);
+
+    /**
+     * 发送认筹消息
+     */
+    void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess);
 }

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

@@ -276,12 +276,72 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         if (null == taRaise) {
             resourcesPO.setRaiseBtn(false);
         } else {
+            //有认筹表的情况下判断是否认筹过这个房源
+            boolean raiseBtnStatus = checkRaiseBtn(taRaise,salesBatchId,personId,houseId,orgId);
             resourcesPO.setTaRaise(taRaise);
         }
 
         return resourcesPO;
     }
 
+    /**
+     * 校验认筹状态的按钮
+     * @param taRaise
+     * @param salesBatchId
+     * @param personId
+     * @param houseId
+     * @param orgId
+     * @return
+     */
+    private boolean checkRaiseBtn(TaRaise taRaise, Integer salesBatchId, String personId, Integer houseId, Integer orgId) {
+        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL){
+            return false;
+        }
+        if (taRaise.getNeedPreselection()){
+            //查看是否有当前房源的预选记录
+            QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
+            preselectionRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
+            preselectionRecordQueryWrapper.eq("building_id",taRaise.getBuildingId());
+            preselectionRecordQueryWrapper.eq("org_id",orgId);
+            preselectionRecordQueryWrapper.eq("house_id",houseId);
+            preselectionRecordQueryWrapper.eq("person_id",personId);
+            TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.selectOne(preselectionRecordQueryWrapper);
+            if (null == taPreselectionRecord){
+                return false;
+            }
+        }
+        //判断是否在时间之内
+        LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
+        LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
+        LocalDateTime now = LocalDateTime.now();
+        if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)){
+            return false;
+        }
+        //销售批次校验
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(salesBatchId);
+        if (taSalesBatch.getStatus() != CommConstant.STATUS_NORMAL){
+            return false;
+        }
+
+        //房源信息
+        TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseId);
+        if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL || CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
+            return false;
+        }
+
+        //查询我的认筹记录表
+        QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+        taRaiseHouseQueryWrapper.eq("org_id",orgId);
+        taRaiseHouseQueryWrapper.eq("house_id",houseId);
+        taRaiseHouseQueryWrapper.eq("person_id",personId);
+        List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+        if (list.size() > 0){
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * 校验楼栋信息存不存在
      *
@@ -358,6 +418,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             addRoom(taHousingResources);
         }
 
+        // 更新销售批次里的房源数
+        taSalesBatchMapper.addSalesNumberById(taHousingResources.getSalesBatchId(),taHousingResources.getOrgId());
+
         // 获取楼盘名称
         TaBuilding taBuilding = taBuildingMapper.selectById(taHousingResources.getBuildingId());
         taHousingResources.setBuildingName(taBuilding.getBuildingName());

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

@@ -240,11 +240,21 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     public ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
+        // 更新房源表热度信息
+        for (TaPreselectionRecord tp : preselectionRecordList) {
+            taHousingResourcesMapper.updateForSubtractHeat(tp.getHouseId());
+        }
+
         taPreselectionRecordMapper.batchDeletePreselectRecord(preselectionRecordList, orgId, userId);
         responseBean.addSuccess("success");
         return responseBean;
     }
 
+    @Override
+    public Boolean updateForSubtractRaiseHeat(Integer houseId) {
+        return taHousingResourcesMapper.updateForSubtractRaiseHeat(houseId);
+    }
+
     /**
      * 发送订阅消息
      *

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
@@ -72,6 +73,9 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    SMSUtils smsUtils;
+
     @Override
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
@@ -116,6 +120,10 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         if (houseList.size() < 1) {
             throw new Exception("请选择房源！");
         }
+//        //校验手机号
+//        if(!smsUtils.checkCaptcha(taRaiseRecord.getTel(),taRaiseRecord.getCaptcha())){
+//            throw new Exception("验证码错误。");
+//        }
         //获取认筹信息
         TaRaise taRaise = taRaiseMapper.selectById(taRaiseRecord.getRaiseId());
         //如果是自动锁房就要判断里面的房源有没有被锁住
@@ -132,7 +140,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
                 throw new Exception("此房源已被锁定！");
             }
             //检验成功的话先锁定房源
-            lockedHouseResources(taHousingResources);
+//            lockedHouseResources(taHousingResources);
         }
         //判断销售批次是否是发布状态和房源是否正常状态
         checkHouseStatus(taRaiseRecord,orgId, personId, taRaise);
@@ -140,6 +148,9 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         //插入认筹单
         saveRaiseRecord(taRaiseRecord, orgId, personId, taRaise);
 
+        //发送订阅消息
+        sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),personId,"在线选房认筹通知","已提交认筹","点击详情查看认筹单","房源紧俏，请赶紧缴费",true);
+
         return taRaiseRecord;
     }
 
@@ -232,6 +243,15 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
             taRaiseHouse.setOrgId(orgId);
             taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
             taRaiseHouseMapper.insert(taRaiseHouse);
+
+            //更新房源的实际热度
+            TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(e);
+            Integer raiseRealHeat = taHousingResources.getRaiseRealHeat();
+            if (null == raiseRealHeat){
+                raiseRealHeat = 0;
+            }
+            taHousingResources.setRaiseRealHeat(raiseRealHeat+1);
+            taHousingResourcesMapper.updateById(taHousingResources);
         });
 
         //把idcard字断更新进person表
@@ -260,12 +280,13 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
      * @param personId   用户ID
      * @param title  审核类型
      * @param result     审核结果
-     * @param failReason 失败原因
+     * @param remark 失败原因
      * @param isSuccess  是否成功 true是(只有成功才发送短信)
      */
-    public void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String failReason,String remark, Boolean isSuccess) {
-        logger.info("sendSubscribeMsg 接收参数：houseId:{},checkType:{},result:{}，failReason:{}",
-                raiseRecordId, title, result, failReason);
+    @Override
+    public void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess) {
+        logger.info("sendSubscribeMsg 接收参数：houseId:{},checkType:{},result:{}，reason:{}, remark:{}",
+                raiseRecordId, title, result, reason, remark);
 
         ExecutorService threadPool = Executors.newCachedThreadPool();
         threadPool.execute(() -> {
@@ -286,7 +307,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
 
             String link = String.format(CommConstant.RAISE_DETAIL_PATH, raiseRecordId);
 
-            miniAppService.sendCheckMessage(toUser, link, title, result, taBuilding.getBuildingName(), failReason, remark, LocalDateTime.now(), isSuccess);
+            miniAppService.sendCheckMessage(toUser, link, title, result, taBuilding.getBuildingName(), reason, remark, LocalDateTime.now(), isSuccess);
             logger.info("sendSubscribeMsg 结束");
         });
     }

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.wxpay.WXPayUtil;
 import com.huiju.estateagents.common.wxpay.WxConfig;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.ITaRaiseRecordService;
 import com.huiju.estateagents.service.IWxPayService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,9 @@ public class WxPayServiceImpl implements IWxPayService {
     @Autowired
     private TaPersonMapper taPersonMapper;
 
+    @Autowired
+    private ITaRaiseRecordService taRaiseRecordService;
+
     /**
      * 微信支付-统一下单
      *
@@ -204,6 +208,8 @@ public class WxPayServiceImpl implements IWxPayService {
                 taRaiseRecordMapper.updateById(taRaiseRecord);
                 //更新退款时间
                 e.setPayTime(LocalDateTime.now());
+                //发送订阅消息
+                taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","线上退费成功","点击详情查看认筹单","线上退费成功",false);
             }
             taOrderMapper.updateById(e);
         });
@@ -266,6 +272,8 @@ public class WxPayServiceImpl implements IWxPayService {
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
         taRaiseRecord.setRefundReason(taOrder.getRefundReason());
         taRaiseRecordMapper.updateById(taRaiseRecord);
+        //发送订阅消息
+        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","认筹正在退费","点击详情查看认筹单","正在等待微信或银行到账",false);
     }
 
     /**
@@ -321,6 +329,9 @@ public class WxPayServiceImpl implements IWxPayService {
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
         taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_PAID);
         taRaiseRecordMapper.updateById(taRaiseRecord);
+
+        //发送订阅消息
+        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","认筹支付成功","点击详情查看认筹单","已付款成功",false);
     }
 
     /**
@@ -375,12 +386,12 @@ public class WxPayServiceImpl implements IWxPayService {
             throw new Exception("自动锁房只能认筹一个房源。");
         }
         //判断此房源有没有被锁定
-//        TaHousingResources taHousingResources = getHousingResourcesById(taRaiseHouseList.get(0).getHouseId());
-//        if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
-//            throw new Exception("改房源已被锁定暂时无法认筹。");
-//        }
+        TaHousingResources taHousingResources = getHousingResourcesById(taRaiseHouseList.get(0).getHouseId());
+        if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+            throw new Exception("改房源已被锁定暂时无法认筹。");
+        }
         //锁定此房源并且更改认筹单的锁定状态
-//        changeLockingStatus(taRaiseRecord,taRaiseHouseList.get(0),taHousingResources);
+        changeLockingStatus(taRaiseRecord,taRaiseHouseList.get(0),taHousingResources);
     }
 
     /**

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -230,6 +230,14 @@
             AND t.real_heat > 0
     </update>
 
+    <update id="updateForSubtractRaiseHeat" parameterType="java.lang.Integer">
+        UPDATE ta_housing_resources t
+        SET t.raise_real_heat = IFNULL(t.raise_real_heat, 0) - 1
+        WHERE
+            t.house_id = #{houseId}
+            AND t.raise_real_heat > 0
+    </update>
+
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
         t.house_id,
@@ -257,6 +265,7 @@
         t3.preselection_start_time,
         t3.preselection_end_time,
         t3.`status` saleBatchStatus,
+        t3.display_house_price,
         t4.building_name buildingName
         FROM
         ta_housing_resources t

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -29,7 +29,7 @@
             AND t.org_id = #{orgId}
             AND t.house_id = t2.house_id
             <if test="buildingId != null and buildingId != ''">
-                AND t.building_id = #{buildingId}
+                AND t2.building_id = #{buildingId}
             </if>
             <if test="salesBatchId != null and salesBatchId != ''">
                 AND t2.sales_batch_id = #{salesBatchId}
@@ -55,7 +55,7 @@
                 AND t6.person_id != #{personId}
             </if>
           GROUP BY
-            t6.house_id
+            t6.preselection_record_id
          ORDER BY
             t3.create_date DESC
 

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -67,4 +67,12 @@
             AND t.`status` != -1
 
     </select>
+
+    <update id="addSalesNumberById">
+        UPDATE ta_sales_batch t
+        SET t.sales_number = IFNULL( t.sales_number, 0 ) + 1
+        WHERE
+            t.org_id = #{orgId}
+            AND t.sales_batch_id = #{salesBatchId}
+    </update>
 </mapper>