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

# Conflicts:
#	src/main/java/com/huiju/estateagents/entity/TaPreselection.java
#	src/main/resources/mapper/TaPreselectionMapper.xml

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

@@ -651,6 +651,11 @@ public class CommConstant {
      */
     public static final String HOUSE_LOCKING_TYPE_AUTO = "auto";
 
+    /**
+     * 手动锁房
+     */
+    public static final String HOUSE_LOCKING_TYPE_MANUAL = "manual";
+
     /**
      * 正在缴费
      */

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

@@ -246,15 +246,30 @@ public class TaHousingResourcesController extends BaseController {
             taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
             taRaiseRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
-            //我认筹的房源的集合
-            List<TaRaiseHouse> taRaiseHouseList = new ArrayList<>();
-            if (taRaiseRecordList.size() > 0){
-                //认筹记录对应的有效房源,我的锁定的房源也在里面
-                QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-                taRaiseHouseQueryWrapper.in("raise_record_id",taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
-                taRaiseHouseQueryWrapper.in("person_id",getPersonId(request));
-                taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
-            }
+
+            //认筹记录对应的有效房源,我的锁定的房源也在里面
+            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+            taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0,"raise_record_id",taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
+            List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+
+            taHousingResourcesPOList.forEach(e -> {
+                taPreselectionRecordList.forEach(p -> {
+                    //我的预选
+                    if (e.getHouseId().equals(p.getHouseId())){
+                        e.setMinePreselection("mine");
+                    }
+                });
+                //我的认筹和锁定
+                taRaiseHouseList.forEach(r -> {
+                    //我的认筹
+                    if (e.getHouseId().equals(r.getHouseId())){
+                        e.setMineRaise("mine");
+                        if (r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+                            e.setMineLocked("mine");
+                        }
+                    }
+                });
+            });
 
             responseBean.addSuccess(taHousingResourcesPOList);
         } catch (Exception e) {

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

@@ -120,6 +120,7 @@ public class TaPreselectionController extends BaseController {
             QueryWrapper<TaPreselection> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", orgId);
             queryWrapper.eq("sales_batch_id", taPreselection.getSalesBatchId());
+            queryWrapper.eq("status", 1);
             TaPreselection record = iTaPreselectionService.getOne(queryWrapper);
             if (record != null) {
                 responseBean.addError("销售批次已新增过预选");
@@ -210,8 +211,7 @@ public class TaPreselectionController extends BaseController {
      */
     @RequestMapping(value = "/admin/taPreselection/{id}", method = RequestMethod.PUT)
     public ResponseBean taPreselectionUpdate(@PathVariable Integer id,
-                                             @RequestBody TaPreselection taPreselection,
-                                             HttpServletRequest request) {
+                                             @RequestBody TaPreselection taPreselection) {
         ResponseBean responseBean = new ResponseBean();
         try {
 
@@ -220,17 +220,6 @@ public class TaPreselectionController extends BaseController {
                 return responseBean;
             }
 
-            Integer orgId = getOrgId(request);
-            // 校验是否预选过
-            QueryWrapper<TaPreselection> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id", orgId);
-            queryWrapper.eq("sales_batch_id", taPreselection.getSalesBatchId());
-            TaPreselection record = iTaPreselectionService.getOne(queryWrapper);
-            if (record != null) {
-                responseBean.addError("销售批次已新增过预选");
-                return responseBean;
-            }
-
             if (StringUtils.isNotBlank(taPreselection.getPreselectionStartTime()) && StringUtils.isNotBlank(taPreselection.getPreselectionEndTime())) {
                 // 更新批次表信息
                 TaSalesBatch taSalesBatch = new TaSalesBatch();

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

@@ -36,11 +36,8 @@ public class TaRaiseController extends BaseController {
     @Autowired
     public ITaRaiseService iTaRaiseService;
 
-    @Autowired
-    private ITaSalesBatchService iTaSalesBatchService;
-
     /**
-     * 获取销售批次列表-认筹
+     * 获取认筹列表
      *
      * @param pageNum
      * @param pageSize
@@ -50,21 +47,21 @@ public class TaRaiseController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "admin/listSalesBatchForRaise", method = RequestMethod.GET)
-    public ResponseBean listSalesBatchForRaise(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               String buildingId, String salesBatchName, Integer status,
-                                               HttpServletRequest request) {
+    @RequestMapping(value = "admin/listRaiseByCondition", method = RequestMethod.GET)
+    public ResponseBean listRaiseByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             String buildingId, String salesBatchName, Integer status,
+                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
 
         try {
             Integer orgId = getOrgId(request);
             List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
 
-            responseBean = iTaSalesBatchService.listSalesBatchForRaise(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
-            logger.info("listSalesBatchForRaise 返回结果：{}", JSONObject.toJSONString(responseBean));
+            responseBean = iTaRaiseService.listRaiseByCondition(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
+            logger.info("listRaiseByCondition 返回结果：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
-            logger.error("listSalesBatchForRaise -=- {}", e);
+            logger.error("listRaiseByCondition -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -105,7 +102,7 @@ public class TaRaiseController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/taRaise", method = RequestMethod.POST)
-    public ResponseBean taRaiseAdd(@RequestBody TaRaise taRaise) {
+    public ResponseBean taRaiseAdd(@RequestBody TaRaise taRaise, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             // 参数校验
@@ -115,6 +112,19 @@ public class TaRaiseController extends BaseController {
                 return responseBean;
             }
 
+            Integer orgId = getOrgId(request);
+
+            // 校验批次是否已经认筹过
+            QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+            taRaiseQueryWrapper.eq("orgId", orgId);
+            taRaiseQueryWrapper.eq("sales_batch_id", orgId);
+            taRaiseQueryWrapper.eq("status", 1);
+            TaRaise tr = iTaRaiseService.getOne(taRaiseQueryWrapper);
+            if (tr != null) {
+                responseBean.addSuccess("该销售批次已添加过认筹");
+                return responseBean;
+            }
+
             if (iTaRaiseService.save(taRaise)) {
                 responseBean.addSuccess(taRaise);
             } else {
@@ -181,7 +191,7 @@ public class TaRaiseController extends BaseController {
      * @param taRaise 实体对象
      * @return
      */
-    @RequestMapping(value = "/taRaise/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taRaise/{id}", method = RequestMethod.PUT)
     public ResponseBean taRaiseUpdate(@PathVariable Integer id,
                                       @RequestBody TaRaise taRaise) {
         ResponseBean responseBean = new ResponseBean();
@@ -204,11 +214,11 @@ public class TaRaiseController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/taRaise/{id}", method = RequestMethod.GET)
-    public ResponseBean taRaiseGet(@PathVariable Integer id) {
+    @RequestMapping(value = "/admin/taRaise/{id}", method = RequestMethod.GET)
+    public ResponseBean taRaiseGet(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaRaiseService.getById(id));
+            responseBean = iTaRaiseService.getRaiseById(id, getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taRaiseDelete -=- {}", e.toString());

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

@@ -411,4 +411,23 @@ public class TaRaiseRecordController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 微信端下认筹单
+     *
+     * @param taRaiseRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/wx/taRaiseRecord", method = RequestMethod.POST)
+    public ResponseBean wxRaiseRecordAdd(@RequestBody TaRaiseRecord taRaiseRecord,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord,getOrgId(request),getPersonId(request)));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseRecordAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 预选表 
+ * 预选表
  * </p>
  *
  * @author jobob

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -101,9 +102,34 @@ public class TaRaise implements Serializable {
     private LocalDateTime createDate;
 
     /**
-     * 基础热度
+     * 楼盘名
      */
-    private Integer heat;
+    @TableField(exist = false)
+    private String buildingName;
+
+    /**
+     * 销售批次名
+     */
+    @TableField(exist = false)
+    private String salesBatchName;
+
+    /**
+     * 二维码
+     */
+    @TableField(exist = false)
+    private String qrCode;
+
+    /**
+     * 认筹实际热度
+     */
+    @TableField(exist = false)
+    private Integer raiseRealHeat;
+
+    /**
+     * 销售批次备注
+     */
+    @TableField(exist = false)
+    private Integer remark;
 
 
 }

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

@@ -9,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -171,4 +173,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private String totalFee;
+
+    /**
+     *  小程序端提交的房源的id的集合
+     */
+    @TableField(exist = false)
+    private List<Integer> houseList = new ArrayList<>();
 }

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

@@ -1,8 +1,14 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +19,15 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-02-26
  */
 @Mapper
+@Component
 public interface TaRaiseMapper extends BaseMapper<TaRaise> {
 
+    IPage<TaRaise> listRaiseByCondition(IPage<TaRaise> page,
+                                        @Param("salesBatchName") String salesBatchName,
+                                        @Param("buildingId") String buildingId,
+                                        @Param("orgId") Integer orgId,
+                                        @Param("status") Integer status,
+                                        @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    TaRaise getRaiseById(Integer id, Integer orgId);
 }

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

@@ -40,11 +40,4 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
      * @return
      */
     Map<String, Object> getTotalHousesAndHeat(@Param("salesBatchId") Integer salesBatchId);
-
-    IPage<TaSalesBatch> listSalesBatchForRaise(IPage<TaSalesBatch> page,
-                                               @Param("salesBatchName") String salesBatchName,
-                                               @Param("buildingId") String buildingId,
-                                               @Param("orgId") Integer orgId,
-                                               @Param("status") Integer status,
-                                               @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -55,4 +55,19 @@ public class TaHousingResourcesPO extends TaHousingResources {
      * 楼盘名称
      */
     private String buildingName;
+
+    /**
+     * 我的预选
+     */
+    private String minePreselection;
+
+    /**
+     * 我的认筹
+     */
+    private String mineRaise;
+
+    /**
+     * 我的锁定
+     */
+    private String mineLocked;
 }

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

@@ -51,4 +51,13 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
      * @return
      */
     ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO, Integer pageNumber, Integer pageSize);
+
+    /**
+     * 小程序端保存认筹单信息
+     * @param taRaiseRecord
+     * @param orgId
+     * @param personId
+     * @return
+     */
+    TaRaiseRecord saveRaiseInfo(TaRaiseRecord taRaiseRecord, Integer orgId, String personId) throws Exception;
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,6 +18,20 @@ import java.util.List;
  */
 public interface ITaRaiseService extends IService<TaRaise> {
 
+    /**
+     * 获取销售批次列表 - 认筹
+     *
+     * @param pageSize
+     * @param pageNum
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
+     * @return
+     */
+    ResponseBean listRaiseByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
+                                      Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
     /**
      * 批量删除
      *
@@ -25,4 +40,11 @@ public interface ITaRaiseService extends IService<TaRaise> {
      * @return
      */
     ResponseBean batchDelete(List<TaRaise> taRaiseList, Integer orgId);
+
+    /**
+     * @param id
+     * @param orgId
+     * @return
+     */
+    ResponseBean getRaiseById(Integer id, Integer orgId);
 }

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

@@ -36,18 +36,4 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
      * @return
      */
     ResponseBean getSalesBatchById(Integer salesBatchId);
-
-    /**
-     * 获取销售批次列表 - 认筹
-     *
-     * @param pageSize
-     * @param pageNum
-     * @param salesBatchName
-     * @param buildingId
-     * @param orgId
-     * @param status
-     * @return
-     */
-    ResponseBean listSalesBatchForRaise(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
-                                        Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -8,8 +8,9 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
-import com.huiju.estateagents.entity.TaRaiseRecord;
-import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
 import org.slf4j.Logger;
@@ -17,6 +18,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 认筹单(认筹记录表)  服务实现类
@@ -33,6 +37,21 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Autowired
     private TaRaiseRecordMapper taRaiseRecordMapper;
 
+    @Autowired
+    private TaRaiseMapper taRaiseMapper;
+
+    @Autowired
+    private TaHousingResourcesMapper taHousingResourcesMapper;
+
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private TaRaiseHouseMapper taRaiseHouseMapper;
+
     @Override
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
@@ -62,4 +81,92 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         responseBean.addSuccess(taRaiseRecordMapper.listRaiseOrderByCondition(pg, orderRequestBO));
         return responseBean;
     }
+
+    /**
+     * 小程序端保存认筹单信息
+     *
+     * @param taRaiseRecord
+     * @param orgId
+     * @param personId
+     * @return
+     */
+    @Override
+    public TaRaiseRecord saveRaiseInfo(TaRaiseRecord taRaiseRecord, Integer orgId, String personId) throws Exception {
+        List<Integer> houseList = taRaiseRecord.getHouseList();
+        if (houseList.size() < 1){
+            throw new Exception("请选择房源！");
+        }
+        //获取认筹信息
+        TaRaise taRaise = taRaiseMapper.selectById(taRaiseRecord.getRaiseId());
+        //如果是自动锁房就要判断里面的房源有没有被锁住
+        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
+            if (houseList.size() > 0){
+                throw new Exception("此认筹为自动锁房只能选择一个房源！");
+            }
+            //获取房源详细信息
+            TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseList.get(0));
+            if (null == taHousingResources){
+                throw new Exception("此房源不存在！");
+            }
+            if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+                throw new Exception("此房源已被锁定！");
+            }
+            //检验成功的话先锁定房源
+            lockedHouseResources(taHousingResources);
+        }
+        //插入认筹单
+        saveRaiseRecord(taRaiseRecord,orgId,personId,taRaise);
+
+        return taRaiseRecord;
+    }
+
+    /**
+     * 插入认筹单
+     * @param taRaiseRecord
+     */
+    private void saveRaiseRecord(TaRaiseRecord taRaiseRecord, Integer orgId, String personId,TaRaise taRaise) {
+        List<Integer> houseList = taRaiseRecord.getHouseList();
+        //销售批次信息
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taRaiseRecord.getSalesBatchId());
+        //获取用户信息
+
+        taRaiseRecord.setOrgId(orgId);
+        taRaiseRecord.setBuildingId(taSalesBatch.getBuildingId());
+        taRaiseRecord.setPersonId(personId);
+        taRaiseRecord.setHouseNum(houseList.size());
+        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
+            taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
+        }
+        taRaiseRecord.setStatus(CommConstant.STATUS_NORMAL);
+        taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_UNPAID);
+        taRaiseRecord.setPayType(taRaise.getPayType());
+        taRaiseRecord.setCreateDate(LocalDateTime.now());
+        //插入认筹单信息
+        taRaiseRecordMapper.insert(taRaiseRecord);
+        
+        //插入房源与认筹单关系表
+        TaPerson taPerson = taPersonMapper.selectById(personId);
+        houseList.forEach(e -> {
+            TaRaiseHouse taRaiseHouse = new TaRaiseHouse();
+            taRaiseHouse.setHouseId(e);
+            taRaiseHouse.setCreateDate(LocalDateTime.now());
+            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
+                taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
+            }
+            taRaiseHouse.setOrgId(orgId);
+            taRaiseHouse.setPersonId(personId);
+            taRaiseHouse.setPersonName(taPerson.getName());
+            taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
+            taRaiseHouseMapper.insert(taRaiseHouse);
+        });
+    }
+
+    /**
+     * 锁定房源
+     * @param taHousingResources
+     */
+    private synchronized void lockedHouseResources(TaHousingResources taHousingResources) {
+        taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
+        taHousingResourcesMapper.updateById(taHousingResources);
+    }
 }

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

@@ -2,10 +2,14 @@ package com.huiju.estateagents.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.mapper.TaRaiseMapper;
 import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
 import com.huiju.estateagents.service.ITaRaiseService;
@@ -34,6 +38,21 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
     @Autowired
     private TaRaiseRecordMapper taRaiseRecordMapper;
 
+    @Autowired
+    private TaRaiseMapper taRaiseMapper;
+
+    @Override
+    public ResponseBean listRaiseByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId, Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        logger.info("listSalesBatchForRaise 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
+                pageSize, pageNum, salesBatchName, buildingId, orgId, status, JSONObject.toJSONString(taPersonBuildingListByUserId));
+
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaRaise> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taRaiseMapper.listRaiseByCondition(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId));
+        return responseBean;
+    }
+
     @Override
     public ResponseBean batchDelete(List<TaRaise> taRaiseList, Integer orgId) {
         logger.info("TaRaiseServiceImpl.batchDelete 接收参数：list:{},orgId:{}", JSONObject.toJSONString(taRaiseList), orgId);
@@ -46,7 +65,6 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         }
 
         for (TaRaise tr : taRaiseList) {
-
             // 校验销售批次下是否有认筹记录
             QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
             taRaiseRecordQueryWrapper.eq("org_id", orgId);
@@ -71,4 +89,11 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         }
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getRaiseById(Integer id, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addSuccess(taRaiseMapper.getRaiseById(id, orgId));
+        return responseBean;
+    }
 }

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

@@ -195,19 +195,4 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         responseBean.addSuccess(result);
         return responseBean;
     }
