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

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

@@ -4,13 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaBuildingRoom;
-import com.huiju.estateagents.entity.TaHousingResources;
-import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
-import com.huiju.estateagents.service.ITaBuildingRoomService;
-import com.huiju.estateagents.service.ITaHousingResourcesService;
-import com.huiju.estateagents.service.ITaPreselectionRecordService;
+import com.huiju.estateagents.service.*;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +15,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -44,6 +42,12 @@ public class TaHousingResourcesController extends BaseController {
     @Autowired
     private ITaPreselectionRecordService taPreselectionRecordService;
 
+    @Autowired
+    private ITaRaiseRecordService taRaiseRecordService;
+
+    @Autowired
+    private ITaRaiseHouseService taRaiseHouseService;
+
     /**
      * 分页查询列表
      *
@@ -225,7 +229,34 @@ public class TaHousingResourcesController extends BaseController {
                 orgId, salesBatchId, startPrice, endPrice, apartmentId);
 
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1));
+            //获取所有楼房的预选热度和认筹热度
+            List<TaHousingResourcesPO> taHousingResourcesPOList = iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1);
+            //此处处理我的预选，我的认筹，和我的锁定
+            //我的预选记录
+            QueryWrapper<TaPreselectionRecord> taPreselectionRecordQueryWrapper = new QueryWrapper<>();
+            taPreselectionRecordQueryWrapper.eq("org_id",orgId);
+            taPreselectionRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
+            taPreselectionRecordQueryWrapper.eq("person_id",getPersonId(request));
+            taPreselectionRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            List<TaPreselectionRecord> taPreselectionRecordList = taPreselectionRecordService.list(taPreselectionRecordQueryWrapper);
+            //我的认筹记录
+            QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
+            taRaiseRecordQueryWrapper.eq("org_id",orgId);
+            taRaiseRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
+            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);
+            }
+
+            responseBean.addSuccess(taHousingResourcesPOList);
         } catch (Exception e) {
             logger.error("listHousingResources -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -6,6 +6,7 @@ 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.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPreselection;
 import com.huiju.estateagents.entity.TaSalesBatch;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -29,7 +31,7 @@ import java.util.List;
  * @since 2020-02-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaPreselectionController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaPreselectionController.class);
@@ -136,6 +138,9 @@ public class TaPreselectionController extends BaseController {
             }
 
             // 新增数据
+            taPreselection.setOrgId(getOrgId(request));
+            taPreselection.setStatus(CommConstant.IS_PUBLISH);
+            taPreselection.setCreateDate(LocalDateTime.now());
             if (iTaPreselectionService.save(taPreselection)) {
                 responseBean.addSuccess(taPreselection);
             } else {

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

@@ -308,4 +308,27 @@ public class TaSalesBatchController extends BaseController {
         }
         return responseBean;
     }
+
+    @RequestMapping(value = "/admin/salesBatchList", method = RequestMethod.GET)
+    public ResponseBean salesBatchList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "salesBatchName", required = false) String salesBatchName,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
+
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request), getTaPersonBuildingListByUserId(request));
+            List<TaSalesBatch> taSalesBatches = result.getRecords();
+            responseBean.addSuccess(taSalesBatches);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taSalesBatchList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }

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

@@ -167,15 +167,4 @@ public class TaHousingResources implements Serializable {
 
     @TableField(exist = false)
     private List<TaHousingResources> houseIdList;
-
-
-    /**
-     * 认筹基础热度
-     */
-    private Integer raiseHeat;
-
-    /**
-     * 认筹实际热度
-     */
-    private Integer raiseRealHeat;
 }

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

@@ -83,6 +83,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     private TaBuildingPanoramaMapper taBuildingPanoramaMapper;
 
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
 
     /**
      * 分页获取房源列表
@@ -538,6 +541,10 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             e.setBuildingId(buildingId);
             addHouseResources(e);
         });
+        TaSalesBatch taSalesBatch = new TaSalesBatch();
+        taSalesBatch.setSalesNumber(list.size());
+        taSalesBatch.setSalesBatchId(salesBatchId);
+        taSalesBatchMapper.updateById(taSalesBatch);
         return ResponseBean.success(list);
     }