From c91d30ae503c1a37c60a2fc83f610e032d56a26c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 25 七月 2023 09:49:58 +0800
Subject: [PATCH] 更新短信模板
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index a4f7c6f..5bc94bc 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -9,6 +9,8 @@
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ChinaMobileUtil;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
+import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
+import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
@@ -63,10 +65,10 @@
*/
@Override
public ResultUtil<BaseWarpper> queryExpectedTime(Double slon, Double slat, Double elon, Double elat) throws Exception {
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(slon + "," + slat, elon + "," + elat, 1);
- int duration = Integer.valueOf(distance.get("duration")) / 60;
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(slat, slon, elat, elon);
+ Long duration = distancematrix.getDuration() / 60;
BaseWarpper baseWarpper = new BaseWarpper();
- baseWarpper.setMinute(duration);
+ baseWarpper.setMinute(duration.intValue());
return ResultUtil.success(baseWarpper);
}
@@ -79,30 +81,30 @@
* @throws Exception
*/
@Override
- public ResultUtil weChatPay(Integer orderId, Integer orderType, Integer type, Integer userType, Integer uid, String content) throws Exception {
+ public ResultUtil weChatPay(Integer orderId, Integer orderType, Integer type, Integer userType, Integer uid, String content, Integer language) throws Exception {
JSONObject jsonObject = JSON.parseObject(content);
switch (type){
case 1://订单完成支付
- switch (orderType){
- case 1:
- return orderPrivateCarService.payPrivateCarOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
- case 2:
- return orderTaxiService.payTaxiOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
- case 3:
- return orderCrossCityService.payCrossCityOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
- case 4:
- return orderLogisticsService.payLogisticsOrder(1, orderId, 3);
- case 5:
- return orderLogisticsService.payLogisticsOrder(1, orderId, 3);
- }
+// switch (orderType){
+// case 1:
+// return orderPrivateCarService.payPrivateCarOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3, 1);
+// case 2:
+// return orderTaxiService.payTaxiOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
+// case 3:
+// return orderCrossCityService.payCrossCityOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
+// case 4:
+// return orderLogisticsService.payLogisticsOrder(1, orderId, 3, 1);
+// case 5:
+// return orderLogisticsService.payLogisticsOrder(1, orderId, 3, 1);
+// }
case 2://订单取消支付
switch (orderType){
case 1:
- return orderPrivateCarService.cancleOrderPrivateCar(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
+// return orderPrivateCarService.cancleOrderPrivateCar(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
case 2:
- return orderTaxiService.cancleOrderTaxi(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
+ return orderTaxiService.cancleOrderTaxi(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3, language);
case 3:
- return orderCrossCityService.cancleOrderCrossCity(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
+ return orderCrossCityService.cancleOrderCrossCity(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3, language);
}
case 3://司机端改派支付
@@ -123,13 +125,13 @@
return ResultUtil.success(jsonObject1.getString("msg"), jsonObject1.getString("data"));
case 4://余额充值
if(userType == 1){
- return userInfoService.depositBalance(1, jsonObject.getDoubleValue("money"), uid, 3);
+// return userInfoService.depositBalance(1, jsonObject.getDoubleValue("money"), uid, 3, 1);
}
if(userType == 2){
}
case 5://小件物流补差价
- return orderLogisticsService.payLogisticsOrder_(1, orderId, 3);
+// return orderLogisticsService.payLogisticsOrder_(1, orderId, 3);
}
return ResultUtil.success();
}
--
Gitblit v1.7.1