-
-    @Override
-    public ResponseBean listSalesBatchForRaise(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
-                                               Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
-
-        logger.info("listSalesBatchForRaise 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
-                pageSize, pageNum, salesBatchName, buildingId, orgId, status,JSONObject.toJSONString(taPersonBuildingListByUserId));
-
-        ResponseBean responseBean = new ResponseBean();
-
-        IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taSalesBatchMapper.listSalesBatchForRaise(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId));
-        return responseBean;
-    }
-
 }

src/main/resources/mapper/TaPreselectionMapper.xml

@@ -6,6 +6,8 @@
         SELECT
         t.*,
         t2.sales_number,t2.sales_batch_name,t2.remark,
+        t2.sales_number,
+        t2.remark,
         t3.building_name,
         ( SELECT sum( th.real_heat ) FROM ta_housing_resources th WHERE th.sales_batch_id = t2.sales_batch_id AND th.`status` = 1 ) real_heat
         FROM
@@ -44,6 +46,9 @@
             t.*,
             t2.qr_code,
             t2.sales_batch_name
+            t2.remark,
+            t2.sales_batch_name,
+            t2.building_id
         FROM
             ta_preselection t,
             ta_sales_batch t2

src/main/resources/mapper/TaRaiseMapper.xml

@@ -2,4 +2,62 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaRaiseMapper">
 
