attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补充运营区域获取，增加退款用户订单记录接口

Browse Source
This commit is contained in:
jkcdev 2025-05-23 14:22:07 +08:00
parent 192a39681f
commit 0db8547f34
2 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ebike-payment/src/main/java/com/cdzy/payment/model/dto/res/RefundRecordListDto.java
View File

@ -36,6 +36,11 @@ public class RefundRecordListDto {
*/
private String phone;
/**
* 车辆编号
*/
private String ebikeCode;
/**
* 实付金额
*/

53
ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
View File

@ -1,11 +1,17 @@
package com.cdzy.payment.service.impl;
import com.alibaba.fastjson2.JSON;
import com.cdzy.common.model.JsonResult;
import com.cdzy.payment.model.dto.req.ReqRefundQueryDto;
import com.cdzy.payment.model.dto.req.ReqUserQueryDto;
import com.cdzy.payment.model.dto.res.*;
import com.cdzy.payment.model.enums.PayMethod;
import com.cdzy.payment.utils.StringUtils;
import com.ebike.feign.clients.MaintenanceFeignClient;
import com.ebike.feign.clients.OperateFeignClient;
import com.ebike.feign.clients.OrdersFeignClient;
import com.ebike.feign.model.rsp.EbikeBikeBaseInfo;
import com.ebike.feign.model.rsp.FeignEbikeRegionDto;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryMethods;
import com.mybatisflex.core.query.QueryWrapper;
@ -38,6 +44,10 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
@Resource
private OrdersFeignClient ordersFeignClient;
@Resource
private MaintenanceFeignClient maintenanceFeignClient;
@Resource
private OperateFeignClient operateFeignClient;
@Override
public Boolean saveRefundResult(EbikeRefund ebikeRefund) {
@ -101,6 +111,27 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
return updateById(ebikeRefund);
}
/**
* 获取车辆运营区域
*
* @param bikeCode 车辆编码
* @return 运营区域
*/
private String getOperationArea(String bikeCode) {
if (bikeCode == null || bikeCode.isEmpty())
return null;
JsonResult<?> bikeInfo = maintenanceFeignClient.getBikeBaseInfoByCode(bikeCode);
if (bikeInfo.getCode() == 200) {
EbikeBikeBaseInfo bikeBaseInfo = JSON.parseObject(JSON.toJSONString(bikeInfo.getData()), EbikeBikeBaseInfo.class);
JsonResult<?> areaInfo = operateFeignClient.getOperationById(Long.valueOf(bikeBaseInfo.getReginId()));
if (areaInfo.getCode() == 200) {
FeignEbikeRegionDto regionDto = JSON.parseObject(JSON.toJSONString(areaInfo.getData()), FeignEbikeRegionDto.class);
return regionDto.getOperationRegionName();
}
}
return null;
}
@Override
public Page<ResApplyRefundDto> getApplyingList(ReqRefundQueryDto refundDto) {
QueryWrapper query = QueryWrapper.create()
@ -130,7 +161,9 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
query.and(EBIKE_REFUND.REFUND_TIME.le(refundDto.getRefundTime().get(1)));
}
Page<ResApplyRefundDto> page = refundDto.getPageParam().getPage();
return pageAs(page, query, ResApplyRefundDto.class);
Page<ResApplyRefundDto> list = pageAs(page, query, ResApplyRefundDto.class);
list.getRecords().forEach(item -> item.setOperationArea(getOperationArea(item.getEbikeCode())));
return list;
}
@Override
@ -166,7 +199,9 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
query.and(EBIKE_REFUND.REFUND_TIME.le(refundDto.getRefundTime().get(1)));
}
Page<ResHandleRefundDto> page = refundDto.getPageParam().getPage();
return pageAs(page, query, ResHandleRefundDto.class);
Page<ResHandleRefundDto> list = pageAs(page, query, ResHandleRefundDto.class);
list.getRecords().forEach(item -> item.setOperationArea(getOperationArea(item.getEbikeCode())));
return list;
}
@Override
@ -207,7 +242,9 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
query.and(EBIKE_REFUND.REFUND_TIME.le(refundDto.getRefundTime().get(1)));
}
Page<ResProcessedRefundDto> page = refundDto.getPageParam().getPage();
return pageAs(page, query, ResProcessedRefundDto.class);
Page<ResProcessedRefundDto> list = pageAs(page, query, ResProcessedRefundDto.class);
list.getRecords().forEach(item -> item.setOperationArea(getOperationArea(item.getEbikeCode())));
return list;
}
@Override
@ -244,7 +281,9 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
query.and(EBIKE_REFUND.REFUND_TIME.le(refundDto.getRefundTime().get(1)));
}
Page<ResCloseRefundDto> page = refundDto.getPageParam().getPage();
return pageAs(page, query, ResCloseRefundDto.class);
Page<ResCloseRefundDto> list = pageAs(page, query, ResCloseRefundDto.class);
list.getRecords().forEach(item -> item.setOperationArea(getOperationArea(item.getEbikeCode())));
return list;
}
@Override
@ -330,12 +369,14 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
.leftJoin(EBIKE_USER).on(EBIKE_USER.USER_ID.eq(EBIKE_USER_ORDERS.USER_ID))
.where(EBIKE_USER.MOBILE.eq(reqRefundRecordDto.getPhone()));
Page<RefundRecordListDto> page = reqRefundRecordDto.getPageParam().getPage();
return pageAs(page, query, RefundRecordListDto.class);
Page<RefundRecordListDto> list = pageAs(page, query, RefundRecordListDto.class);
list.getRecords().forEach(item -> item.setOperate(getOperationArea(item.getEbikeCode())));
return list;
}
@Override
public Page<OrderRecord> getRefundOrderRecords(ReqUserQueryDto reqRefundRecordDto) {
return null;
}
}