From 8121d4d29d0d2802954035f20a6d315f25f66fb7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 九月 2024 10:47:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 79 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 31 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 91a8431..4e351db 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
@@ -68,6 +68,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
@@ -428,22 +429,12 @@
/**
* 充电充值支付回调
- * @param request
*/
@ResponseBody
@PostMapping(value = "/chargingOrderWXCallback")
- public void chargingOrderWXCallback(HttpServletRequest request) {
- System.err.println("-------------------支付回调通知-------------------");
- Map<String, Object> data = wxPaymentClient.payNotify(request).getData();
- if (null != data) {
- String out_trade_no = data.get("out_trade_no").toString();
- String transaction_id = data.get("transaction_id").toString();
- String attach = data.get("attach").toString();
- AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(1, out_trade_no, transaction_id, attach);
- if (ajaxResult.isSuccess()) {
- wxPaymentClient.ack();
- }
- }
+ public void chargingOrderWXCallback(@RequestParam("out_trade_no") String out_trade_no, @RequestParam("transaction_id") String transaction_id,
+ @RequestParam("attach") String attach) {
+ AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(1, out_trade_no, transaction_id, attach);
}
@@ -472,19 +463,14 @@
/**
* 远程启动失败后退款回调
- * @param request
*/
@ResponseBody
@PostMapping(value = "/chargingOrderStartupFailureWxRefund")
- public void chargingOrderStartupFailureWxRefund(HttpServletRequest request){
- WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
- if(null != data){
- String out_refund_no = data.getOut_refund_no();
- String refund_id = data.getRefund_id();
- String tradeState = data.getTradeState();
- String success_time = data.getSuccess_time();
- chargingOrderService.chargingOrderStartupFailureWxRefund(out_refund_no, refund_id, tradeState, success_time);
- }
+ public void chargingOrderStartupFailureWxRefund(@RequestParam("out_trade_no") String out_refund_no,
+ @RequestParam("out_trade_no") String refund_id,
+ @RequestParam("out_trade_no") String tradeState,
+ @RequestParam("out_trade_no") String success_time){
+ chargingOrderService.chargingOrderStartupFailureWxRefund(out_refund_no, refund_id, tradeState, success_time);
}
@@ -972,19 +958,50 @@
siteIds.add(statisticsQueryDto.getSiteId());
}
if (statisticsQueryDto.getDayType()==1) {
- List<Map<String,Object>> charMap = chargingOrderService.getHourType(siteIds,statisticsQueryDto);
+ List<Map<String,Object>> charMap1 = chargingOrderService.getHourType(siteIds,statisticsQueryDto);
+ List<Map<String, Object>> charMap = new ArrayList<>();
+ // 生成从 "00:00" 到 "23:00" 的时间数据
+ for (int hour = 0; hour < 24; hour++) {
+ String time = String.format("%02d:00", hour);
+ Map<String, Object> mapWithTimeValue = findMapWithTimeValue(charMap1, time);
+ if (mapWithTimeValue!=null){
+ charMap.add(mapWithTimeValue);
+ }else {
+ Map<String, Object> timeMap = new HashMap<>();
+ timeMap.put("time", time); // 初始化值为 null
+ timeMap.put("electrovalence", 0);
+ timeMap.put("orderCount", 0);
+ timeMap.put("servicecharge", 0);
+ timeMap.put("electricity", 0);
+ charMap.add(timeMap);
+ }
+ }
return R.ok(charMap);
}else if (statisticsQueryDto.getDayType()==2){
List<Map<String,Object>> charMap = chargingOrderService.getDateType(siteIds,statisticsQueryDto);
return R.ok(charMap);
}else if (statisticsQueryDto.getDayType()==3){
List<Map<String,Object>> charMap = chargingOrderService.getMonthType(siteIds,statisticsQueryDto);
- }
+ return R.ok(charMap);
+ }
return R.ok();
}
+
+ private static Map<String, Object> findMapWithTimeValue(List<Map<String, Object>> charMap1,String timeValue) {
+ for (Map<String, Object> map : charMap1) {
+ if (map.containsKey("time") && map.get("time").equals(timeValue)) {
+ return map;
+ }
+ }
+ return null; // 如果没有找到，返回 null
+ }
+
+
+
+
@ResponseBody
@PostMapping(value = "/work/use")
@@ -1020,9 +1037,9 @@
@Resource
private TOrderInvoiceService invoiceService;
@ResponseBody
- @PostMapping(value = "/work/shopOrder")
+ @GetMapping(value = "/work/shopOrder")
@ApiOperation(value = "购物订单统计", tags = {"管理后台-工作台"})
- public R shopOrder(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) {
+ public R shopOrder() {
Long count = shoppingOrderService.lambdaQuery().eq(TShoppingOrder::getStatus, 1).count();
Long count1 = shoppingOrderService.lambdaQuery().eq(TShoppingOrder::getStatus, 2).count();
List<Long> counts = new ArrayList<>();
@@ -1032,9 +1049,9 @@
}
@ResponseBody
- @PostMapping(value = "/work/invoice")
+ @GetMapping(value = "/work/invoice")
@ApiOperation(value = "开票统计", tags = {"管理后台-工作台"})
- public R invoice(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) {
+ public R invoice() {
Long count = invoiceService.lambdaQuery().eq(TOrderInvoice::getStatus, 1).count();
Long count1 = invoiceService.lambdaQuery().eq(TOrderInvoice::getStatus, 3).count();
List<Long> counts = new ArrayList<>();
@@ -1044,9 +1061,9 @@
}
@ResponseBody
- @PostMapping(value = "/work/users/count")
+ @GetMapping(value = "/work/users/count")
@ApiOperation(value = "用户数量", tags = {"管理后台-工作台"})
- public R usersCount(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) {
+ public R usersCount() {
List<Map<String,Object>> userMap = chargingOrderService.countAllUserData();
return R.ok(userMap);
--
Gitblit v1.7.1