This commit is contained in:
Lemon
2025-03-19 13:51:58 +08:00
parent e3ce4c13bc
commit 881e2b4d49
8 changed files with 13 additions and 17 deletions

View File

@@ -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<UserFrquentedStationInfo> list = memberService.queryUserFrquentedStation(memberId);
List<UserFrequentedStationInfo> list = memberService.queryUserFrequentedStation(memberId);
response = new RestApiResponse<>(ImmutableMap.of("list", list));
} catch (BusinessException e) {
logger.error("查询用户常去站点(最近半年) error", e);

View File

@@ -853,7 +853,7 @@ public class MemberService {
* @param memberId
* @return
*/
public List<UserFrquentedStationInfo> queryUserFrquentedStation(String memberId) {
return orderService.queryUserFrquentedStation(memberId);
public List<UserFrequentedStationInfo> queryUserFrequentedStation(String memberId) {
return orderService.queryUserFrequentedStation(memberId);
}
}

View File

@@ -1520,7 +1520,7 @@ public class OrderService {
* @param memberId
* @return
*/
public List<UserFrquentedStationInfo> queryUserFrquentedStation(String memberId) {
return orderBasicInfoService.queryUserFrquentedStation(memberId);
public List<UserFrequentedStationInfo> queryUserFrequentedStation(String memberId) {
return orderBasicInfoService.queryUserFrequentedStation(memberId);
}
}

View File

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class UserFrquentedStationInfo {
public class UserFrequentedStationInfo {
/**
* 站点id
*/

View File

@@ -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<UserFrquentedStationInfo> queryUserFrquentedStation(String memberId);
List<UserFrequentedStationInfo> queryUserFrequentedStation(String memberId);
}

View File

@@ -549,5 +549,5 @@ public interface OrderBasicInfoService{
* @param memberId
* @return
*/
List<UserFrquentedStationInfo> queryUserFrquentedStation(String memberId);
List<UserFrequentedStationInfo> queryUserFrequentedStation(String memberId);
}

View File

@@ -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<UserFrquentedStationInfo> queryUserFrquentedStation(String memberId) {
return orderBasicInfoMapper.queryUserFrquentedStation(memberId);
public List<UserFrequentedStationInfo> queryUserFrequentedStation(String memberId) {
return orderBasicInfoMapper.queryUserFrequentedStation(memberId);
}
}

View File

@@ -3119,7 +3119,7 @@
</where>
</select>
<select id="queryUserFrquentedStation" resultType="com.jsowell.pile.domain.UserFrquentedStationInfo">
<select id="queryUserFrequentedStation" resultType="com.jsowell.pile.domain.UserFrequentedStationInfo">
SELECT
obi.station_id AS stationId,
psi.station_name AS stationName,