mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 19:15:35 +08:00
update 查询申请开票详情新增 会员手机号码
This commit is contained in:
@@ -23,7 +23,7 @@ public interface OrderInvoiceRecordMapper {
|
||||
* @param id 申请开票主键
|
||||
* @return 申请开票
|
||||
*/
|
||||
public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id);
|
||||
public OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id);
|
||||
|
||||
/**
|
||||
* 查询申请开票列表
|
||||
|
||||
@@ -22,7 +22,7 @@ public interface IOrderInvoiceRecordService {
|
||||
* @param id 申请开票主键
|
||||
* @return 申请开票
|
||||
*/
|
||||
OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id);
|
||||
OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id);
|
||||
|
||||
InvoiceRecordVO selectInvoiceTitleVO(Integer id);
|
||||
|
||||
|
||||
@@ -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<String> orderCodes = Lists.newArrayList(orderInvoiceRecord.getOrderCodes().split(","));
|
||||
List<String> orderCodes = Lists.newArrayList(vo.getOrderCodes().split(","));
|
||||
List<OrderAmountDetailVO> 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();
|
||||
}
|
||||
|
||||
|
||||
@@ -24,6 +24,11 @@ public class InvoiceRecordVO {
|
||||
*/
|
||||
private String memberId;
|
||||
|
||||
/**
|
||||
* 会员手机号码
|
||||
*/
|
||||
private String phoneNumber;
|
||||
|
||||
/**
|
||||
* 状态 0-未开票 1-已开票
|
||||
*/
|
||||
|
||||
@@ -29,4 +29,9 @@ public class OrderInvoiceRecordVO {
|
||||
* 运营商电话
|
||||
*/
|
||||
private String merchantTel;
|
||||
|
||||
/**
|
||||
* 会员手机号码
|
||||
*/
|
||||
private String phoneNumber;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user