From 881e2b4d494dd4904be5221f11742b4e3e524d08 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 19 Mar 2025 13:51:58 +0800 Subject: [PATCH 1/2] update --- .../com/jsowell/api/uniapp/customer/MemberController.java | 4 ++-- .../src/main/java/com/jsowell/service/MemberService.java | 4 ++-- .../src/main/java/com/jsowell/service/OrderService.java | 4 ++-- ...ntedStationInfo.java => UserFrequentedStationInfo.java} | 2 +- .../java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java | 5 ++--- .../com/jsowell/pile/service/OrderBasicInfoService.java | 2 +- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 7 ++----- .../main/resources/mapper/pile/OrderBasicInfoMapper.xml | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) rename jsowell-pile/src/main/java/com/jsowell/pile/domain/{UserFrquentedStationInfo.java => UserFrequentedStationInfo.java} (91%) 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 5a1b2044d..097e7ba09 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 @@ -14,7 +14,7 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.SMSUtil; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberPlateNumberRelation; -import com.jsowell.pile.domain.UserFrquentedStationInfo; +import com.jsowell.pile.domain.UserFrequentedStationInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.service.MemberPlateNumberRelationService; @@ -614,7 +614,7 @@ public class MemberController extends BaseController { try { String memberId = getMemberIdByAuthorization(request); //查询order_basic_info表,根据member_id,对应的station_id,,然后根据station_id查询pile_station_info表中的站点名称,最后统计每个站点的次数,查询当前时间前半年的记录 - List list = memberService.queryUserFrquentedStation(memberId); + List list = memberService.queryUserFrequentedStation(memberId); response = new RestApiResponse<>(ImmutableMap.of("list", list)); } catch (BusinessException e) { logger.error("查询用户常去站点(最近半年) error", e); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index a2a707850..fffca2751 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -853,7 +853,7 @@ public class MemberService { * @param memberId * @return */ - public List queryUserFrquentedStation(String memberId) { - return orderService.queryUserFrquentedStation(memberId); + public List queryUserFrequentedStation(String memberId) { + return orderService.queryUserFrequentedStation(memberId); } } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index f0803b5aa..c3a57c532 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1520,7 +1520,7 @@ public class OrderService { * @param memberId * @return */ - public List queryUserFrquentedStation(String memberId) { - return orderBasicInfoService.queryUserFrquentedStation(memberId); + public List queryUserFrequentedStation(String memberId) { + return orderBasicInfoService.queryUserFrequentedStation(memberId); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/UserFrquentedStationInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/UserFrequentedStationInfo.java similarity index 91% rename from jsowell-pile/src/main/java/com/jsowell/pile/domain/UserFrquentedStationInfo.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/UserFrequentedStationInfo.java index 7fce0864b..cb05e6384 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/UserFrquentedStationInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/UserFrequentedStationInfo.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -public class UserFrquentedStationInfo { +public class UserFrequentedStationInfo { /** * 站点id */ 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 b08aeb0e0..f660caf8c 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 @@ -1,9 +1,8 @@ package com.jsowell.pile.mapper; -import com.alipay.api.domain.ChargeOrderInfo; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderDetail; -import com.jsowell.pile.domain.UserFrquentedStationInfo; +import com.jsowell.pile.domain.UserFrequentedStationInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO; import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO; @@ -410,5 +409,5 @@ public interface OrderBasicInfoMapper { * @param memberId * @return */ - List queryUserFrquentedStation(String memberId); + List queryUserFrequentedStation(String memberId); } \ No newline at end of file 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 f46510b70..0f45f4876 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 @@ -549,5 +549,5 @@ public interface OrderBasicInfoService{ * @param memberId * @return */ - List queryUserFrquentedStation(String memberId); + List queryUserFrequentedStation(String memberId); } 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 2f8a2a6be..3b299c1c2 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 @@ -17,7 +17,6 @@ import com.jsowell.adapay.response.*; import com.jsowell.adapay.service.AdapayService; import com.jsowell.adapay.vo.OrderSplitResult; import com.jsowell.adapay.vo.PaymentInfo; -import com.jsowell.common.YouDianUtils; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; @@ -30,7 +29,6 @@ import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.adapay.AdapayPayChannelEnum; import com.jsowell.common.enums.adapay.AdapayStatusEnum; import com.jsowell.common.enums.adapay.MerchantDelayModeEnum; -import com.jsowell.common.enums.ebike.EBikeStopReasonEnum; import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.*; @@ -41,7 +39,6 @@ import com.jsowell.common.util.id.IdUtils; import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.common.util.spring.SpringUtils; import com.jsowell.pile.domain.*; -import com.jsowell.pile.domain.ebike.deviceupload.EBikeMessageCmd03; import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO; import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO; @@ -4962,8 +4959,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { * @return */ @Override - public List queryUserFrquentedStation(String memberId) { - return orderBasicInfoMapper.queryUserFrquentedStation(memberId); + public List queryUserFrequentedStation(String memberId) { + return orderBasicInfoMapper.queryUserFrequentedStation(memberId); } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index a5d0b3be2..7c6e6cc22 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -3119,7 +3119,7 @@ - SELECT obi.station_id AS stationId, psi.station_name AS stationName, From 9eaf11b5711d724266acd727e2b2198f83c0c177 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 19 Mar 2025 13:53:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=20=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/万车充接口补充.md | 10 +++++----- .../jsowell/api/uniapp/customer/MemberController.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/万车充接口补充.md b/doc/万车充接口补充.md index fdc582ffa..26fde53ea 100644 --- a/doc/万车充接口补充.md +++ b/doc/万车充接口补充.md @@ -76,7 +76,7 @@ # 查询用户常去站点（最近半年） ```text -接口地址：/uniapp/member/getUserFrquentedStationList +接口地址：/uniapp/member/getUserFrequentedStationList 请求方式：GET ``` @@ -88,11 +88,11 @@ ### **反参** -| 字段名 | 类型 | 是否必传 | 备注 | -| ------------------------------ | ------------------------ | -------- | ------------------------ | -| List | UserFrquentedStationInfo | Y | 按照充电次数从高到低排序 | +| 字段名 | 类型 | 是否必传 | 备注 | +| ------------------------------- | ------------------------- | -------- | ------------------------ | +| List | UserFrequentedStationInfo | Y | 按照充电次数从高到低排序 | -#### UserFrquentedStationInfo +#### UserFrequentedStationInfo | 字段名 | 类型 | 是否必传 | 备注 | | ----------- | ------ | -------- | -------- | 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 097e7ba09..e8e30326e 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 @@ -608,8 +608,8 @@ public class MemberController extends BaseController { /** * 查询用户常去站点(最近半年) */ - @GetMapping("/getUserFrquentedStationList") - public RestApiResponse queryUserFrquentedStation(HttpServletRequest request) { + @GetMapping("/getUserFrequentedStationList") + public RestApiResponse queryUserFrequentedStation(HttpServletRequest request) { RestApiResponse response; try { String memberId = getMemberIdByAuthorization(request);