diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java index ee1aee6fe..7b84672db 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java @@ -55,6 +55,10 @@ public class MemberController extends BaseController { @Autowired private OrderBasicInfoService orderBasicInfoService; + + @Autowired + private PileStationInfoService pileStationInfoService; + /** * 下发短信接口 business * http://localhost:8080/uniapp/member/sendSMS @@ -611,14 +615,15 @@ public class MemberController extends BaseController { /** * 查询用户常去站点(最近半年) */ - @GetMapping("/getUserFrequentedStationList") - public RestApiResponse queryUserFrequentedStation(HttpServletRequest request) { + @PostMapping("/getUserFrequentedStationList") + public RestApiResponse queryUserFrequentedStation(HttpServletRequest request, @RequestBody QueryStationDTO dto) { RestApiResponse response; try { String memberId = getMemberIdByAuthorization(request); + dto.setMemberId(memberId); //查询order_basic_info表,根据member_id,对应的station_id,,然后根据station_id查询pile_station_info表中的站点名称,最后统计每个站点的次数,查询当前时间前半年的记录 - List list = orderBasicInfoService.queryUserFrequentedStation(memberId); - response = new RestApiResponse<>(ImmutableMap.of("list", list)); + PageResponse pageResponse = pileStationInfoService.queryUserFrequentedStation(dto); + response = new RestApiResponse<>(pageResponse); } catch (BusinessException e) { logger.error("查询用户常去站点(最近半年) error", e); response = new RestApiResponse<>(e.getCode(), e.getMessage()); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java index 9ffb11607..b2ff53216 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java @@ -398,4 +398,6 @@ public class PileStationInfoController extends BaseController { } return result; } + + // public AjaxResult checkStationAmap } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index 02755e366..e28689872 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -403,14 +403,4 @@ public interface OrderBasicInfoMapper { * @return */ List selectThirdPartyOrderList(@Param("dto") QueryStartChargeDTO dto); - - - /** - * 查询用户常用站点信息 - * @param memberId - * @param startTime - * @param endTime - * @return - */ - List queryUserFrequentedStation(@Param("memberId") String memberId ,@Param("startTime") String startTime ,@Param("endTime") String endTime); } \ No newline at end of file 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 1356307e4..52bcc3997 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 @@ -1,6 +1,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.PileStationInfo; +import com.jsowell.pile.domain.UserFrequentedStationInfo; import com.jsowell.pile.dto.QueryStationDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.pile.dto.amap.GetStationInfoDTO; @@ -122,4 +123,13 @@ public interface PileStationInfoMapper { PileStationInfo queryInfoByDeptId(@Param("deptId") String deptId); List getStationInfosByMerchantIds(@Param("list") List merchantIds); + + /** + * 查询用户常用站点信息 + * @param memberId + * @param startTime + * @param endTime + * @return + */ + List queryUserFrequentedStation(@Param("memberId") String memberId ,@Param("startTime") String startTime ,@Param("endTime") String endTime); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index 39165625c..3bc9e3817 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -544,13 +544,6 @@ public interface OrderBasicInfoService{ void retryRefundOrderList(List orderCoderList); - /** - * 查询用户常用充电站点信息 - * @param memberId - * @return - */ - List queryUserFrequentedStation(String memberId); - /** * 通过订单编号列表查询订单信息 * @param orderCodeList diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java index 5732c9213..a86adf2ad 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java @@ -2,6 +2,7 @@ package com.jsowell.pile.service; import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.domain.PileStationInfo; +import com.jsowell.pile.domain.UserFrequentedStationInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.amap.GetStationInfoDTO; import com.jsowell.pile.dto.business.StationBusinessAnalyzeInfoDTO; @@ -203,4 +204,11 @@ public interface PileStationInfoService { * @return */ StationBusinessAnalyzeInfoVO getStationConnectorUsedInfo(StationBusinessAnalyzeInfoDTO dto); + + /** + * 查询用户常用充电站点信息 + * @param dto + * @return + */ + PageResponse queryUserFrequentedStation(QueryStationDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index bb4a8254b..96a23b62d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -4970,18 +4970,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } - /** - * 查询用户常用站点信息 - * @param memberId - * @return - */ - @Override - public List queryUserFrequentedStation(String memberId) { - String endTime = DateUtils.getDate(); - String startTime = DateUtils.getHalfYearAgo(endTime); - return orderBasicInfoMapper.queryUserFrequentedStation(memberId, startTime, endTime); - } - @Override public List queryAfterSettleOrderDTOList(List orderCodeList) { return null; 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 086d332f9..d77a32267 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 @@ -16,10 +16,7 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.*; import com.jsowell.common.util.ip.AddressUtils; -import com.jsowell.pile.domain.PileBasicInfo; -import com.jsowell.pile.domain.PileStationInfo; -import com.jsowell.pile.domain.SettleOrderReport; -import com.jsowell.pile.domain.ThirdpartyParkingConfig; +import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.FastCreateStationDTO; import com.jsowell.pile.dto.QueryStationDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; @@ -1394,4 +1391,24 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { vo.setBusinessOrderDetailInfoVOList(list); return vo; } + + /** + * 查询用户常用站点信息 + * @param dto + * @return + */ + @Override + public PageResponse queryUserFrequentedStation(QueryStationDTO dto) { + String endTime = DateUtils.getDate(); + String startTime = DateUtils.getHalfYearAgo(endTime); + List frequentedStationInfos = pileStationInfoMapper.queryUserFrequentedStation(dto.getMemberId(), startTime, endTime); + // 筛选出站点idList + List stationIdList = frequentedStationInfos.stream() + .map(UserFrequentedStationInfo::getStationId) + .collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(stationIdList)) { + dto.setStationIds(stationIdList); + } + return uniAppQueryStationInfoListV2(dto); + } } \ No newline at end of file diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index bb7f61921..399721f6b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -3119,22 +3119,4 @@ - - \ No newline at end of file diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml index 27172f9d2..7f75b48a9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml @@ -706,4 +706,22 @@ + + \ No newline at end of file