| @@ -56,14 +56,14 @@ public class WxMallBuildingController extends BaseController { | |||||
| } | } | ||||
| floor.updateTenantInfo(getTenantInfo()); | floor.updateTenantInfo(getTenantInfo()); | ||||
| wxMallBuildingService.saveFloorImg(floor); | wxMallBuildingService.saveFloorImg(floor); | ||||
| return new ResultData(); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| String key = Constant.mallBuildingPrev + getTenantInfo().getTenantId(); | String key = Constant.mallBuildingPrev + getTenantInfo().getTenantId(); | ||||
| RedisCacheUtils.removeCache(objectCommonRedisTemplate, key); | RedisCacheUtils.removeCache(objectCommonRedisTemplate, key); | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | |||||
| return new ResultData(); | |||||
| } | } | ||||
| @ApiOperation("保存楼层楼座面积") | @ApiOperation("保存楼层楼座面积") | ||||
| @@ -29,10 +29,10 @@ public class WxMerchantDto extends TenantEntity { | |||||
| private String shopNumber; | private String shopNumber; | ||||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | ||||
| private Integer building; | |||||
| private Long building; | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | ||||
| private Integer floor; | |||||
| private Long floor; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") | @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") | ||||
| private Integer isPublic; | private Integer isPublic; | ||||
| @@ -181,7 +181,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { | |||||
| wxMallFloor.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); | wxMallFloor.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); | ||||
| wxMallFloor.setBuildingId(wxMallBuilding.getId()); | wxMallFloor.setBuildingId(wxMallBuilding.getId()); | ||||
| wxMallFloor.setBackgroundImg(Constant.floor_back_img); | wxMallFloor.setBackgroundImg(Constant.floor_back_img); | ||||
| if(wxMallFloor.getFloorMaps() != null || wxMallFloor.getFloorMaps().size() > 0) { | |||||
| if(null != wxMallFloor.getFloorMaps() && wxMallFloor.getFloorMaps().size() > 0) { | |||||
| wxMallFloor.setFloorMap(JSON.toJSONString(wxMallFloor.getFloorMaps())); | wxMallFloor.setFloorMap(JSON.toJSONString(wxMallFloor.getFloorMaps())); | ||||
| } | } | ||||
| wxMallFloorService.saveOrUpdate(wxMallFloor); | wxMallFloorService.saveOrUpdate(wxMallFloor); | ||||