From 5daad34fe7b24b9c7f4bbebafff48376eaa4a6f8 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 10 Nov 2023 15:14:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E7=BD=AEdept=E7=AD=89?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/mapper/MemberWalletInfoMapper.java | 2 ++ .../pile/mapper/MemberWalletLogMapper.java | 2 ++ .../pile/mapper/PileStationInfoMapper.java | 2 ++ .../pile/service/IPileStationInfoService.java | 2 ++ .../impl/MemberBasicInfoServiceImpl.java | 10 +++++--- .../impl/PileMerchantInfoServiceImpl.java | 1 + .../impl/PileStationInfoServiceImpl.java | 9 ++++++- .../mapper/pile/PileStationInfoMapper.xml | 25 +++++++++++++------ .../service/impl/SysDeptServiceImpl.java | 4 +-- 9 files changed, 43 insertions(+), 14 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java index 15a5c854c..719cee5d1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java @@ -2,7 +2,9 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberWalletInfo; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; +@Repository public interface MemberWalletInfoMapper { /** * delete by primary key diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java index c90786445..aa9b7eab6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java @@ -5,9 +5,11 @@ import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; +@Repository public interface MemberWalletLogMapper { /** * delete by primary key diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java index 68b12694b..66a743c93 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java @@ -104,4 +104,6 @@ public interface PileStationInfoMapper { * @return */ List getStationSelectList(@Param("dto") QueryStationDTO dto); + + PileStationInfo queryInfoByDeptId(@Param("deptId") String deptId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java index 82d46f12c..1863d1c70 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java @@ -119,4 +119,6 @@ public interface IPileStationInfoService { * 查询充电站下拉列表 */ List getStationSelectList(QueryStationDTO dto); + + PileStationInfo queryInfoByDeptId(String valueOf); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 4314047f2..b4c30d17c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -20,10 +20,7 @@ import com.jsowell.pile.mapper.MemberBasicInfoMapper; import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; import com.jsowell.pile.mapper.MemberWalletInfoMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IMemberTransactionRecordService; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberVO; @@ -75,6 +72,9 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { @Autowired private IMemberTransactionRecordService memberTransactionRecordService; + @Autowired + private IPileStationInfoService pileStationInfoService; + /** * 查询会员基础信息 * @@ -452,6 +452,8 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { return resultList; } // 根据部门id查询对应的运营商 + PileMerchantInfo merchantInfo = pileMerchantInfoService.queryInfoByDeptId(String.valueOf(deptId)); + PileStationInfo stationInfo = pileStationInfoService.queryInfoByDeptId(String.valueOf(deptId)); return null; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 5a737b760..2253d315a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -122,6 +122,7 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { dept.setDeptName(dto.getMerchantName()); dept.setLeader(dto.getManagerName()); dept.setPhone(dto.getManagerPhone()); + dept.setDeptLevel("2"); dept.setStatus("0"); sysDeptService.insertDept(dept); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 3f6495ee8..85bef1235 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -18,7 +18,6 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.ip.AddressUtils; import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.domain.PileStationInfo; -import com.jsowell.pile.domain.ThirdPartyPlatformConfig; import com.jsowell.pile.domain.ThirdpartyParkingConfig; import com.jsowell.pile.dto.FastCreateStationDTO; import com.jsowell.pile.dto.QueryStationDTO; @@ -566,5 +565,13 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { return pileStationInfoMapper.getStationSelectList(dto); } + @Override + public PileStationInfo queryInfoByDeptId(String deptId) { + if (StringUtils.isBlank(deptId)) { + return null; + } + return pileStationInfoMapper.queryInfoByDeptId(deptId); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml index 1878b9e52..6f85bc3ea 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml @@ -58,15 +58,18 @@ + + + id,merchant_id, station_name, dept_id, parking_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number, + park_fee_describe, country_code, area_code, address, station_tel, service_tel, station_type, station_status, station_admin_name, park_nums, + station_lng, station_lat, site_guide, construction, pictures, match_cars, park_info, park_owner, + park_manager, open_all_day, business_hours, park_free, payment, support_order, remark, public_flag, amap_flag, + open_flag, toilet_flag, store_flag, restaurant_flag, lounge_flag, canopy_flag, printer_flag, barrier_flag, + parking_lock_flag, create_by, create_time, update_by, update_time, del_flag + - select id,merchant_id, station_name, dept_id, parking_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number, - park_fee_describe, country_code, area_code, address, station_tel, service_tel, station_type, station_status, station_admin_name, park_nums, - station_lng, station_lat, site_guide, construction, pictures, match_cars, park_info, park_owner, - park_manager, open_all_day, business_hours, park_free, payment, support_order, remark, public_flag, amap_flag, - open_flag, toilet_flag, store_flag, restaurant_flag, lounge_flag, canopy_flag, printer_flag, barrier_flag, - parking_lock_flag, create_by, create_time, update_by, update_time, del_flag - from pile_station_info + select from pile_station_info + + \ No newline at end of file diff --git a/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysDeptServiceImpl.java b/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysDeptServiceImpl.java index cea5d7fc9..a9694a437 100644 --- a/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysDeptServiceImpl.java +++ b/jsowell-system/src/main/java/com/jsowell/system/service/impl/SysDeptServiceImpl.java @@ -192,7 +192,7 @@ public class SysDeptServiceImpl implements SysDeptService { } dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); // 更新deptLevel字段 - if (StringUtils.isNotBlank(info.getDeptLevel())) { + if (StringUtils.isBlank(dept.getDeptLevel()) && StringUtils.isNotBlank(info.getDeptLevel())) { dept.setDeptLevel(String.valueOf(Integer.parseInt(info.getDeptLevel()) + 1)); } return deptMapper.insertDept(dept); @@ -215,7 +215,7 @@ public class SysDeptServiceImpl implements SysDeptService { updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); // 更新deptLevel字段 - if (StringUtils.isNotBlank(newParentDept.getDeptLevel())) { + if (StringUtils.isBlank(dept.getDeptLevel()) && StringUtils.isNotBlank(newParentDept.getDeptLevel())) { dept.setDeptLevel(String.valueOf(Integer.parseInt(newParentDept.getDeptLevel()) + 1)); } }