mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-03 17:40:13 +08:00
update 查询查询会员申请开票记录
This commit is contained in:
@@ -73,4 +73,7 @@ public interface OrderInvoiceRecordMapper {
|
||||
public int deleteOrderInvoiceRecordByIds(Integer[] ids);
|
||||
|
||||
List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO dto);
|
||||
|
||||
|
||||
List<OrderInvoiceRecordVO> selectInvoiceVOList(QueryInvoiceRecordDTO dto);
|
||||
}
|
||||
|
||||
@@ -43,6 +43,8 @@ public interface IOrderInvoiceRecordService {
|
||||
|
||||
List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO memberId);
|
||||
|
||||
List<OrderInvoiceRecordVO> selectInvoiceVOList(QueryInvoiceRecordDTO memberId);
|
||||
|
||||
List<OrderInvoiceRecord> selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
|
||||
@@ -111,6 +111,11 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService
|
||||
return orderInvoiceRecordMapper.selectInvoiceRecordList(dto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OrderInvoiceRecordVO> selectInvoiceVOList(QueryInvoiceRecordDTO dto) {
|
||||
return orderInvoiceRecordMapper.selectInvoiceVOList(dto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OrderInvoiceRecord> selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime) {
|
||||
QueryInvoiceRecordDTO dto = new QueryInvoiceRecordDTO();
|
||||
|
||||
@@ -26,5 +26,15 @@ public class InvoiceRecordVO {
|
||||
*/
|
||||
private BigDecimal totalElecAmount;
|
||||
|
||||
/**
|
||||
* 运营商名称
|
||||
*/
|
||||
private String merchantName;
|
||||
|
||||
/**
|
||||
* 运营商电话
|
||||
*/
|
||||
private String merchantTel;
|
||||
|
||||
private String createTime;
|
||||
}
|
||||
|
||||
@@ -25,5 +25,8 @@ public class OrderInvoiceRecordVO {
|
||||
private BigDecimal totalAmount;
|
||||
private BigDecimal totalServiceAmount;
|
||||
private BigDecimal totalElecAmount;
|
||||
|
||||
/**
|
||||
* 运营商电话
|
||||
*/
|
||||
private String merchantTel;
|
||||
}
|
||||
|
||||
@@ -138,6 +138,8 @@
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<select id="getInvoiceListWithAuth" resultType="com.jsowell.pile.vo.web.OrderInvoiceRecordVO">
|
||||
SELECT
|
||||
t1.id,
|
||||
@@ -170,4 +172,31 @@
|
||||
order by t1.create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectInvoiceVOList" resultType="com.jsowell.pile.vo.web.OrderInvoiceRecordVO">
|
||||
SELECT
|
||||
t1.member_id,
|
||||
t1.merchant_id AS merchantId,
|
||||
t2.merchant_name AS merchantName,
|
||||
t2.service_phone AS merchantTel,
|
||||
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 pile_merchant_info t2 ON t1.merchant_id = t2.id
|
||||
AND t1.del_flag = '0'
|
||||
<where>
|
||||
<if test="memberId != null and memberId != ''">
|
||||
and t1.member_id = #{memberId,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="startTime != null">
|
||||
and t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=TIMESTAMP}
|
||||
</if>
|
||||
<if test="endTime != null">
|
||||
and t1.create_time <![CDATA[ <= ]]> #{startTime,jdbcType=TIMESTAMP}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user