feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.shigongli</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>1.0.5</version>
+	<version>1.0.8</version>
 	<name>shigongli</name>
 	<description>ShiGongli Service</description>
 

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

@@ -180,6 +180,7 @@ public class TaHouseController extends BaseController {
         }
 
         taHouse.setStatus(StatusConstant.DELETE);
+        iTaHouseSurroundService.deleteByHouse(id);
 
         return taHouseUpdate(id, taHouse);
     }

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

@@ -7,6 +7,8 @@ import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
 import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
+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;
@@ -41,6 +43,12 @@ public class TaShopController extends BaseController {
     @Autowired
     public ITaShopService iTaShopService;
 
+    @Autowired
+    public ITaHouseService iTaHouseService;
+
+    @Autowired
+    public ITaShopKeeperService iTaShopKeeperService;
+
 
     /**
      * 分页查询列表
@@ -101,6 +109,9 @@ public class TaShopController extends BaseController {
 
         taShop.setStatus(StatusConstant.DELETE);
 
+        iTaHouseService.deleteByShop(id);
+        iTaShopKeeperService.deleteByShop(id);
+
         return taShopUpdate(id, taShop);
     }
 

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

@@ -18,4 +18,6 @@ public interface ITaHouseService extends IService<TaHouse> {
     IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson, String shopId);
 
     boolean isOwner(String personId, String houseId);
+
+    boolean deleteByShop(String shopId);
 }

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

@@ -17,4 +17,6 @@ public interface ITaHouseSurroundService extends IService<TaHouseSurround> {
     IPage<TaHouseSurround> getListByHouseOrNot(IPage<TaHouseSurround> pg, String houseId);
 
     void copySurroundByHouse(String fromHouse, String toHouse);
+
+    boolean deleteByHouse(String houseId);
 }

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

@@ -25,4 +25,6 @@ public interface ITaShopKeeperService extends IService<TaShopKeeper> {
     TaShopKeeper getByPhone(String phone, String shopId);
 
     List<TaShopKeeper> getByHouse(String houseId);
+
+    boolean deleteByShop(String shopId);
 }

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

@@ -1,6 +1,7 @@
 package com.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
@@ -63,4 +64,21 @@ public class TaHouseServiceImpl extends ServiceImpl<TaHouseMapper, TaHouse> impl
 
         return count(queryWrapper) > 0;
     }
+
+    @Override
+    public boolean deleteByShop(String shopId) {
+        if (StringUtils.isEmpty(shopId)) {
+            return false;
+        }
+
+        try {
+            UpdateWrapper<TaHouse> wrapper = new UpdateWrapper<>();
+            wrapper.set("status", StatusConstant.DELETE);
+            wrapper.eq("shop_id", shopId);
+            return update(wrapper);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 }

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

@@ -1,7 +1,11 @@
 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.shigongli.common.StringUtils;
+import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaHouseSurround;
+import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.mapper.TaHouseSurroundMapper;
 import com.shigongli.service.ITaHouseSurroundService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,4 +34,21 @@ public class TaHouseSurroundServiceImpl extends ServiceImpl<TaHouseSurroundMappe
     public void copySurroundByHouse(String fromHouse, String toHouse) {
         taHouseSurroundMapper.copySurroundByHouse(fromHouse, toHouse);
     }
+
+    @Override
+    public boolean deleteByHouse(String houseId) {
+        if (StringUtils.isEmpty(houseId)) {
+            return false;
+        }
+
+        try {
+            UpdateWrapper<TaHouseSurround> wrapper = new UpdateWrapper<>();
+            wrapper.set("status", StatusConstant.DELETE);
+            wrapper.eq("house_id", houseId);
+            return update(wrapper);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaHouse;
 import com.shigongli.entity.TaPerson;
 import com.shigongli.entity.TaShop;
 import com.shigongli.entity.TaShopKeeper;
@@ -91,4 +93,21 @@ public class TaShopKeeperServiceImpl extends ServiceImpl<TaShopKeeperMapper, TaS
     public List<TaShopKeeper> getByHouse(String houseId) {
         return taShopKeeperMapper.getByHouse(houseId);
     }
+
+    @Override
+    public boolean deleteByShop(String shopId) {
+        if (StringUtils.isEmpty(shopId)) {
+            return false;
+        }
+
+        try {
+            UpdateWrapper<TaShopKeeper> wrapper = new UpdateWrapper<>();
+            wrapper.set("status", StatusConstant.DELETE);
+            wrapper.eq("shop_id", shopId);
+            return update(wrapper);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 }

src/main/resources/mapper/TaHouseMapper.xml

@@ -15,6 +15,6 @@
         </if>
             AND s.`status` = 1
             AND t.`status` = 1
-        ORDER BY t.title DESC
+        ORDER BY t.create_date DESC
     </select>
 </mapper>

src/main/resources/mapper/TaHouseSurroundMapper.xml

@@ -9,7 +9,7 @@
             t.image_id,
             t.sort_no,
             t.`status`,
-            NOW( )
+            t.create_date
         FROM
             ta_house_surround t
         WHERE