| @@ -129,7 +129,7 @@ public class WxProjectConfigController extends BaseController { | |||||
| if(wxMall.getSaleType().equals(100)){ | if(wxMall.getSaleType().equals(100)){ | ||||
| wxMall.setGroupSupport(EnumGroupSupport.SUPPORT.getCode()); | wxMall.setGroupSupport(EnumGroupSupport.SUPPORT.getCode()); | ||||
| }else{ | }else{ | ||||
| wxMall.setGroupSupport(EnumGroupSupport.SUPPORT.getCode()); | |||||
| wxMall.setGroupSupport(EnumGroupSupport.NOT_SUPPORT.getCode()); | |||||
| } | } | ||||
| if(StringUtils.isBlank(wxMall.getBusinessHours())){ | if(StringUtils.isBlank(wxMall.getBusinessHours())){ | ||||
| wxMall.setBusinessHours("[]"); | wxMall.setBusinessHours("[]"); | ||||
| @@ -500,7 +500,7 @@ public class WxProjectConfigController extends BaseController { | |||||
| setTenantId(wxMall.getTenantId()); | setTenantId(wxMall.getTenantId()); | ||||
| }}; | }}; | ||||
| ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(tenantEntity); | ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(tenantEntity); | ||||
| map.put("wxMallBuildingFloorList",wxMallBuildingFloorList); | |||||
| map.put("wxMallBuildingFloorList",wxMallBuildingFloorList.data); | |||||
| WxPayAccount wxPayAccount = wxPayAccountService.getByTenantId(wxMall.getTenantId()); | WxPayAccount wxPayAccount = wxPayAccountService.getByTenantId(wxMall.getTenantId()); | ||||
| map.put("wxPayAccount",wxPayAccount); | map.put("wxPayAccount",wxPayAccount); | ||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxMall.getTenantId()); | WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxMall.getTenantId()); | ||||
| @@ -512,6 +512,7 @@ public class WxProjectConfigController extends BaseController { | |||||
| map.put("wxAppinfoList",wxAppinfoList); | map.put("wxAppinfoList",wxAppinfoList); | ||||
| MallUserInfo mallUserInfo = new MallUserInfo() {{ | MallUserInfo mallUserInfo = new MallUserInfo() {{ | ||||
| setTenantId(wxMall.getTenantId()); | setTenantId(wxMall.getTenantId()); | ||||
| setIsAdmin(1); | |||||
| }}; | }}; | ||||
| List<MallUserInfo> mallUserInfoList = mallUserInfoService.findList(mallUserInfo); | List<MallUserInfo> mallUserInfoList = mallUserInfoService.findList(mallUserInfo); | ||||
| map.put("mallUserInfoList",mallUserInfoList); | map.put("mallUserInfoList",mallUserInfoList); | ||||
| @@ -88,8 +88,11 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { | |||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| record.setCreateDate(new Date()); | |||||
| record.setUpdateDate(new Date()); | |||||
| wxMallBuildingMapper.insert(record); | wxMallBuildingMapper.insert(record); | ||||
| } else { | } else { | ||||
| record.setUpdateDate(new Date()); | |||||
| wxMallBuildingMapper.updateById(record); | wxMallBuildingMapper.updateById(record); | ||||
| } | } | ||||
| } | } | ||||
| @@ -115,6 +118,8 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { | |||||
| List<WxMallBuilding> wxMallBuildings = buildings.stream().map(b -> { | List<WxMallBuilding> wxMallBuildings = buildings.stream().map(b -> { | ||||
| WxMallBuilding tempb = new WxMallBuilding(); | WxMallBuilding tempb = new WxMallBuilding(); | ||||
| tempb.setId(b.getId()); | tempb.setId(b.getId()); | ||||
| tempb.setTenantId(b.getTenantId()); | |||||
| tempb.setParentTenantId(b.getParentTenantId()); | |||||
| tempb.setName(b.getName()); | tempb.setName(b.getName()); | ||||
| return tempb; | return tempb; | ||||
| }).collect(Collectors.toList()); | }).collect(Collectors.toList()); | ||||
| @@ -125,7 +130,10 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { | |||||
| List<WxMallFloor> wxMallFloors = wxMallFloorMapper.findList(wxMallFloor).stream().map(f -> { | List<WxMallFloor> wxMallFloors = wxMallFloorMapper.findList(wxMallFloor).stream().map(f -> { | ||||
| WxMallFloor tempf = new WxMallFloor(); | WxMallFloor tempf = new WxMallFloor(); | ||||
| tempf.setId(f.getId()); | tempf.setId(f.getId()); | ||||
| tempf.setTenantId(f.getTenantId()); | |||||
| tempf.setParentTenantId(f.getParentTenantId()); | |||||
| tempf.setFloorName(f.getFloorName()); | tempf.setFloorName(f.getFloorName()); | ||||
| tempf.setBackgroundImg(f.getBackgroundImg()); | |||||
| if (f.getTotalArea() != null) { | if (f.getTotalArea() != null) { | ||||
| tempf.setTotalArea(f.getTotalArea()); | tempf.setTotalArea(f.getTotalArea()); | ||||
| } | } | ||||
| @@ -4,7 +4,7 @@ | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxFlowConfig"> | <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxFlowConfig"> | ||||
| <id column="id" jdbcType="BIGINT" property="id" /> | <id column="id" jdbcType="BIGINT" property="id" /> | ||||
| <result column="tenantId" property="tenantId" /> | |||||
| <result column="tenant_id" property="tenantId" /> | |||||
| <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | ||||
| <result column="parent_id" property="parentId" /> | <result column="parent_id" property="parentId" /> | ||||
| <result column="name" property="name" /> | <result column="name" property="name" /> | ||||
| @@ -20,7 +20,6 @@ | |||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| where 1=1 | where 1=1 | ||||
| <if test=" null != parentId ">and `parent_id` = #{parentId}</if> | |||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||