From b905a6c0f13bd57ca5dd3c4eb99e8e80ea75f3b6 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 1 Nov 2023 16:41:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=9F=A5=E8=AF=A2=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=BC=80=E7=A5=A8=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=E4=BC=9A=E5=91=98=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/mapper/OrderInvoiceRecordMapper.java | 2 +- .../service/IOrderInvoiceRecordService.java | 2 +- .../impl/OrderInvoiceRecordServiceImpl.java | 21 ++++++++-------- .../jsowell/pile/vo/web/InvoiceRecordVO.java | 5 ++++ .../pile/vo/web/OrderInvoiceRecordVO.java | 5 ++++ .../mapper/pile/OrderInvoiceRecordMapper.xml | 25 ++++++++++++++++--- 6 files changed, 44 insertions(+), 16 deletions(-) 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 1d65da833..5e06642b8 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 @@ -23,7 +23,7 @@ public interface OrderInvoiceRecordMapper { * @param id 申请开票主键 * @return 申请开票 */ - public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id); + public OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id); /** * 查询申请开票列表 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 b4740295f..70639d25c 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 @@ -22,7 +22,7 @@ public interface IOrderInvoiceRecordService { * @param id 申请开票主键 * @return 申请开票 */ - OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id); + OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id); InvoiceRecordVO selectInvoiceTitleVO(Integer id); 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 c546ce5e3..6429b0950 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 @@ -47,32 +47,33 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService * @return 申请开票 */ @Override - public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id) { + public OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id) { return orderInvoiceRecordMapper.selectOrderInvoiceRecordById(id); } @Override public InvoiceRecordVO selectInvoiceTitleVO(Integer id) { // 申请记录信息 - OrderInvoiceRecord orderInvoiceRecord = selectOrderInvoiceRecordById(id); - if (orderInvoiceRecord == null) { + OrderInvoiceRecordVO vo = selectOrderInvoiceRecordById(id); + if (vo == null) { return null; } // 发票抬头信息 - InvoiceTitleVO invoiceTitleVO = memberInvoiceTitleService.selectByTitleId(orderInvoiceRecord.getTitleId()); + InvoiceTitleVO invoiceTitleVO = memberInvoiceTitleService.selectByTitleId(vo.getTitleId()); // 订单信息 - List orderCodes = Lists.newArrayList(orderInvoiceRecord.getOrderCodes().split(",")); + List orderCodes = Lists.newArrayList(vo.getOrderCodes().split(",")); List orderAmountDetailVOS = orderBasicInfoService.queryOrderAmountDetail(orderCodes); return InvoiceRecordVO.builder() - .id(orderInvoiceRecord.getId() + "") - .memberId(orderInvoiceRecord.getMemberId()) - .status(orderInvoiceRecord.getStatus()) + .id(vo.getId() + "") + .memberId(vo.getMemberId()) + .phoneNumber(vo.getPhoneNumber()) + .status(vo.getStatus()) .invoiceTitle(invoiceTitleVO) .orderList(orderAmountDetailVOS) - .createTime(DateUtils.formatDateTime(orderInvoiceRecord.getCreateTime())) - .updateTime(DateUtils.formatDateTime(orderInvoiceRecord.getUpdateTime())) + .createTime(vo.getCreateTime()) + .updateTime(vo.getUpdateTime()) .build(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java index 1d2ddc787..6c10d39a9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java @@ -24,6 +24,11 @@ public class InvoiceRecordVO { */ private String memberId; + /** + * 会员手机号码 + */ + private String phoneNumber; + /** * 状态 0-未开票 1-已开票 */ 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 11e3d9287..b59a027da 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 @@ -29,4 +29,9 @@ public class OrderInvoiceRecordVO { * 运营商电话 */ private String merchantTel; + + /** + * 会员手机号码 + */ + private String phoneNumber; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml index 0c5b26bb2..b4195cf06 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml @@ -49,10 +49,7 @@ order by create_time desc - + insert into order_invoice_record @@ -199,4 +196,24 @@ + + \ No newline at end of file