From 0db8547f34c3671c97a23b65a0627e88319aa209 Mon Sep 17 00:00:00 2001 From: jkcdev Date: Fri, 23 May 2025 14:22:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=BF=90=E8=90=A5=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E7=94=A8=E6=88=B7=E8=AE=A2=E5=8D=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/res/RefundRecordListDto.java | 5 ++ .../service/impl/EbikeRefundServiceImpl.java | 53 ++++++++++++++++--- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/res/RefundRecordListDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/res/RefundRecordListDto.java index 2655ce78..727e6db5 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/res/RefundRecordListDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/res/RefundRecordListDto.java @@ -36,6 +36,11 @@ public class RefundRecordListDto { */ private String phone; + /** + * 车辆编号 + */ + private String ebikeCode; + /** * 实付金额 */ diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java index 407acb48..65871a3e 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java @@ -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 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 getApplyingList(ReqRefundQueryDto refundDto) { QueryWrapper query = QueryWrapper.create() @@ -130,7 +161,9 @@ public class EbikeRefundServiceImpl extends ServiceImpl page = refundDto.getPageParam().getPage(); - return pageAs(page, query, ResApplyRefundDto.class); + Page 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 page = refundDto.getPageParam().getPage(); - return pageAs(page, query, ResHandleRefundDto.class); + Page 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 page = refundDto.getPageParam().getPage(); - return pageAs(page, query, ResProcessedRefundDto.class); + Page 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 page = refundDto.getPageParam().getPage(); - return pageAs(page, query, ResCloseRefundDto.class); + Page 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 page = reqRefundRecordDto.getPageParam().getPage(); - return pageAs(page, query, RefundRecordListDto.class); + Page list = pageAs(page, query, RefundRecordListDto.class); + list.getRecords().forEach(item -> item.setOperate(getOperationArea(item.getEbikeCode()))); + return list; } @Override public Page getRefundOrderRecords(ReqUserQueryDto reqRefundRecordDto) { - + return null; } }