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

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.*;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@ 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;
 
@@ -47,6 +49,12 @@ public class TaHousingResourcesController extends BaseController {
     @Autowired
     private ITaRaiseHouseService taRaiseHouseService;
 
+    @Autowired
+    public ITaBuildingApartmentService taBuildingApartmentService;
+
+    @Autowired
+    public ITaBuildingImgService taBuildingImgService;
+
     /**
      * 分页查询列表
      *
@@ -222,7 +230,7 @@ public class TaHousingResourcesController extends BaseController {
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId, String source,
+                                             String startPrice, String endPrice, String apartmentId,@RequestParam(value = "source", required = false) String source,
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
@@ -267,11 +275,24 @@ public class TaHousingResourcesController extends BaseController {
                     //我的认筹
                     if (e.getHouseId().equals(r.getHouseId())) {
                         e.setMineRaise("mine");
-                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
+                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
                             e.setMineLocked("mine");
                         }
                     }
                 });
+
+                //塞入户型信息
+                if (!StringUtils.isEmpty(e.getApartmentId())) {
+                    TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
+                    e.setApartmentName(buildingApartment.getApartmentName());
+                    e.setInsideArea(buildingApartment.getInsideArea());
+                    e.setBuildingArea(buildingApartment.getBuildingArea());
+                    //塞入户型图信息
+                    List<String> apartMentIds = new ArrayList<>();
+                    apartMentIds.add(e.getApartmentId());
+                    List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
+                    e.setApartmentImgList(apartMentList);
+                }
             });
 
             responseBean.addSuccess(taHousingResourcesPOList);

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

@@ -220,7 +220,7 @@ public class TaPreselectionController extends BaseController {
                 return responseBean;
             }
 
-            if (StringUtils.isNotBlank(taPreselection.getPreselectionStartTime()) && StringUtils.isNotBlank(taPreselection.getPreselectionEndTime())) {
+            if (taPreselection.getPreselectionStartTime() != null && taPreselection.getPreselectionEndTime() != null) {
                 // 更新批次表信息
                 TaSalesBatch taSalesBatch = new TaSalesBatch();
                 taSalesBatch.setSalesBatchId(taPreselection.getSalesBatchId());

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

@@ -187,11 +187,17 @@ public class TaPreselectionRecordController extends BaseController {
     /**
      * 获取当前用户预选记录
      *
-     * @param pageNumber 页码
-     * @param pageSize   分页大小
-     * @param personId   用户ID
+     * @param buildingId
+     * @param salesBatchId
+     * @param apartmentId
+     * @param houseLockingStatus
+     * @param customerLocked
+     * @param pageNumber
+     * @param pageSize
+     * @param personId
+     * @param source             来源，raiseChoose 为认筹添加房源来源
+     * @param request
      * @return
-     * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
     public ResponseBean listPreselectionRecord(@RequestParam(value = "buildingId", required = false) String buildingId,
@@ -202,11 +208,13 @@ public class TaPreselectionRecordController extends BaseController {
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                @RequestParam("personId") String personId,
+                                               @RequestParam(value = "source", required = false) String source,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId, buildingId, salesBatchId, apartmentId, houseLockingStatus, customerLocked));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId, buildingId,
+                    salesBatchId, apartmentId, houseLockingStatus, customerLocked, source));
         } catch (Exception e) {
             logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -71,7 +71,7 @@ public class TaRaiseHouseController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/taRaiseHouse", method = RequestMethod.POST)
-    public ResponseBean taRaiseHouseAdd(@RequestBody TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
+    public ResponseBean taRaiseHouseAdd(TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
 

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

@@ -559,7 +559,7 @@ public class TaRaiseRecordController extends BaseController {
             houseList.forEach(e -> {
                 taRaiseHouseList.forEach(r -> {
                     //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
+                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
                         e.setMineLocked("mine");
                     }
                 });

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

@@ -3,6 +3,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 com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -44,12 +45,14 @@ public class TaPreselection implements Serializable {
     /**
      * 预选开始时间
      */
-    private String preselectionStartTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime preselectionStartTime;
 
     /**
      * 预选结束时间
      */
-    private String preselectionEndTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime preselectionEndTime;
 
     /**
      * 状态

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

@@ -49,21 +49,4 @@ public class TaRaiseHouse implements Serializable {
      * 创建时间
      */
     private LocalDateTime createDate;
-
-    /**
-     * 锁定状态 locked已锁定unlocked未锁定
-     */
-    private String houseLockingStatus;
-
-    /**
-     * 锁定人id
-     */
-    private String personId;
-
-    /**
-     * 锁定人姓名
-     */
-    private String personName;
-
-
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import net.sf.cglib.core.Local;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -60,12 +61,12 @@ public class TaSalesBatch implements Serializable {
     /**
      * 预选开始时间
      */
-    private String preselectionStartTime;
+    private LocalDateTime preselectionStartTime;
 
     /**
      * 预选结束时间
      */
-    private String preselectionEndTime;
+    private LocalDateTime preselectionEndTime;
 
     /**
      * 发布状态

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

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

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

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

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShare;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,5 +34,5 @@ public interface ITaShareService extends IService<TaShare> {
      * @param top
      * @return
      */
-    Map<String, Object> statTopShare(String targetType, String targetId, Integer top);
+    List<Map<String, Object>> statTopShare(String targetType, String targetId, Integer top);
 }

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

@@ -682,7 +682,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("locked");
-                housingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
+                housingResources.setHouseLockingPerson(personId);
                 housingResources.setUpdateDate(LocalDateTime.now());
                 housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
                 updateById(housingResources);
@@ -694,10 +694,11 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 taRaiseRecordMapper.updateById(taRaiseRecord);
 
                 // 更新关联表状态
-                TaRaiseHouse raiseHouse = new TaRaiseHouse();
-                raiseHouse.setRaiseHouseId(raiseHouseId);
-                raiseHouse.setHouseLockingStatus("locked");
-                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
+//                TaRaiseHouse raiseHouse = new TaRaiseHouse();
+//                raiseHouse.setRaiseHouseId(raiseHouseId);
+//                raiseHouse.setHouseLockingStatus("locked");
+//            taRaiseHouseService.updateById(raiseHouse);
+                responseBean.addSuccess(taRaiseRecordMapper.updateById(taRaiseRecord));
                 return responseBean;
         }
 