+    <select id="listRaiseByCondition" resultType="com.huiju.estateagents.entity.TaRaise">
+        SELECT
+            t.*,
+            t2.sales_batch_name,
+            t2.remark,
+            t3.building_name,
+            ( SELECT sum( th.raise_real_heat ) FROM ta_housing_resources th WHERE th.sales_batch_id = t2.sales_batch_id AND th.`status` = 1 ) raise_real_heat
+        FROM
+            ta_raise t
+            LEFT JOIN ta_sales_batch t2 ON t.sales_batch_id = t2.sales_batch_id
+            LEFT JOIN ta_building t3 ON t2.building_id = t3.building_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.`status` != - 1
+        <if test="buildingId != null and buildingId != ''">
+            and t2.building_id = #{buildingId}
+        </if>
+        <if test="salesBatchName != null and salesBatchName != ''">
+            and t2.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
+        </if>
+        <if test="status != null">
+            and t.status = #{status}
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t2.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
+
+    <select id="getRaiseById" resultType="com.huiju.estateagents.entity.TaRaise">
+
+        SELECT
+          t3.*,
+	      t4.building_name
+        FROM
+            (
+        SELECT
+            t.*,
+            t2.sales_batch_name,
+            t2.remark,
+            t2.qr_code,
+            t2.building_id
+        FROM
+            ta_raise t,
+            ta_sales_batch t2
+        WHERE
+            t.sales_batch_id = t2.sales_batch_id
+            AND t.raise_id = #{id}
+            AND t.org_id = #{orgId}
+            ) t3
+            LEFT JOIN ta_building t4 ON t3.building_id = t4.building_id
+
+    </select>
+
 </mapper>

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -50,43 +50,4 @@
         WHERE
             t.STATUS = 1 and t.sales_batch_id = #{salesBatchId}
     </select>
