From 0fcd57fc1abded73a575862fd51e6b6b0df03fca Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 23 Jul 2020 12:49:14 +0800 Subject: [PATCH] init bug --- .../controller/basic/WxProjectConfigController.java | 5 +++-- .../iformall/service/impl/WxMallBuildingServiceImpl.java | 8 ++++++++ .../src/main/resources/mapper/WxFlowConfigMapper.xml | 3 +-- 3 files changed, 12 insertions(+), 4 deletions(-) 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 2c03784f4..f9f901464 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -129,7 +129,7 @@ public class WxProjectConfigController extends BaseController { if(wxMall.getSaleType().equals(100)){ wxMall.setGroupSupport(EnumGroupSupport.SUPPORT.getCode()); }else{ - wxMall.setGroupSupport(EnumGroupSupport.SUPPORT.getCode()); + wxMall.setGroupSupport(EnumGroupSupport.NOT_SUPPORT.getCode()); } if(StringUtils.isBlank(wxMall.getBusinessHours())){ wxMall.setBusinessHours("[]"); @@ -500,7 +500,7 @@ public class WxProjectConfigController extends BaseController { setTenantId(wxMall.getTenantId()); }}; ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(tenantEntity); - map.put("wxMallBuildingFloorList",wxMallBuildingFloorList); + map.put("wxMallBuildingFloorList",wxMallBuildingFloorList.data); WxPayAccount wxPayAccount = wxPayAccountService.getByTenantId(wxMall.getTenantId()); map.put("wxPayAccount",wxPayAccount); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxMall.getTenantId()); @@ -512,6 +512,7 @@ public class WxProjectConfigController extends BaseController { map.put("wxAppinfoList",wxAppinfoList); MallUserInfo mallUserInfo = new MallUserInfo() {{ setTenantId(wxMall.getTenantId()); + setIsAdmin(1); }}; List mallUserInfoList = mallUserInfoService.findList(mallUserInfo); map.put("mallUserInfoList",mallUserInfoList); 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 ebfef73f3..224270858 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -88,8 +88,11 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); + record.setCreateDate(new Date()); + record.setUpdateDate(new Date()); wxMallBuildingMapper.insert(record); } else { + record.setUpdateDate(new Date()); wxMallBuildingMapper.updateById(record); } } @@ -115,6 +118,8 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { List wxMallBuildings = buildings.stream().map(b -> { WxMallBuilding tempb = new WxMallBuilding(); tempb.setId(b.getId()); + tempb.setTenantId(b.getTenantId()); + tempb.setParentTenantId(b.getParentTenantId()); tempb.setName(b.getName()); return tempb; }).collect(Collectors.toList()); @@ -125,7 +130,10 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { List wxMallFloors = wxMallFloorMapper.findList(wxMallFloor).stream().map(f -> { WxMallFloor tempf = new WxMallFloor(); tempf.setId(f.getId()); + tempf.setTenantId(f.getTenantId()); + tempf.setParentTenantId(f.getParentTenantId()); tempf.setFloorName(f.getFloorName()); + tempf.setBackgroundImg(f.getBackgroundImg()); if (f.getTotalArea() != null) { tempf.setTotalArea(f.getTotalArea()); } diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index 1918745b8..ca9efb0e2 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -4,7 +4,7 @@ - + @@ -20,7 +20,6 @@ where 1=1 - and `parent_id` = #{parentId} and `tenant_id` = #{tenantId}