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

update 后管计费模板页面

Browse Source
This commit is contained in:
Lemon
2023-08-21 14:38:30 +08:00
parent e3f22f49c1
commit bfb9717912
17 changed files with 167 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
jsowell-pile/src/main/java/com/jsowell/pile/dto/GetInvoiceInfoDTO.java Normal file
View File

@@ -0,0 +1,42 @@
package com.jsowell.pile.dto;
import lombok.Data;
import java.util.List;
/**
* 查询发票列表DTO
*
* @author Lemon
* @Date 2023/8/21 13:50
*/
@Data
public class GetInvoiceInfoDTO {
private Integer pageNum;
private Integer pageSize;
/**
* 会员id
*/
private String memberId;
/**
* 运营商id
*/
private String merchantId;
/**
* 关联订单
*/
private String orderCodes;
/**
* 状态
*/
private String status;
/**
* 运营商部门id（权限校验）
*/
private List<String> merchantDeptIds;
}

1
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java
View File

@@ -3,7 +3,6 @@ package com.jsowell.pile.mapper;
import java.util.List;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.vo.MemberPlateNumberVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java
View File

@@ -3,7 +3,7 @@ package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.MemberWalletLog;
import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
import com.jsowell.pile.vo.MemberBalanceVO;
import com.jsowell.pile.vo.uniapp.MemberBalanceVO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

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

@@ -2,6 +2,9 @@ package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.OrderInvoiceRecord;
import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
import com.jsowell.pile.dto.GetInvoiceInfoDTO;
import com.jsowell.pile.vo.web.OrderInvoiceRecordVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -30,6 +33,13 @@ public interface OrderInvoiceRecordMapper {
*/
public List<OrderInvoiceRecord> selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord);
/**
* 查询申请开票列表(带权限校验)
* @param dto
* @return
*/
List<OrderInvoiceRecordVO> getInvoiceListWithAuth(@Param("dto") GetInvoiceInfoDTO dto);
/**
* 新增申请开票
*

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

@@ -4,7 +4,7 @@ import com.jsowell.pile.domain.MemberBasicInfo;
import com.jsowell.pile.dto.PlatformTesterDTO;
import com.jsowell.pile.dto.QueryMemberInfoDTO;
import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
import com.jsowell.pile.vo.MemberBalanceVO;
import com.jsowell.pile.vo.uniapp.MemberBalanceVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;

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

@@ -2,8 +2,6 @@ package com.jsowell.pile.service;
import java.util.List;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.vo.MemberPlateNumberVO;
import org.apache.ibatis.annotations.Param;
/**
* 用户车牌对应关系Service接口

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

@@ -1,8 +1,10 @@
package com.jsowell.pile.service;
import com.jsowell.pile.domain.OrderInvoiceRecord;
import com.jsowell.pile.dto.GetInvoiceInfoDTO;
import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
import com.jsowell.pile.vo.web.InvoiceRecordVO;
import com.jsowell.pile.vo.web.OrderInvoiceRecordVO;
import java.time.LocalDateTime;
import java.util.List;
@@ -32,6 +34,13 @@ public interface IOrderInvoiceRecordService {
*/
List<OrderInvoiceRecord> selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord);
/**
* 查询申请开票列表(带权限校验)
* @param dto
* @return
*/
List<OrderInvoiceRecordVO> getInvoiceListWithAuth(GetInvoiceInfoDTO dto);
List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO memberId);
List<OrderInvoiceRecord> selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime);

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

@@ -19,7 +19,7 @@ import com.jsowell.pile.mapper.MemberWalletInfoMapper;
import com.jsowell.pile.mapper.MemberWalletLogMapper;
import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.service.IPileBasicInfoService;
import com.jsowell.pile.vo.MemberBalanceVO;
import com.jsowell.pile.vo.uniapp.MemberBalanceVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;

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

@@ -1,8 +1,11 @@
package com.jsowell.pile.service.impl;
import com.google.common.collect.Lists;
import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.pile.domain.OrderInvoiceRecord;
import com.jsowell.pile.dto.GetInvoiceInfoDTO;
import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
import com.jsowell.pile.mapper.OrderInvoiceRecordMapper;
import com.jsowell.pile.service.IMemberInvoiceTitleService;
@@ -11,10 +14,13 @@ import com.jsowell.pile.service.IOrderInvoiceRecordService;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.uniapp.InvoiceTitleVO;
import com.jsowell.pile.vo.web.InvoiceRecordVO;
import com.jsowell.pile.vo.web.OrderInvoiceRecordVO;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
/**
@@ -81,6 +87,25 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService
return orderInvoiceRecordMapper.selectOrderInvoiceRecordList(orderInvoiceRecord);
}
/**
* 查询申请开票列表(带权限校验)
* @param dto
* @return
*/
@Override
public List<OrderInvoiceRecordVO> getInvoiceListWithAuth(GetInvoiceInfoDTO dto) {
// 获取登录账号信息
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
if (authorizedMap == null) {
return new ArrayList<>();
}
List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
dto.setMerchantDeptIds(merchantDeptIds);
}
return orderInvoiceRecordMapper.getInvoiceListWithAuth(dto);
}
@Override
public List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO dto) {
return orderInvoiceRecordMapper.selectInvoiceRecordList(dto);

2
jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberBalanceVO.java → jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberBalanceVO.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.pile.vo;
package com.jsowell.pile.vo.uniapp;
import lombok.Data;

2
jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java → jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberPlateNumberVO.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.pile.vo;
package com.jsowell.pile.vo.uniapp;
import com.jsowell.common.annotation.Excel;
import lombok.Data;

27
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java Normal file
View File

@@ -0,0 +1,27 @@
package com.jsowell.pile.vo.web;
import lombok.Data;
import java.math.BigDecimal;
/**
* TODO
*
* @author Lemon
* @Date 2023/8/21 13:26
*/
@Data
public class OrderInvoiceRecordVO {
private String id;
private String memberId;
private String merchantId;
private String merchantName;
private String titleId;
private String email;
private String orderCodes;
private String status;
private BigDecimal totalAmount;
private BigDecimal totalServiceAmount;
private BigDecimal totalElecAmount;
}