@@ -723,12 +724,12 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 taRaiseRecordMapper.updateById(taRaiseRecord);
 
                 // 更新关联表状态
-                TaRaiseHouse raiseHouse = new TaRaiseHouse();
-                raiseHouse.setRaiseHouseId(raiseHouseId);
-                raiseHouse.setHouseLockingStatus("unlocked");
-                raiseHouse.setPersonId("");
-                raiseHouse.setPersonName("");
-                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
+//                TaRaiseHouse raiseHouse = new TaRaiseHouse();
+//                raiseHouse.setRaiseHouseId(raiseHouseId);
+////                raiseHouse.setHouseLockingStatus("unlocked");
+////                raiseHouse.setPersonId("");
+////                raiseHouse.setPersonName("");
+//                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
         }
         responseBean.addError("fail");
@@ -753,8 +754,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         taRaiseQueryWrapper.eq("org_id",orgId);
         taRaiseQueryWrapper.eq("sales_batch_id",taHousingResources.getSalesBatchId());
         taRaiseQueryWrapper.eq("building_id",taHousingResources.getBuildingId());
+        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
-        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL) {
+        if (null == taRaise) {
             throw new Exception("认筹单已经作废");
         }
         //校验房源是否同一批次
@@ -771,26 +773,27 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 preselectionRecordQueryWrapper.eq("org_id", orgId);
                 preselectionRecordQueryWrapper.eq("house_id", houseId);
                 preselectionRecordQueryWrapper.eq("person_id", personId);
+                preselectionRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
                 TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.selectOne(preselectionRecordQueryWrapper);
                 if (null == taPreselectionRecord) {
                     throw new Exception("需要先预选才能认筹");
                 }
             }
             //查询我的认筹记录表
