| @@ -560,6 +560,7 @@ public class WxProjectConfigController extends BaseController { | |||||
| setTenantId(wxMall.getParentTenantId()); | setTenantId(wxMall.getParentTenantId()); | ||||
| }}; | }}; | ||||
| WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); | WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); | ||||
| logger.info(parentWxMall.toString()); | |||||
| if(parentWxMall == null || parentWxMall.getSaleType() != 100 | if(parentWxMall == null || parentWxMall.getSaleType() != 100 | ||||
| || !parentWxMall.equals(EnumGroupSupport.SUPPORT.getCode()) | || !parentWxMall.equals(EnumGroupSupport.SUPPORT.getCode()) | ||||
| || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ | || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ | ||||
| @@ -7,10 +7,7 @@ import com.iformall.domain.po.WxMallBuilding; | |||||
| public interface WxMallBuildingMapper extends CommonMapper<WxMallBuilding, String> { | public interface WxMallBuildingMapper extends CommonMapper<WxMallBuilding, String> { | ||||
| List<WxMallBuilding> findList(WxMallBuilding wxMallBuilding); | List<WxMallBuilding> findList(WxMallBuilding wxMallBuilding); | ||||
| void deleteByTenantId(String tenantId); | |||||
| } | } | ||||
| @@ -9,4 +9,6 @@ public interface WxMallFloorMapper extends CommonMapper<WxMallFloor, String> { | |||||
| List<WxMallFloor> findList(WxMallFloor wxMallFloor); | List<WxMallFloor> findList(WxMallFloor wxMallFloor); | ||||
| int deleteByBuildingId(Long buildingId); | int deleteByBuildingId(Long buildingId); | ||||
| void deleteByTenantId(String tenantId); | |||||
| } | } | ||||
| @@ -68,4 +68,5 @@ public interface WxMallBuildingService { | |||||
| */ | */ | ||||
| void saveFloorArea(WxMallFloor record); | void saveFloorArea(WxMallFloor record); | ||||
| void deleteByTenantId(String tenantId); | |||||
| } | } | ||||
| @@ -43,4 +43,6 @@ public interface WxMallFloorService { | |||||
| ResultData getFloorList(TenantEntity tenantEntity, Long buildingId); | ResultData getFloorList(TenantEntity tenantEntity, Long buildingId); | ||||
| void deleteByBuildingId(Long buildingId); | void deleteByBuildingId(Long buildingId); | ||||
| void deleteByTenantId(String tenantId); | |||||
| } | } | ||||
| @@ -193,5 +193,10 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { | |||||
| wxMallFloorMapper.updateById(mallFloor); | wxMallFloorMapper.updateById(mallFloor); | ||||
| } | } | ||||
| @Override | |||||
| public void deleteByTenantId(String tenantId) { | |||||
| wxMallBuildingMapper.deleteByTenantId(tenantId); | |||||
| } | |||||
| } | } | ||||
| @@ -68,5 +68,10 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { | |||||
| wxMallFloorMapper.deleteByBuildingId(buildingId); | wxMallFloorMapper.deleteByBuildingId(buildingId); | ||||
| } | } | ||||
| @Override | |||||
| public void deleteByTenantId(String tenantId) { | |||||
| wxMallFloorMapper.deleteByTenantId(tenantId); | |||||
| } | |||||
| } | } | ||||
| @@ -157,11 +157,15 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { | |||||
| @Transactional | @Transactional | ||||
| public void initBuilding(List<WxMallBuilding> wxMallBuildings) { | public void initBuilding(List<WxMallBuilding> wxMallBuildings) { | ||||
| for (WxMallBuilding wxMallBuilding:wxMallBuildings) { | for (WxMallBuilding wxMallBuilding:wxMallBuildings) { | ||||
| wxMallBuildingService.deleteByTenantId(wxMallBuilding.getTenantId()); | |||||
| wxMallBuilding.setId(null); | |||||
| wxMallBuilding.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); | wxMallBuilding.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); | ||||
| if(wxMallBuilding.getFloors() != null && wxMallBuilding.getFloors().size() > 0){ | if(wxMallBuilding.getFloors() != null && wxMallBuilding.getFloors().size() > 0){ | ||||
| wxMallBuilding.setFloorNumber(wxMallBuilding.getFloors().size()); | wxMallBuilding.setFloorNumber(wxMallBuilding.getFloors().size()); | ||||
| wxMallBuildingService.saveOrUpdate(wxMallBuilding); | wxMallBuildingService.saveOrUpdate(wxMallBuilding); | ||||
| for (WxMallFloor wxMallFloor:wxMallBuilding.getFloors()) { | for (WxMallFloor wxMallFloor:wxMallBuilding.getFloors()) { | ||||
| wxMallFloorService.deleteByTenantId(wxMallBuilding.getTenantId()); | |||||
| wxMallFloor.setId(null); | |||||
| wxMallFloor.setTenantId(wxMallBuilding.getTenantId()); | wxMallFloor.setTenantId(wxMallBuilding.getTenantId()); | ||||
| wxMallFloor.setParentTenantId(wxMallBuilding.getParentTenantId()); | wxMallFloor.setParentTenantId(wxMallBuilding.getParentTenantId()); | ||||
| wxMallFloor.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); | wxMallFloor.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); | ||||
| @@ -70,8 +70,11 @@ | |||||
| from wx_mall_building | from wx_mall_building | ||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||
| <delete id="deleteByTenantId"> | |||||
| delete from wx_mall_building where `tenant_id` = #{tenantId} | |||||
| </delete> | |||||
| @@ -74,7 +74,11 @@ | |||||
| <delete id="deleteByBuildingId"> | <delete id="deleteByBuildingId"> | ||||
| delete from wx_mall_floor where building_id=#{buildingId} | |||||
| delete from wx_mall_floor where building_id = #{buildingId} | |||||
| </delete> | |||||
| <delete id="deleteByTenantId"> | |||||
| delete from wx_mall_floor where `tenant_id` = #{tenantId} | |||||
| </delete> | </delete> | ||||