-
-    <select id="listSalesBatchForRaise" resultType="com.huiju.estateagents.entity.TaSalesBatch">
-        SELECT
-            t.*,
-            a.building_name,
-            r.raise_id ,
-            r.`status` raiseStaus,
-            r.house_locking_type ,
-            r.raise_start_time ,
-            r.raise_end_time ,
-            r.raise_price ,
-            r.pay_type ,
-            (SELECT COUNT( * ) FROM ta_raise_record r2  where r2.raise_id = r.raise_id and r2.`status` != -1) raiseCount
-        FROM
-            ta_sales_batch t
-            LEFT JOIN ta_building a ON t.building_id = a.building_id
-            INNER JOIN ta_raise r ON t.sales_batch_id = r.sales_batch_id
-        WHERE
-            t.org_id = #{orgId}
-            AND t.STATUS != - 1
-            AND r.`status` != -1
-        <if test="buildingId != null and buildingId != ''">
-            and t.building_id = #{buildingId}
-        </if>
-        <if test="salesBatchName != null and salesBatchName != ''">
-            and t.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
-        </if>
-        <if test="status != null">
-            and t.status = #{status}
-        </if>
-        <if test="personBuildingList != null and personBuildingList.size > 0">
-            AND t.building_id in
-            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                #{personBuilding.buildingId}
-            </foreach>
-        </if>
-        ORDER BY
-            t.create_date DESC
-    </select>
 </mapper>