autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +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()
);
}