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:
autumn.g@foxmail.com
2023-08-07 10:01:14 +08:00
parent 9d6f71ef0b
commit 8164dad053
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,8 @@ public interface IOrderBasicInfoService {
*/
OrderBasicInfo getOrderBasicInfo(OrderBasicInfo info);
List<OrderListVO> selectOrderBasicInfoListWithAuth(QueryOrderDTO dto);
/**
* 查询订单列表
*

30
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -183,13 +183,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 查询订单列表
*
* 带权限过滤
* @param dto 订单
* @return 订单
*/
@Override
// @DataScope(deptAlias = "t3")
public List<OrderListVO> selectOrderBasicInfoList(QueryOrderDTO dto) {
public List<OrderListVO> selectOrderBasicInfoListWithAuth(QueryOrderDTO dto) {
// 权限过滤
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
if (authorizedMap == null) {
@@ -198,6 +197,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
dto.setStationDeptIds(authorizedMap.getStationDeptIds());
dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
return selectOrderBasicInfoList(dto);
}
/**
* 查询订单列表
* 无权限过滤
* @param dto 订单
* @return 订单
*/
@Override
public List<OrderListVO> selectOrderBasicInfoList(QueryOrderDTO dto) {
List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
if (CollectionUtils.isEmpty(orderListVOS)) {
return orderListVOS;
@@ -246,10 +256,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
if (orderAmount.compareTo(BigDecimal.ZERO) > 0) {
if (StringUtils.equals(orderListVO.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) {
/*
余额支付 查询支付记录，如全部用本金支付，则虚拟金额为0，结算金额为订单消费金额，
如果使用了赠送金额，虚拟金额为赠送金额支付部分，结算金额=订单消费金额-虚拟金额消费部分
*/
/*
余额支付 查询支付记录，如全部用本金支付，则虚拟金额为0，结算金额为订单消费金额，
如果使用了赠送金额，虚拟金额为赠送金额支付部分，结算金额=订单消费金额-虚拟金额消费部分
*/
// 查询支付记录
List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderListVO.getOrderCode());
for (OrderPayRecord orderPayRecord : orderPayRecordList) {
@@ -269,9 +279,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
}
} else {
/*
微信支付 虚拟金额为0 结算金额等于订单消费金额
*/
/*
微信支付 虚拟金额为0 结算金额等于订单消费金额
*/
settleAmount = orderAmount;
}
}