bug

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;
+
     /**
      * 分页查询列表
      *
@@ -272,6 +280,19 @@ public class TaHousingResourcesController extends BaseController {
                         }
                     }
                 });
+
+                //塞入户型信息
+                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/service/impl/WxPayServiceImpl.java

@@ -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);