mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-11 21:40:19 +08:00
update 查询申请开票详情新增 会员手机号码
This commit is contained in:
@@ -23,7 +23,7 @@ public interface OrderInvoiceRecordMapper {
|
|||||||
* @param id 申请开票主键
|
* @param id 申请开票主键
|
||||||
* @return 申请开票
|
* @return 申请开票
|
||||||
*/
|
*/
|
||||||
public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id);
|
public OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询申请开票列表
|
* 查询申请开票列表
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public interface IOrderInvoiceRecordService {
|
|||||||
* @param id 申请开票主键
|
* @param id 申请开票主键
|
||||||
* @return 申请开票
|
* @return 申请开票
|
||||||
*/
|
*/
|
||||||
OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id);
|
OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id);
|
||||||
|
|
||||||
InvoiceRecordVO selectInvoiceTitleVO(Integer id);
|
InvoiceRecordVO selectInvoiceTitleVO(Integer id);
|
||||||
|
|
||||||
|
|||||||
@@ -47,32 +47,33 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService
|
|||||||
* @return 申请开票
|
* @return 申请开票
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id) {
|
public OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id) {
|
||||||
return orderInvoiceRecordMapper.selectOrderInvoiceRecordById(id);
|
return orderInvoiceRecordMapper.selectOrderInvoiceRecordById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public InvoiceRecordVO selectInvoiceTitleVO(Integer id) {
|
public InvoiceRecordVO selectInvoiceTitleVO(Integer id) {
|
||||||
// 申请记录信息
|
// 申请记录信息
|
||||||
OrderInvoiceRecord orderInvoiceRecord = selectOrderInvoiceRecordById(id);
|
OrderInvoiceRecordVO vo = selectOrderInvoiceRecordById(id);
|
||||||
if (orderInvoiceRecord == null) {
|
if (vo == null) {
|
||||||
return 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);
|
List<OrderAmountDetailVO> orderAmountDetailVOS = orderBasicInfoService.queryOrderAmountDetail(orderCodes);
|
||||||
|
|
||||||
return InvoiceRecordVO.builder()
|
return InvoiceRecordVO.builder()
|
||||||
.id(orderInvoiceRecord.getId() + "")
|
.id(vo.getId() + "")
|
||||||
.memberId(orderInvoiceRecord.getMemberId())
|
.memberId(vo.getMemberId())
|
||||||
.status(orderInvoiceRecord.getStatus())
|
.phoneNumber(vo.getPhoneNumber())
|
||||||
|
.status(vo.getStatus())
|
||||||
.invoiceTitle(invoiceTitleVO)
|
.invoiceTitle(invoiceTitleVO)
|
||||||
.orderList(orderAmountDetailVOS)
|
.orderList(orderAmountDetailVOS)
|
||||||
.createTime(DateUtils.formatDateTime(orderInvoiceRecord.getCreateTime()))
|
.createTime(vo.getCreateTime())
|
||||||
.updateTime(DateUtils.formatDateTime(orderInvoiceRecord.getUpdateTime()))
|
.updateTime(vo.getUpdateTime())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,11 @@ public class InvoiceRecordVO {
|
|||||||
*/
|
*/
|
||||||
private String memberId;
|
private String memberId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会员手机号码
|
||||||
|
*/
|
||||||
|
private String phoneNumber;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 状态 0-未开票 1-已开票
|
* 状态 0-未开票 1-已开票
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -29,4 +29,9 @@ public class OrderInvoiceRecordVO {
|
|||||||
* 运营商电话
|
* 运营商电话
|
||||||
*/
|
*/
|
||||||
private String merchantTel;
|
private String merchantTel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会员手机号码
|
||||||
|
*/
|
||||||
|
private String phoneNumber;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,10 +49,7 @@
|
|||||||
order by create_time desc
|
order by create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectOrderInvoiceRecordById" parameterType="Integer" resultMap="OrderInvoiceRecordResult">
|
|
||||||
<include refid="selectOrderInvoiceRecordVo"/>
|
|
||||||
where id = #{id}
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<insert id="insertOrderInvoiceRecord" parameterType="com.jsowell.pile.domain.OrderInvoiceRecord" useGeneratedKeys="true" keyProperty="id">
|
<insert id="insertOrderInvoiceRecord" parameterType="com.jsowell.pile.domain.OrderInvoiceRecord" useGeneratedKeys="true" keyProperty="id">
|
||||||
insert into order_invoice_record
|
insert into order_invoice_record
|
||||||
@@ -199,4 +196,24 @@
|
|||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="selectOrderInvoiceRecordById" resultType="com.jsowell.pile.vo.web.OrderInvoiceRecordVO">
|
||||||
|
SELECT
|
||||||
|
t1.id,
|
||||||
|
t1.member_id as memberId,
|
||||||
|
t2.mobile_number AS phoneNumber,
|
||||||
|
t1.merchant_id AS merchantId,
|
||||||
|
t1.title_id AS titleId,
|
||||||
|
t1.order_codes AS orderCodes,
|
||||||
|
t1.STATUS,
|
||||||
|
t1.total_amount AS totalAmount,
|
||||||
|
t1.total_service_amount AS totalServiceAmount,
|
||||||
|
t1.total_elec_amount AS totalElecAmount,
|
||||||
|
t1.create_time AS createTime
|
||||||
|
FROM
|
||||||
|
order_invoice_record t1
|
||||||
|
JOIN member_basic_info t2 ON t1.member_id = t2.member_id
|
||||||
|
AND t1.del_flag = '0'
|
||||||
|
where t1.id = #{id,jdbcType=INTEGER}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
Reference in New Issue
Block a user