From 53415d34dd6895b0c5a8789c1e081ffa9feba5e2 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 1 Nov 2023 15:11:31 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=9F=A5=E8=AF=A2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=9A=E5=91=98=E7=94=B3=E8=AF=B7=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 25 ++++++++-------- .../pile/mapper/OrderInvoiceRecordMapper.java | 3 ++ .../service/IOrderInvoiceRecordService.java | 2 ++ .../impl/OrderInvoiceRecordServiceImpl.java | 5 ++++ .../pile/vo/uniapp/InvoiceRecordVO.java | 10 +++++++ .../pile/vo/web/OrderInvoiceRecordVO.java | 5 +++- .../mapper/pile/OrderInvoiceRecordMapper.xml | 29 +++++++++++++++++++ 7 files changed, 66 insertions(+), 13 deletions(-) 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 2b82c55e0..3677c2cb4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -44,10 +44,8 @@ import com.jsowell.pile.vo.base.OrderPeriodAmountVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.uniapp.*; -import com.jsowell.pile.vo.web.OrderDetailInfoVO; -import com.jsowell.pile.vo.web.PileStationVO; -import com.jsowell.pile.vo.web.PlatformTesterVO; -import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; +import com.jsowell.pile.vo.uniapp.InvoiceRecordVO; +import com.jsowell.pile.vo.web.*; import com.jsowell.wxpay.response.WechatPayNotifyParameter; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; @@ -891,17 +889,20 @@ public class OrderService { int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo(); int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize(); PageHelper.startPage(pageNo, pageSize); - List orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceRecordList(build); - PageInfo pageInfo = new PageInfo<>(orderInvoiceRecords); + // List orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceRecordList(build); + List orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceVOList(build); + PageInfo pageInfo = new PageInfo<>(orderInvoiceRecords); List volist = Lists.newArrayList(); - for (OrderInvoiceRecord orderInvoiceRecord : orderInvoiceRecords) { + for (OrderInvoiceRecordVO vo : orderInvoiceRecords) { volist.add( InvoiceRecordVO.builder() - .status(InvoiceRecordEnum.getLabel(orderInvoiceRecord.getStatus())) - .totalAmount(orderInvoiceRecord.getTotalAmount()) - .totalElecAmount(orderInvoiceRecord.getTotalElecAmount()) - .totalServiceAmount(orderInvoiceRecord.getTotalServiceAmount()) - .createTime(DateUtils.formatDateTime(orderInvoiceRecord.getCreateTime())) + .status(InvoiceRecordEnum.getLabel(vo.getStatus())) + .totalAmount(vo.getTotalAmount()) + .totalElecAmount(vo.getTotalElecAmount()) + .totalServiceAmount(vo.getTotalServiceAmount()) + .merchantName(vo.getMerchantName()) + .merchantTel(vo.getMerchantTel()) + .createTime(vo.getCreateTime()) .build() ); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java index 543ce5911..1d65da833 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java @@ -73,4 +73,7 @@ public interface OrderInvoiceRecordMapper { public int deleteOrderInvoiceRecordByIds(Integer[] ids); List selectInvoiceRecordList(QueryInvoiceRecordDTO dto); + + + List selectInvoiceVOList(QueryInvoiceRecordDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java index d568889b6..b4740295f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java @@ -43,6 +43,8 @@ public interface IOrderInvoiceRecordService { List selectInvoiceRecordList(QueryInvoiceRecordDTO memberId); + List selectInvoiceVOList(QueryInvoiceRecordDTO memberId); + List selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime); /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java index 69814d6c5..c546ce5e3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java @@ -111,6 +111,11 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService return orderInvoiceRecordMapper.selectInvoiceRecordList(dto); } + @Override + public List selectInvoiceVOList(QueryInvoiceRecordDTO dto) { + return orderInvoiceRecordMapper.selectInvoiceVOList(dto); + } + @Override public List selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime) { QueryInvoiceRecordDTO dto = new QueryInvoiceRecordDTO(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java index 244735eaa..3e55fbf30 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java @@ -26,5 +26,15 @@ public class InvoiceRecordVO { */ private BigDecimal totalElecAmount; + /** + * 运营商名称 + */ + private String merchantName; + + /** + * 运营商电话 + */ + private String merchantTel; + private String createTime; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java index 8b72e1248..11e3d9287 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java @@ -25,5 +25,8 @@ public class OrderInvoiceRecordVO { private BigDecimal totalAmount; private BigDecimal totalServiceAmount; private BigDecimal totalElecAmount; - + /** + * 运营商电话 + */ + private String merchantTel; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml index d49414900..0c5b26bb2 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml @@ -138,6 +138,8 @@ + + + \ No newline at end of file