From 5bc349b0321d6058ea859780de6d1bd5a0ffdb35 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 21 七月 2026 14:09:43 +0800
Subject: [PATCH] Merge branch '2.2' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.2
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 55 ++++++++++---------------------------------------------
1 files changed, 10 insertions(+), 45 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 067b852..8970399 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -366,7 +366,7 @@
export.setPhone(dto.getPhone());
export.setOrderStatus(dto.getPayTime() != null ? "订单支付成功" : "订单完成");
export.setStatus(formatPayOrderStatus(dto.getType(), dto.getStatus()));
- export.setRefundStatus(dto.getRefundStatus() != null && dto.getRefundStatus() == 1 ? "有退款" : "无退款");
+ export.setRefundStatus(dto.getRefundStatus() != null && dto.getRefundStatus() > 0 ? "有退款" : "无退款");
export.setRechargeAmount(dto.getRechargeAmount());
export.setPaymentAmount(dto.getPaymentAmount());
export.setFinalAmount(dto.getFinalAmount());
@@ -623,54 +623,19 @@
@PostMapping(value = "/pay/order/refund/list")
@ApiOperation(value = "列表", tags = {"管理后台-支付订单-退款订单"})
public R<PageInfo<TChargingOrderRefund>> refundList(@RequestBody ChargingRefundDto chargingRefundDto) {
- Integer pageCurr = chargingRefundDto.getPageCurr();
- Integer pageSize = chargingRefundDto.getPageSize();
-// R<PageInfo<TChargingOrderRefund>> refundList = chargingOrderService.getRefundList(chargingRefundDto);
- chargingRefundDto.setPageCurr(1);
- chargingRefundDto.setPageSize(199999999);
- R<PageInfo<TChargingOrderRefund>> refundList1 = chargingOrderService.getRefundList(chargingRefundDto);
Long userId = tokenService.getLoginUser().getUserid();
- //如果没传siteId,获取当前登陆人所有的siteIds
- List<Integer> siteIds = new ArrayList<>();
- if (userId != null){
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
+ if (sysUser != null && Integer.valueOf(2).equals(sysUser.getRoleType())) {
+ List<Integer> siteIds = new ArrayList<>();
+ List<GetSiteListDTO> sites = siteClient.getSiteListByUserId(userId).getData();
+ if (sites != null) {
+ for (GetSiteListDTO site : sites) {
+ siteIds.add(site.getId());
}
}
-
- if (siteIds.isEmpty()){
- siteIds.add(-1);
+ chargingRefundDto.setSiteIds(siteIds.isEmpty() ? Collections.singletonList(-1) : siteIds);
}
- // 查询当前登陆人按钮权限
- SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
- Integer roleType = sysUser.getRoleType();
- List<TChargingOrderRefund> tChargingOrderRefunds = new ArrayList<>();
- for (TChargingOrderRefund record : refundList1.getData().getRecords()) {
- if (roleType==1){
- tChargingOrderRefunds.add(record);
- continue;
- }
- if (record.getType()!=1){
- tChargingOrderRefunds.add(record);
- }
- TChargingOrder byId = chargingOrderService.getById(record.getOrderId());
- record.setUid(record.getId().toString());
- if (byId==null){
- continue;
- }
- if (roleType==2&&siteIds.contains(byId.getSiteId())){
-
- tChargingOrderRefunds.add(record);
- }
- }
- PageInfo<TChargingOrderRefund> data = refundList1.getData();
-
- List<TChargingOrderRefund> res1 = testing4(tChargingOrderRefunds.size(), pageCurr, pageSize, tChargingOrderRefunds);
- data.setTotal(tChargingOrderRefunds.size());
- data.setRecords(res1);
- return refundList1;
-
+ return chargingOrderService.getRefundList(chargingRefundDto);
}
--
Gitblit v1.7.1