From d6af8c450e89d515f7f77a2b4b4ddf9c5f9ad4db Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 03 七月 2023 22:09:23 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 113 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 76 insertions(+), 37 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index dff6082..e9c2135 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -18,6 +18,8 @@
import org.springframework.web.client.RestTemplate;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.util.*;
/**
@@ -89,39 +91,39 @@
}
- /**
- * 线下支付数据推送
- * @param type
- * @param uid
- * @param orderId
- * @param orderType
- */
- public void pushOfflinePayment(Integer type, Integer uid, Integer orderId, Integer orderType){
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("code", 200);
- jsonObject.put("msg", "SUCCESS");
- jsonObject.put("method", "OFFLINE_PAYMENT");
- Map<String, Object> map = new HashMap<>();
- map.put("orderId", orderId);
- map.put("orderType", orderType);
- jsonObject.put("data", map);
-
- //调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- //将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("msg", jsonObject.toJSONString());
- params.add("id", String.valueOf(uid));
- params.add("type", String.valueOf(type));
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- System.err.println(jsonObject1.getString("msg"));
- }
- }
+// /**
+// * 线下支付数据推送
+// * @param type
+// * @param uid
+// * @param orderId
+// * @param orderType
+// */
+// public void pushOfflinePayment(Integer type, Integer uid, Integer orderId, Integer orderType){
+// JSONObject jsonObject = new JSONObject();
+// jsonObject.put("code", 200);
+// jsonObject.put("msg", "SUCCESS");
+// jsonObject.put("method", "OFFLINE_PAYMENT");
+// Map<String, Object> map = new HashMap<>();
+// map.put("orderId", orderId);
+// map.put("orderType", orderType);
+// jsonObject.put("data", map);
+//
+// //调用推送
+// HttpHeaders headers = new HttpHeaders();
+// // 以表单的方式提交
+// headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+// //将请求头部和参数合成一个请求
+// MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+// params.add("msg", jsonObject.toJSONString());
+// params.add("id", String.valueOf(uid));
+// params.add("type", String.valueOf(type));
+// HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+// String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
+// JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+// if(jsonObject1.getIntValue("code") != 200){
+// System.err.println(jsonObject1.getString("msg"));
+// }
+// }
@@ -269,8 +271,8 @@
if(null == distance){
System.err.println("查询距离出错了");
}else{
- d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
- t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60)).setScale(2, BigDecimal.ROUND_HALF_EVEN).intValue() + "";
+ d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+ t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
}
JSONObject msg = new JSONObject();
msg.put("code", 200);
@@ -303,8 +305,8 @@
if(null == distance){
System.err.println("查询距离出错了");
}else{
- d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
- t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60)).setScale(2, BigDecimal.ROUND_HALF_EVEN).intValue() + "";
+ d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+ t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
}
map.put("laveMileage", d);//距离终点剩余未服务的里程数
map.put("laveTime", t);//距离终端剩余未服务的预计时间
@@ -411,4 +413,41 @@
timer.cancel();
}
}
+
+
+ /**
+ * 线下支付数据推送
+ * @param type
+ * @param uid
+ * @param orderId
+ * @param orderType
+ */
+ public void pushOfflinePayment(Integer type, Integer uid, Integer orderId, Integer orderType){
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("code", 200);
+ jsonObject.put("msg", "SUCCESS");
+ jsonObject.put("method", "OFFLINE_PAYMENT");
+ Map<String, Object> map = new HashMap<>();
+ map.put("orderId", orderId);
+ map.put("orderType", orderType);
+ jsonObject.put("data", map);
+
+ //调用推送
+ HttpHeaders headers = new HttpHeaders();
+ // 以表单的方式提交
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ //将请求头部和参数合成一个请求
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ params.add("msg", jsonObject.toJSONString());
+ params.add("id", String.valueOf(uid));
+ params.add("type", String.valueOf(type));
+ HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+ String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
+ JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
+ }
+
+
}
--
Gitblit v1.7.1