From f4c42ef27bf35c59dc7f23e49e8f7671b4baa378 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 12 十二月 2024 16:20:02 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 1f35f33..6ca02c4 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.google.api.client.http.UrlEncodedParser;
+import com.stylefeng.guns.core.util.MD5Util;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.CharteredCar.server.IOrderCharteredCarService;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
@@ -662,31 +663,7 @@
})
public ResultUtil queryTrack_(Integer orderId, Integer orderType){
try {
- List<Map<String, Object>> list = new ArrayList<>();
- switch (orderType){
- case 1:
- OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
- Map<String, Object> map = new HashMap<>();
- map.put("lon", orderPrivateCar.getStartLon());
- map.put("lat", orderPrivateCar.getStartLat());
- list.add(map);
- map = new HashMap<>();
- map.put("lon", orderPrivateCar.getEndLon());
- map.put("lat", orderPrivateCar.getEndLat());
- list.add(map);
- break;
- case 4:
- OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
- Map<String, Object> map1 = new HashMap<>();
- map1.put("lon", orderLogistics.getStartLon());
- map1.put("lat", orderLogistics.getStartLat());
- list.add(map1);
- map1 = new HashMap<>();
- map1.put("lon", orderLogistics.getEndLon());
- map1.put("lat", orderLogistics.getEndLat());
- list.add(map1);
- break;
- }
+ List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, orderType);
return ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
@@ -1044,6 +1021,13 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ String format = String.format("uid=%s&id=%s&orderType=%s&payType=%s&type=%s", uid, id, orderType, payType, type);
+ String key = MD5Util.encrypt(format);
+ String value = redisUtil.getValue(key);
+ if(ToolUtil.isNotEmpty(value) && (System.currentTimeMillis() - Long.valueOf(value)) <= 1000){
+ return ResultUtil.error(language == 1 ? "请勿重复操作" : language == 2 ? "Don't repeat the operation" : "Ne répétez pas l’opération");
+ }
+ redisUtil.setStrValue(key, System.currentTimeMillis() + "", 5);
switch (orderType){
case 1:
return orderPrivateCarService.cancleOrderPrivateCar(id, payType, bankCardId, cancleId, type, language);
@@ -1265,6 +1249,14 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ String format = String.format("uid=%s&payType=%s&orderId=%s&orderType=%s", uid, payType, orderId, orderType);
+ String key = MD5Util.encrypt(format);
+ String value = redisUtil.getValue(key);
+ if(ToolUtil.isNotEmpty(value) && (System.currentTimeMillis() - Long.valueOf(value)) <= 1000){
+ return ResultUtil.error(language == 1 ? "请勿重复操作" : language == 2 ? "Don't repeat the operation" : "Ne répétez pas l’opération");
+ }
+ redisUtil.setStrValue(key, System.currentTimeMillis() + "", 5);
+
switch (orderType){
case 1:
return orderPrivateCarService.payPrivateCarOrder(payType, bankCardId, orderId, couponId, redDeduction, type, language);
@@ -1417,6 +1409,7 @@
@ResponseBody
@PostMapping("/base/wxCancelOrderTaxi")
public CallbackResponse wxCancelOrderTaxi(@RequestBody CallbackRequest callbackRequest){
+ log.info("取消订单支付回调结果：{}", JSON.toJSONString(callbackRequest));
CallbackResponse callbackResponse = new CallbackResponse();
try {
/**
@@ -1468,6 +1461,7 @@
}catch (Exception e){
e.printStackTrace();
}
+ log.info("取消订单支付回调处理结束：{}", JSON.toJSONString(callbackResponse));
return callbackResponse;
}
@@ -1519,6 +1513,7 @@
@ResponseBody
@PostMapping("/base/wxPayOrderTaxi")
public CallbackResponse wxPayOrderTaxi(@RequestBody CallbackRequest callbackRequest){
+ log.info("订单完成支付回调结果：{}", JSON.toJSONString(callbackRequest));
CallbackResponse callbackResponse = new CallbackResponse();
try {
/**
@@ -1573,6 +1568,7 @@
}catch (Exception e){
e.printStackTrace();
}
+ log.info("订单完成支付回调处理结束：{}", JSON.toJSONString(callbackResponse));
return callbackResponse;
}
--
Gitblit v1.7.1