Merge remote-tracking branch 'origin/dev' into dev

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/TaPreselectionController.java

@@ -233,6 +233,7 @@ public class TaPreselectionController extends BaseController {
                 }
             }
 
+            taPreselection.setPreselectionId(id);
             if (iTaPreselectionService.updateById(taPreselection)) {
                 responseBean.addSuccess(taPreselection);
             } else {

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

@@ -8,7 +8,13 @@ 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.common.CommConstant;
+import com.huiju.estateagents.entity.TaHousingResources;
+import com.huiju.estateagents.entity.TaOrder;
+import com.huiju.estateagents.entity.TaRaiseHouse;
 import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.service.ITaHousingResourcesService;
+import com.huiju.estateagents.service.ITaOrderService;
+import com.huiju.estateagents.service.ITaRaiseHouseService;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -19,7 +25,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,6 +47,15 @@ public class TaRaiseRecordController extends BaseController {
     @Autowired
     public ITaRaiseRecordService iTaRaiseRecordService;
 
+    @Autowired
+    public ITaRaiseHouseService taRaiseHouseService;
+
+    @Autowired
+    public ITaHousingResourcesService taHousingResourcesService;
+
+    @Autowired
+    public ITaOrderService taOrderService;
+
     /**
      * 条件查询房源认筹记录
      *
@@ -411,4 +429,56 @@ 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) {
+            logger.error("微信端下认筹单 -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 微信端获取认筹单详细信息
+     *
+     * @param raiseRecordId 认筹旦id
+     * @return
+     */
+    @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.POST)
+    public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //获取认筹单信息
+            TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
+            //房源与认筹单关系图
+            List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
+            //房源信息
+            List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
+            //订单信息
+            TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
+
+            Map<String,Object> map = new HashMap<>();
+            map.put("taRaiseRecord",taRaiseRecord);
+            map.put("taRaiseHouseList",taRaiseHouseList);
+            map.put("houseList",houseList);
+            map.put("taOrder",taOrder);
+            responseBean.addSuccess(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("微信端获取认筹单详细信息 -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -56,6 +56,11 @@ public class TaPreselection implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 项目id
+     */
+    private String buildingId;
+
     /**
      * 创建时间
      */
@@ -79,6 +84,12 @@ public class TaPreselection implements Serializable {
     @TableField(exist = false)
     private String salesBatchName;
 
+    /**
+     * 备注
+     */
+    @TableField(exist = false)
+    private String remark;
+
     /**
      * 二维码
      */
@@ -92,8 +103,8 @@ public class TaPreselection implements Serializable {
     private Integer realHeat;
 
     /**
-     * 销售批次备注
+     * 预选实际热度
      */
     @TableField(exist = false)
-    private Integer remark;
+    private Integer preNum;
 }

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

@@ -76,7 +76,7 @@ public class TaPreselectionRecord implements Serializable {
     private String buildingId;
 
     /**
-     * 预选id
+     * 预选idtaSalesBatch
      */
-    private String preselectId;
+    private String preselectionId;
 }

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/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/impl/TaPreselectionServiceImpl.java

@@ -47,7 +47,13 @@ public class TaPreselectionServiceImpl extends ServiceImpl<TaPreselectionMapper,
 
         ResponseBean responseBean = new ResponseBean();
         IPage<TaPreselection> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taPreselectionMapper.listPresecretByCondition(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId));
+        IPage<TaPreselection>  taPreselectionIPage = taPreselectionMapper.listPresecretByCondition(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId);
+        taPreselectionIPage.getRecords().forEach(e->{
+            QueryWrapper<TaPreselectionRecord> taPreselectionRecordQueryWrapper = new QueryWrapper<>();
+            taPreselectionRecordQueryWrapper.eq("sales_batch_id", e.getSalesBatchId());
+            e.setPreNum(taPreselectionRecordMapper.selectCount(taPreselectionRecordQueryWrapper));
+        });
+        responseBean.addSuccess(taPreselectionIPage);
         return responseBean;
     }
 
@@ -65,7 +71,7 @@ public class TaPreselectionServiceImpl extends ServiceImpl<TaPreselectionMapper,
             preselectionRecordQueryWrapper.eq("status", 1);
             List<TaPreselectionRecord> tpList = taPreselectionRecordMapper.selectList(preselectionRecordQueryWrapper);
             if (CollectionUtils.isNotEmpty(tpList)) {
-                responseBean.addError(String.format("销售批次%s已有用户预选，请先删除预选记录。", tp.getSalesBatchId()));
+                responseBean.addError(String.format("销售批次%s已有用户预选，请先删除预选记录。", tp.getSalesBatchName()));
                 return responseBean;
             }
         }

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/resources/mapper/TaPreselectionMapper.xml

@@ -5,6 +5,7 @@
     <select id="listPresecretByCondition" resultType="com.huiju.estateagents.entity.TaPreselection">
         SELECT
         t.*,
+        t2.sales_number,t2.sales_batch_name,t2.remark,
         t2.sales_number,
         t2.remark,
         t3.building_name,
@@ -12,7 +13,7 @@
         FROM
         ta_preselection 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
+        LEFT JOIN ta_building t3 ON t.building_id = t3.building_id
         WHERE
         t.org_id = #{orgId}
         AND t.STATUS != - 1
@@ -45,8 +46,7 @@
             t.*,
             t2.qr_code,
             t2.remark,
-            t2.sales_batch_name,
-            t2.building_id
+            t2.sales_batch_name
         FROM
             ta_preselection t,
             ta_sales_batch t2