autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-06 19:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 查询查询会员申请开票记录

Browse Source
This commit is contained in:
Lemon
2023-11-01 15:11:31 +08:00
parent cb9f6488e1
commit 53415d34dd
7 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -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<OrderInvoiceRecord> orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceRecordList(build);
PageInfo<OrderInvoiceRecord> pageInfo = new PageInfo<>(orderInvoiceRecords);
// List<OrderInvoiceRecord> orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceRecordList(build);
List<OrderInvoiceRecordVO> orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceVOList(build);
PageInfo<OrderInvoiceRecordVO> pageInfo = new PageInfo<>(orderInvoiceRecords);
List<InvoiceRecordVO> 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()
);
}

3
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java
View File

@@ -73,4 +73,7 @@ public interface OrderInvoiceRecordMapper {
public int deleteOrderInvoiceRecordByIds(Integer[] ids);
List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO dto);
List<OrderInvoiceRecordVO> selectInvoiceVOList(QueryInvoiceRecordDTO dto);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java
View File

@@ -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);
/**

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java
View File

@@ -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();

10
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java
View File

@@ -26,5 +26,15 @@ public class InvoiceRecordVO {
*/
private BigDecimal totalElecAmount;
/**
* 运营商名称
*/
private String merchantName;
/**
* 运营商电话
*/
private String merchantTel;
private String createTime;
}

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java
View File

@@ -25,5 +25,8 @@ public class OrderInvoiceRecordVO {
private BigDecimal totalAmount;
private BigDecimal totalServiceAmount;
private BigDecimal totalElecAmount;
/**
* 运营商电话
*/
private String merchantTel;
}

29
jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
View File

@@ -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>