feats

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

@@ -151,12 +151,24 @@ public class TaHouseController extends BaseController {
      */
     @RequestMapping(value="/ma/taHouse/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taHouseDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+    public ResponseBean taHouseDelete(@ApiParam("对象ID") @PathVariable String id,
+                                      HttpServletRequest request) throws Exception{
         TaHouse taHouse = iTaHouseService.getById(id);
         if (null == taHouse || taHouse.getStatus().equals(StatusConstant.DELETE)) {
             return ResponseBean.success("ok");
         }
 
+        TaPerson person = getPerson(request);
+        List<TaShopKeeper> shopKeeperList = iTaShopKeeperService.getByPerson(person.getPersonId());
+        if (null == shopKeeperList || shopKeeperList.size() < 1) {
+            return ResponseBean.error("店主数据异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaShopKeeper taShopKeeper = shopKeeperList.get(0);
+        if (!taShopKeeper.getShopId().equals(taHouse.getShopId())) {
+            return ResponseBean.error("您无权进行当前操作", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         taHouse.setStatus(StatusConstant.DELETE);
 
         return taHouseUpdate(id, taHouse);