autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-23 00:29:46 +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

4
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -62,7 +62,7 @@ public class OrderBasicInfoController extends BaseController {
dto.setMerchantId(String.valueOf(pileMerchantInfo.getId())); dto.setMerchantId(String.valueOf(pileMerchantInfo.getId()));
} }
startPage(); startPage();
List<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoList(dto); List<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoListWithAuth(dto);
return getDataTable(list); return getDataTable(list);
} }
@@ -106,7 +106,7 @@ public class OrderBasicInfoController extends BaseController {
if (pileMerchantInfo != null) { if (pileMerchantInfo != null) {
orderBasicInfo.setMerchantId(String.valueOf(pileMerchantInfo.getId())); orderBasicInfo.setMerchantId(String.valueOf(pileMerchantInfo.getId()));
} }
List<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoList(orderBasicInfo); List<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoListWithAuth(orderBasicInfo);
ExcelUtil<OrderListVO> util = new ExcelUtil<OrderListVO>(OrderListVO.class); ExcelUtil<OrderListVO> util = new ExcelUtil<OrderListVO>(OrderListVO.class);
util.exportExcel(response, list, "订单数据"); util.exportExcel(response, list, "订单数据");
} }

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