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

src/main/java/com/shigongli/controller/TaHouseSurroundController.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaPerson;
+import com.shigongli.entity.TaShopKeeper;
+import com.shigongli.service.ITaHouseService;
+import com.shigongli.service.ITaShopKeeperService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.shigongli.entity.TaHouseSurround;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
     @Autowired
     public ITaHouseSurroundService iTaHouseSurroundService;
 
+    @Autowired
+    ITaHouseService iTaHouseService;
+
 
     /**
      * 分页查询房源周边, 不传房源则代表所有周边
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taHouseSurround/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/ma/taHouseSurround/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taHouseSurroundDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaHouseSurroundService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    public ResponseBean taHouseSurroundDelete(@ApiParam("对象ID") @PathVariable String id,
+                                              HttpServletRequest request) throws Exception{
+        TaPerson taPerson = getPerson(request);
+        TaHouseSurround taHouseSurround = iTaHouseSurroundService.getById(id);
+        if (null == taHouseSurround || StatusConstant.DELETE.equals(taHouseSurround.getStatus())) {
+            return ResponseBean.error("删除数据不存在, 请重试", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+
+        if (!iTaHouseService.isOwner(taPerson.getPersonId(), taHouseSurround.getHouseId())) {
+            return ResponseBean.error("您无权进行当前操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taHouseSurround.setStatus(StatusConstant.DELETE);
+
+        return taHouseSurroundUpdate(id, taHouseSurround);
     }
 
     /**
      */
     @RequestMapping(value="/taHouseSurround/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taHouseSurroundUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaHouseSurround taHouseSurround) throws Exception{
+    public ResponseBean taHouseSurroundUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                              @ApiParam("更新内容") @RequestBody TaHouseSurround taHouseSurround) throws Exception{
 
         if (iTaHouseSurroundService.updateById(taHouseSurround)){
             return ResponseBean.success(iTaHouseSurroundService.getById(id));

src/main/java/com/shigongli/service/ITaHouseService.java

 public interface ITaHouseService extends IService<TaHouse> {
 
     IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson);
+
+    boolean isOwner(String personId, String houseId);
 }

src/main/java/com/shigongli/service/impl/TaHouseServiceImpl.java

 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.shigongli.common.StringUtils;
+import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaHouse;
 import com.shigongli.entity.TaPerson;
+import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.mapper.TaHouseMapper;
 import com.shigongli.service.ITaHouseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.shigongli.service.ITaShopKeeperService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 房源 服务实现类
     @Autowired
     TaHouseMapper taHouseMapper;
 
+    @Autowired
+    ITaShopKeeperService iTaShopKeeperService;
+
     @Override
     public IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson) {
 
         return taHouseMapper.getHousesOfKeeper(pg, taPerson.getPersonId());
     }
+
+    @Override
+    public boolean isOwner(String personId, String houseId) {
+        if (StringUtils.isEmpty(personId) || StringUtils.isEmpty(houseId)) {
+            return false;
+        }
+
+        List<TaShopKeeper> keeperList = iTaShopKeeperService.getByPerson(personId);
+        if (null == keeperList || keeperList.size() < 1) {
+            return false;
+        }
+
+        List<String> shopIdList = new ArrayList<>();
+        for (TaShopKeeper keeper: keeperList) {
+            shopIdList.add(keeper.getShopId());
+        }
+
+        QueryWrapper<TaHouse> queryWrapper = new QueryWrapper<TaHouse>()
+                .eq("house_id", houseId)
+                .in("shop_id", shopIdList)
+                .eq("status", StatusConstant.NORMAL);
+
+        return count(queryWrapper) > 0;
+    }
 }

src/main/resources/mapper/TaHouseSurroundMapper.xml

             AND t.house_id = #{houseId}
         </if>
         ORDER BY
-            t.create_date DESC;
+            t.create_date DESC
     </select>
 </mapper>