diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index f9f901464..df9af776c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -560,6 +560,7 @@ public class WxProjectConfigController extends BaseController { setTenantId(wxMall.getParentTenantId()); }}; WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); + logger.info(parentWxMall.toString()); if(parentWxMall == null || parentWxMall.getSaleType() != 100 || !parentWxMall.equals(EnumGroupSupport.SUPPORT.getCode()) || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java index 39cbc72da..1c443fb9a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java @@ -7,10 +7,7 @@ import com.iformall.domain.po.WxMallBuilding; public interface WxMallBuildingMapper extends CommonMapper { List findList(WxMallBuilding wxMallBuilding); - - - - - + + void deleteByTenantId(String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java index 394038048..4ee4d1b02 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java @@ -9,4 +9,6 @@ public interface WxMallFloorMapper extends CommonMapper { List findList(WxMallFloor wxMallFloor); int deleteByBuildingId(Long buildingId); + + void deleteByTenantId(String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java index b6594d238..8de2c765f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java @@ -68,4 +68,5 @@ public interface WxMallBuildingService { */ void saveFloorArea(WxMallFloor record); + void deleteByTenantId(String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java index 29f5ad48c..87ea918ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java @@ -43,4 +43,6 @@ public interface WxMallFloorService { ResultData getFloorList(TenantEntity tenantEntity, Long buildingId); void deleteByBuildingId(Long buildingId); + + void deleteByTenantId(String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index 2dba64919..d724c999d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -193,5 +193,10 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { wxMallFloorMapper.updateById(mallFloor); } + @Override + public void deleteByTenantId(String tenantId) { + wxMallBuildingMapper.deleteByTenantId(tenantId); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java index 0f51a11af..b3adcf43c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java @@ -68,5 +68,10 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { wxMallFloorMapper.deleteByBuildingId(buildingId); } + @Override + public void deleteByTenantId(String tenantId) { + wxMallFloorMapper.deleteByTenantId(tenantId); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 115c0b710..bc75f8f09 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -157,11 +157,15 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { @Transactional public void initBuilding(List wxMallBuildings) { for (WxMallBuilding wxMallBuilding:wxMallBuildings) { + wxMallBuildingService.deleteByTenantId(wxMallBuilding.getTenantId()); + wxMallBuilding.setId(null); wxMallBuilding.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); if(wxMallBuilding.getFloors() != null && wxMallBuilding.getFloors().size() > 0){ wxMallBuilding.setFloorNumber(wxMallBuilding.getFloors().size()); wxMallBuildingService.saveOrUpdate(wxMallBuilding); for (WxMallFloor wxMallFloor:wxMallBuilding.getFloors()) { + wxMallFloorService.deleteByTenantId(wxMallBuilding.getTenantId()); + wxMallFloor.setId(null); wxMallFloor.setTenantId(wxMallBuilding.getTenantId()); wxMallFloor.setParentTenantId(wxMallBuilding.getParentTenantId()); wxMallFloor.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml index f63bd3ef2..339b62fec 100644 --- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml @@ -70,8 +70,11 @@ from wx_mall_building - - + + + + delete from wx_mall_building where `tenant_id` = #{tenantId} + diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index 9a5022c8f..ddf4fd1d2 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -74,7 +74,11 @@ - delete from wx_mall_floor where building_id=#{buildingId} + delete from wx_mall_floor where building_id = #{buildingId} + + + + delete from wx_mall_floor where `tenant_id` = #{tenantId}