-            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-            taRaiseHouseQueryWrapper.eq("org_id", orgId);
-            taRaiseHouseQueryWrapper.eq("house_id", houseId);
-            taRaiseHouseQueryWrapper.eq("person_id", personId);
-            List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
-            if (list.size() > 0) {
-                throw new Exception("您已有认筹单包含当前房源");
-            }
+//            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+//            taRaiseHouseQueryWrapper.eq("org_id", orgId);
+//            taRaiseHouseQueryWrapper.eq("house_id", houseId);
+//            taRaiseHouseQueryWrapper.eq("person_id", personId);
+//            List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+//            if (list.size() > 0) {
+//                throw new Exception("您已有认筹单包含当前房源");
+//            }
 
         }
         if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {
             throw new Exception("房源已被取消发布");
         }
-        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
+        if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
             throw new Exception("房源已被其他客户锁定");
         }
         //销售批次信息

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

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

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

@@ -233,13 +233,6 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
             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.setPersonId(personId);
-                taRaiseHouse.setPersonName(taPerson.getName());
-            } else {
-                taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-            }
             taRaiseHouse.setOrgId(orgId);
             taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
             taRaiseHouseMapper.insert(taRaiseHouse);

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

@@ -216,7 +216,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public Map<String, Object> statTopShare(String targetType, String targetId, Integer top) {
+    public List<Map<String, Object>> statTopShare(String targetType, String targetId, Integer top) {
         return taShareMapper.statTopShare(targetType, targetId, top);
     }
 

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

@@ -269,13 +269,13 @@ public class WxPayServiceImpl implements IWxPayService {
     }
 
     private synchronized void autoUnLockingHouse(TaRaiseRecord taRaiseRecord, TaRaiseHouse taRaiseHouse, TaHousingResources taHousingResources) {
-        log.info("正在为客户personId为{}选中的房源id为{}自动解锁",taRaiseHouse.getPersonId(),taRaiseHouse.getHouseId());
+        log.info("正在为客户personId为{}选中的房源id为{}自动解锁",taRaiseRecord.getPersonId(),taRaiseHouse.getHouseId());
         //更改此房源为解锁状态
         taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
         taHousingResourcesMapper.updateById(taHousingResources);
         //更改此认筹旦和房源关系为解锁状态
-        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-        taRaiseHouseMapper.updateById(taRaiseHouse);
+//        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+//        taRaiseHouseMapper.updateById(taRaiseHouse);
         //更改认筹单为解锁状态
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
         taRaiseRecordMapper.updateById(taRaiseRecord);
@@ -408,8 +408,8 @@ public class WxPayServiceImpl implements IWxPayService {
         }
         //判断此房源有没有被锁定
         TaHousingResources taHousingResources = getHousingResourcesById(taRaiseHouseList.get(0).getHouseId());
-        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
-            throw new Exception("改房源已被锁定暂时无法认筹。");
+        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus()) && !taOrder.getPersonId().equals(taHousingResources.getHouseLockingPerson())){
+            throw new Exception("该房源已被锁定暂时无法认筹。");
         }
         //锁定此房源并且更改认筹单的锁定状态
         changeLockingStatus(taRaiseRecord,taRaiseHouseList.get(0),taHousingResources);
