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

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaRaiseHouse;
 import com.huiju.estateagents.service.ITaRaiseHouseService;
+import com.huiju.estateagents.service.ITaRaiseRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,9 @@ public class TaRaiseHouseController extends BaseController {
     @Autowired
     public ITaRaiseHouseService iTaRaiseHouseService;
 
+    @Autowired
+    private ITaRaiseRecordService iTaRaiseRecordService;
+
 
     /**
      * 分页查询列表
@@ -70,9 +74,20 @@ public class TaRaiseHouseController extends BaseController {
     public ResponseBean taRaiseHouseAdd(TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            taRaiseHouse.setOrgId(getOrgId(request));
-            taRaiseHouse.setCreateDate(LocalDateTime.now());
 
+            // 校验参数
+            if (taRaiseHouse.getRaiseRecordId() != null) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+
+            // 认筹表房源数+1
+            iTaRaiseRecordService.addHouseNum(taRaiseHouse.getRaiseRecordId(), orgId);
+
+            taRaiseHouse.setOrgId(orgId);
+            taRaiseHouse.setCreateDate(LocalDateTime.now());
             if (iTaRaiseHouseService.save(taRaiseHouse)) {
                 responseBean.addSuccess(taRaiseHouse);
             } else {

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

@@ -58,6 +58,11 @@ public class TaRaiseRecord implements Serializable {
      */
     private String personId;
 
+    /**
+     * 认筹人姓名
+     */
+    private String personName;
+
     /**
      * 房源数
      */

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

@@ -33,7 +33,7 @@ public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
      * @return
      */
     IPage<TaRaiseRecord> listHousingRaiseByCondition(IPage<TaRaiseRecord> page,
-                                                            @Param("bo") HousingRaiseRequestBO bo);
+                                                     @Param("bo") HousingRaiseRequestBO bo);
 
     /**
      * 条件查询认筹单
@@ -53,7 +53,7 @@ public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
      * @return
      */
     IPage<TaRaiseRecord> listRaiseOrderByCondition(IPage<TaRaiseRecord> page,
-                                              @Param("bo") RaiseOrderRequestBO bo);
+                                                   @Param("bo") RaiseOrderRequestBO bo);
 
     /**
      * 批量更新
@@ -68,4 +68,14 @@ public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
                             @Param("payType") String payType);
 
     TaRaiseRecord getUserInfo(@Param("raiseRecordId") Integer raiseRecordId, @Param("orgId") Integer orgId);
+
+    /**
+     * 认筹单房源数+1
+     *
+     * @param raiseRecordId
+     * @param orgId
+     * @return
+     */
+    Boolean addHouseNum(@Param("raiseRecordId") Integer raiseRecordId,
+                        @Param("orgId") Integer orgId);
 }

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

@@ -55,6 +55,7 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
 
     /**
      * 小程序端保存认筹单信息
+     *
      * @param taRaiseRecord
      * @param orgId
      * @param personId
@@ -64,9 +65,19 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
 
     /**
      * 获取用户信息
+     *
      * @param orgId
      * @param raiseRecordId
      * @return
      */
     TaRaiseRecord getUserInfo(Integer orgId, Integer raiseRecordId);
+
+    /**
+     * 认筹单房源数+1
+     *
+     * @param raiseRecordId
+     * @param orgId
+     * @return
+     */
+    Boolean addHouseNum(Integer raiseRecordId, Integer orgId);
 }

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

@@ -92,29 +92,29 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Override
     public TaRaiseRecord saveRaiseInfo(TaRaiseRecord taRaiseRecord, Integer orgId, String personId) throws Exception {
         List<Integer> houseList = taRaiseRecord.getHouseList();
-        if (houseList.size() < 1){
+        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){
+        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){
+            if (null == taHousingResources) {
                 throw new Exception("此房源不存在！");
             }
-            if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+            if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)) {
                 throw new Exception("此房源已被锁定！");
             }
             //检验成功的话先锁定房源
             lockedHouseResources(taHousingResources);
         }
         //插入认筹单
-        saveRaiseRecord(taRaiseRecord,orgId,personId,taRaise);
+        saveRaiseRecord(taRaiseRecord, orgId, personId, taRaise);
 
         return taRaiseRecord;
     }
@@ -124,11 +124,17 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         return taRaiseRecordMapper.getUserInfo(raiseRecordId, orgId);
     }
 
+    @Override
+    public Boolean addHouseNum(Integer raiseRecordId, Integer orgId) {
+        return taRaiseRecordMapper.addHouseNum(raiseRecordId, orgId);
+    }
+
     /**
      * 插入认筹单
+     *
      * @param taRaiseRecord
      */
-    private void saveRaiseRecord(TaRaiseRecord taRaiseRecord, Integer orgId, String personId,TaRaise taRaise) {
+    private void saveRaiseRecord(TaRaiseRecord taRaiseRecord, Integer orgId, String personId, TaRaise taRaise) {
         List<Integer> houseList = taRaiseRecord.getHouseList();
         //销售批次信息
         TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taRaiseRecord.getSalesBatchId());
@@ -139,7 +145,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         taRaiseRecord.setPersonId(personId);
         taRaiseRecord.setHouseNum(houseList.size());
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
+        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
             taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
         }
         taRaiseRecord.setStatus(CommConstant.STATUS_NORMAL);
@@ -148,14 +154,14 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         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)){
+            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
                 taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
             }
             taRaiseHouse.setOrgId(orgId);
@@ -168,6 +174,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
 
     /**
      * 锁定房源
+     *
      * @param taHousingResources
      */
     private synchronized void lockedHouseResources(TaHousingResources taHousingResources) {

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

@@ -86,7 +86,7 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         });
 
         if (updateBatchById(taRaiseList)) {
-            responseBean.addError("success");
+            responseBean.addSuccess("操作成功");
         } else {
             responseBean.addError("fail");
         }

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -184,4 +184,14 @@
         where
         t.raise_record_id = #{raiseRecordId} and t.org_id = #{orgId}
     </select>
+
+    <update id="addHouseNum">
+        UPDATE ta_raise_record t
+         SET t.house_num = IFNULL ( t.house_num, 0 ) + 1
+        WHERE
+            t.raise_record_id = #{raiseRecordId}
+            AND t.org_id = #{orgId}
+            AND t.`status` != -1
+    </update>
+
 </mapper>