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

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

@@ -194,14 +194,20 @@ public class TaPreselectionRecordController extends BaseController {
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
-    public ResponseBean listPreselectionRecord(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
-                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               @RequestParam("personId") String personId,
-                                               HttpServletRequest request) {
+    public ResponseBean listPreselectionRecord(
+                                                @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                                @RequestParam(value = "apartmentId", required = false) String apartmentId,
+                                                @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
+                                                @RequestParam(value = "customerLocked", required = false) String customerLocked,
+                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam("personId") String personId,
+                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId,buildingId,salesBtchId,apartmentId,houseLockingStatus,customerLocked));
         } catch (Exception e) {
             logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -16,6 +16,7 @@ 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 jodd.util.StringUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -505,7 +506,10 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
-    public ResponseBean wxGetRaiseRecordList( @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxGetRaiseRecordList( @RequestParam(value = "buildingId", required = false) String buildingId,
+                                              @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                              @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
+                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -514,6 +518,9 @@ public class TaRaiseRecordController extends BaseController {
             QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
             taRaiseRecordQueryWrapper.eq("org_id",getOrgId(request));
             taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
+            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId),"building_id",buildingId);
+            taRaiseRecordQueryWrapper.eq(null != salesBtchId,"sales_batch_id",salesBtchId);
+            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus),"house_locking_status",houseLockingStatus);
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
             List<TaRaiseRecord> list = page.getRecords();
             list.forEach(e -> {

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

@@ -6,6 +6,7 @@ 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.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.service.impl.TaPreselectionServiceImpl;
@@ -331,4 +332,26 @@ public class TaSalesBatchController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 查询销售批次列表--小程序
+     *
+     */
+    @RequestMapping(value = "/wx/taSalesBatch/choice", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchGetForMiniApp(@RequestParam(value = "buildingId", required = false) String buildingId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
+            taSalesBatchQueryWrapper.eq("org_id",getOrgId(request));
+            taSalesBatchQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
+            taSalesBatchQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            List<TaSalesBatch> list = iTaSalesBatchService.list(taSalesBatchQueryWrapper);
+            responseBean.addSuccess(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taSalesBatchGetForMiniApp -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }

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

@@ -33,7 +33,8 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      */
     IPage<TaPreselectionRecordPO> listPreselectionRecord(IPage<TaPreselectionRecordPO> iPage,
                                                          @Param("orgId") Integer orgId,
-                                                         @Param("personId") String personId);
+                                                         @Param("personId") String personId,@Param("buildingId") String buildingId,@Param("salesBtchId") Integer salesBtchId,
+                                                         @Param("apartmentId") String apartmentId,@Param("houseLockingStatus") String houseLockingStatus,@Param("customerLocked") String customerLocked);
 
     /**
      * 根据房源ID和用户ID获取预选记录

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

@@ -92,4 +92,16 @@ public class TaHousingResourcesPO extends TaHousingResources {
      */
     @TableField(exist = false)
     private String raiseHouseId;
+
+    /**
+     * 是否展示预选按钮
+     */
+    @TableField(exist = false)
+    private Boolean preselectionBtn;
+
+    /**
+     * 是否展示认筹按钮
+     */
+    @TableField(exist = false)
+    private Boolean raiseBtn;
 }

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

@@ -28,7 +28,7 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      * @param personId
      * @return
      */
-    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId);
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId,String buildingId,Integer salesBtchId,String apartmentId,String houseLockingStatus,String customerLocked);
 
     /**
      * 添加预选记录预选

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

@@ -93,6 +93,11 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     private TaRaiseHouseServiceImpl taRaiseHouseService;
 
+    @Autowired
+    private TaPreselectionMapper taPreselectionMapper;
+
+    @Autowired
+    private TaRaiseMapper taRaiseMapper;
 
     /**
      * 分页获取房源列表
@@ -228,6 +233,31 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         }
 
         resourcesPO.setBuildingImgList(buildingImgPOList);
+
+        //是否展示预选按钮
+        Integer salesBatchId = resourcesPO.getSalesBatchId();
+        Integer orgId = resourcesPO.getOrgId();
+        resourcesPO.setPreselectionBtn(true);
+        resourcesPO.setRaiseBtn(true);
+        QueryWrapper<TaPreselection> taPreselectionQueryWrapper = new QueryWrapper<>();
+        taPreselectionQueryWrapper.eq("sales_batch_id",salesBatchId);
+        taPreselectionQueryWrapper.eq("org_id",orgId);
+        taPreselectionQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        TaPreselection taPreselection = taPreselectionMapper.selectOne(taPreselectionQueryWrapper);
+        if (null == taPreselection){
+            resourcesPO.setPreselectionBtn(false);
+        }
+
+        //是否展示认筹按钮
+        QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+        taRaiseQueryWrapper.eq("sales_batch_id",salesBatchId);
+        taRaiseQueryWrapper.eq("org_id",orgId);
+        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
+        if (null == taRaise){
+            resourcesPO.setRaiseBtn(false);
+        }
+
         return resourcesPO;
     }
 

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

@@ -66,11 +66,11 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     private TaPersonServiceImpl taPersonService;
 
     @Override
-    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId) {
+    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId,String buildingId,Integer salesBtchId,String apartmentId,String houseLockingStatus,String customerLocked) {
         logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，orgId：{}，personId：{}", pageNum, pageSize, orgId, personId);
 
         IPage<TaPreselectionRecordPO> iPage = new Page<>(pageNum, pageSize);
-        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId);
+        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId,buildingId,salesBtchId,apartmentId,houseLockingStatus,customerLocked);
 
         List<TaPreselectionRecordPO> poList = iPage.getRecords();
         if (CollectionUtils.isEmpty(poList)) {

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

@@ -138,6 +138,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         taRaiseRecord.setBuildingId(taSalesBatch.getBuildingId());
         taRaiseRecord.setPersonId(personId);
         taRaiseRecord.setHouseNum(houseList.size());
+        taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
         if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
             taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
         }

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -33,9 +33,32 @@
             t.person_id = #{personId}
             AND t.org_id = #{orgId}
             AND t.house_id = t2.house_id
+            <if test="buildingId != null and buildingId != ''">
+                AND t.building_id = #{buildingId}
+            </if>
+            <if test="salesBtchId != null and salesBtchId != ''">
+                AND t2.sales_batch_id = #{salesBtchId}
+            </if>
+            <if test="apartmentId != null and apartmentId != ''">
+                AND t2.apartment_id = #{apartmentId}
+            </if>
+            <if test="houseLockingStatus == 'locked'">
+                AND t2.house_locking_status = 'locked'
+            </if>
+            <if test="houseLockingStatus == 'unlocked'">
+                AND t2.house_locking_status != 'locked'
+            </if>
             ) t3
             LEFT JOIN ta_building t4 ON t3.buildingId = t4.building_id
             LEFT JOIN ta_sales_batch t5 ON t3.saleBatchId = t5.sales_batch_id
+            left join ta_raise_house t6 on t3.house_id = t6.house_id
+        where 1=1
+            <if test="customerLocked == 'mine'">
+                AND t6.person_id = #{personId}
+            </if>
+            <if test="customerLocked == 'other'">
+                AND t6.person_id != #{personId}
+            </if>
          ORDER BY
             t3.create_date DESC
     </select>

src/test/java/com/huiju/estateagents/WxPayTest.java

@@ -11,8 +11,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class WxPayTest {
 
-//    @Test
-//    public void getLocationCity() {
+    @Test
+    public void getLocationCity() {
 //        System.out.println(System.currentTimeMillis());
-//    }
+    }
 }