@@ -422,14 +422,14 @@ public class WxPayServiceImpl implements IWxPayService {
      * @param taHousingResources
      */
     private synchronized void changeLockingStatus(TaRaiseRecord taRaiseRecord, TaRaiseHouse taRaiseHouse, TaHousingResources taHousingResources) {
-        log.info("正在为客户personId为{}选中的房源id为{}自动锁房",taRaiseHouse.getPersonId(),taRaiseHouse.getHouseId());
+        log.info("正在为客户personId为{}选中的房源id为{}自动锁房",taRaiseRecord.getPersonId(),taRaiseHouse.getHouseId());
         //更改此房源为锁定状态
         taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
-        taHousingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
+        taHousingResources.setHouseLockingPerson(taRaiseRecord.getPersonId());
         taHousingResourcesMapper.updateById(taHousingResources);
         //更改此认筹旦和房源关系为锁定状态
-        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
-        taRaiseHouseMapper.updateById(taRaiseHouse);
+//        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
+//        taRaiseHouseMapper.updateById(taRaiseHouse);
         //更改认筹单为锁定状态
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
         taRaiseRecordMapper.updateById(taRaiseRecord);

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -227,7 +228,7 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
     ) {
         // 暂时没有任何校验
 
-        Map<String, Object> res = taShareService.statTopShare("h5_share", h5Id, top);
+        List<Map<String, Object>> res = taShareService.statTopShare("h5_share", h5Id, top);
         return ResponseBean.success(res);
     }
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -47,7 +47,7 @@
         <if test = "source == 'raiseChoose'">
             AND ( t6.`status` != 0 OR t6.`status` IS NULL )
             AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
-            AND t7.raise_start_time &lt;= now( ) AND t7.raise_end_time &gt;= now()
+            AND t7.raise_start_time &lt;= now() AND t7.raise_end_time &gt;= now()
             <if test="personId != null and personId != ''">
                 AND (t6.person_id != #{personId} OR t6.person_id IS NULL)
             </if>
@@ -342,11 +342,12 @@
         SELECT
             t.*,
             t2.raise_house_id,
-            t2.person_id lockingPersonId,
-            t2.person_name lockingPersonName
+            t3.person_id lockingPersonId,
+            t3.name lockingPersonName
         FROM
             ta_housing_resources t
             LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id
+            left join ta_person t3 on t.house_locking_person = t3.person_id
         WHERE
             t.org_id = #{orgId}
             AND t.`status` != - 1
@@ -358,11 +359,12 @@
     <select id="getHouseByRaiseHouseId" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
             t.*,
-            t2.person_id lockingPersonId,
-            t2.person_name lockingPersonName
+            t3.person_id lockingPersonId,
+            t3.name lockingPersonName
         FROM
             ta_housing_resources t
             LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id
+            left join ta_person t3 on t.house_locking_person = t3.person_id
         WHERE
             t2.raise_house_id = #{raiseHouseId}
             AND t2.org_id = #{orgId}

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -20,9 +20,17 @@
             ta_preselection_record t
         LEFT JOIN ta_housing_resources t2 ON t.house_id = t2.house_id
         LEFT JOIN ta_sales_batch t3 ON t.sales_batch_id = t3.sales_batch_id
+        <if test = "source == 'raiseChoose'">
+            LEFT JOIN ta_raise t4 ON t3.sales_batch_id = t4.sales_batch_id
+        </if>
         WHERE
             t.person_id = #{personId}
             AND t.org_id = #{orgId}
+        <if test="source == 'raiseChoose'">
+            AND t2.`status` = 1
+            AND t3.`status` = 1
+            AND t4.raise_start_time &lt;= now( ) AND t4.raise_end_time &gt;= now( )
+        </if>
         <if test="customerLocked == 'mine'">
             AND t2.house_locking_person = #{personId}
         </if>

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -138,12 +138,13 @@
             t2.pay_time,
             t2.trade_no,
             t2.transaction_id,
-            t2.refund_no,
+            t4.refund_no,
             t2.total_fee
         FROM
             ta_raise_record t
             INNER JOIN ta_order t2 ON t.order_id = t2.order_id
             LEFT JOIN ta_person t3 ON t2.person_id = t3.person_id
+            left join ta_order t4 on t2.order_id = t4.parent_order_id
         WHERE
             t.org_id = #{bo.orgId}
             AND t.`status` != - 1