From d6e09bae199e8980f97dd4cdd2000ab6c2b7f06b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 22 五月 2026 10:10:51 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 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 972893d..c22641d 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
@@ -1,6 +1,6 @@
package com.ruoyi.order.controller;
import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.math.BigDecimal;
@@ -24,7 +24,6 @@
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
@@ -34,12 +33,6 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.integration.api.model.PageChargingOrderAndUploadRealTimeMonitoringDataDto;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
-import com.ruoyi.integration.api.model.ChargingOrderAndUploadRealTimeMonitoringDataDto;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringPageData;
import com.ruoyi.order.api.dto.ChargingStatisticeDTO;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
@@ -61,12 +54,12 @@
import com.ruoyi.order.util.mongodb.service.UploadRealTimeMonitoringDataService;
import com.ruoyi.order.vo.EndOfChargePageInfo;
import com.ruoyi.order.vo.StatisticsOfBatteryVO;
+import com.ruoyi.order.vo.UpdateOrderPaymentAmountDto;
import com.ruoyi.order.vo.WatchChargingOrderVo;
import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
-import com.ruoyi.payment.api.vo.AliQueryOrder;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.feignClient.SysUserRoleClient;
@@ -79,11 +72,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
@@ -2365,5 +2354,55 @@
}
+ /**
+ * 手动查询订单和退款数据，完善退款记录
+ * @param orderId
+ * @param refund_out_trade_no
+ * @return
+ */
+ @PostMapping("/orderQueryRefund")
+ public R<?> orderQueryRefund(@RequestParam("orderId") Long orderId, @RequestParam("refund_out_trade_no") String refund_out_trade_no){
+ chargingOrderService.orderQueryRefund(orderId, refund_out_trade_no);
+ return R.ok();
+ }
+ /**
+ * 手动查询订单和退款数据，批量完善退款记录
+ * @return
+ */
+ @PostMapping("/orderQueryRefundList")
+ public R<?> orderQueryRefundList(@RequestBody List<String> dto){
+ for (String s : dto) {
+ String[] split = s.split(",");
+ chargingOrderService.orderQueryRefund(Long.valueOf(split[0]), split[1]);
+ }
+ return R.ok();
+ }
+
+
+ /**
+ * 手动添加完善订单费用明细
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/addOrderExpenseBreakdown")
+ public R<?> addOrderExpenseBreakdown(@RequestParam("orderId") Long orderId){
+ chargingOrderService.addOrderExpenseBreakdown(orderId);
+ return R.ok();
+ }
+
+
+ /**
+ * 手动批量修改订单支付金额
+ * @param dtos
+ * @return
+ */
+ @PostMapping("/updateOrderPaymentAmount")
+ public R<?> updateOrderPaymentAmount(@RequestBody List<UpdateOrderPaymentAmountDto> dtos){
+ for (UpdateOrderPaymentAmountDto dto : dtos) {
+ chargingOrderService.update(new UpdateWrapper<TChargingOrder>().eq("id", dto.getOrderId())
+ .set("payment_amount", dto.getPaymentAmount()));
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1