From 712ee793e5fa80859d0e420b37797e083652080f Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 11 七月 2024 09:38:22 +0800
Subject: [PATCH] 提交代码
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 120 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 77 insertions(+), 43 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 6df50ec..110b083 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -43,6 +43,8 @@
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.util.*;
@@ -118,8 +120,8 @@
@Autowired
private ITransactionDetailsService transactionDetailsService;
- @Autowired
- private ChinaMobileUtil chinaMobileUtil;
+// @Autowired
+// private ChinaMobileUtil chinaMobileUtil;
@Autowired
private IIncomeService incomeService;
@@ -160,11 +162,8 @@
@Autowired
private IAssignOrderService assignOrderService;
- @Autowired
- private ALiSendSms aLiSendSms;
-
- @Autowired
- private SMSUtil smsUtil;
+// @Autowired
+// private ALiSendSms aLiSendSms;
@Value("${filePath}")
@@ -315,18 +314,19 @@
orderPrivateCar.setSnatchOrderTime(new Date());
//调用高德创建轨迹
- String s = gdFalconUtil.selectTerminal(driver.getPhone());
- String track = gdFalconUtil.createTrack(s);
- orderPrivateCar.setTrackId(track);
+// String s = gdFalconUtil.selectTerminal(driver.getPhone());
+// String track = gdFalconUtil.createTrack(s);
+// JSONObject jsonObject = JSONObject.parseObject(track);
+// orderPrivateCar.setTrackId(String.valueOf(jsonObject.getInteger("trid")));
//调用移动的小号接口
/* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
Region region = regionMapper.query(geocode1.get("districtCode"));*/
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
- if(String.valueOf(map.get("code")).equals("200")){
- orderPrivateCar.setTelX(map.get("telX"));
- orderPrivateCar.setBindId(map.get("bindId"));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderPrivateCar.setTelX(map.get("telX"));
+// orderPrivateCar.setBindId(map.get("bindId"));
+// }
driver.setState(3);
driverService.updateById(driver);
@@ -516,8 +516,8 @@
}
double amount = 0;
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
- if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getArriveTime()!=null &&
- (orderPrivateCar.getArriveTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
+ if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getSnatchOrderTime()!=null &&
+ (orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
if(null != query){
amount += query.getMoney();
}
@@ -646,9 +646,12 @@
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
if(null != query){
if(payType == 1){//微信支付
+ if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
+ return ResultUtil.error("未授权微信，无法完成支付");
+ }
orderCancel.setPayType(1);
orderCancelService.updateById(orderCancel);
- resultUtil = payMoneyUtil.weixinpay("订单取消",id +"",id + "_1_fei",query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
+ resultUtil = payMoneyUtil.weixinpay("订单取消",id +"",id + "_1_" + UUIDUtil.getRandomCode(3),query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
//Map<String, String> map = icbcPayUtil.placeAnOrder(id + ",1", 9, 5, uid.toString(), "订单取消", query.getMoney(), callbackPath + "/base/wxCancelOrderTaxi", "", type, userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1);//添加预支付数据
@@ -661,7 +664,7 @@
if(payType == 2){//支付宝支付
orderCancel.setPayType(2);
orderCancelService.updateById(orderCancel);
- resultUtil = payMoneyUtil.alipay("订单取消","订单取消",id + "_1_fei",query.getMoney()+"","/base/aliCancelOrderTaxi");
+ resultUtil = payMoneyUtil.alipay("订单取消","订单取消", "",id + "_1_" + UUIDUtil.getRandomCode(3),query.getMoney()+"","/base/aliCancelOrderTaxi");
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1);//添加预支付数据
resultUtil = resultUtil;
@@ -680,9 +683,9 @@
userInfoService.updateById(userInfo);
//解除小号绑定
- if(orderPrivateCar.getBindId() != null){
- chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
- }
+// if(orderPrivateCar.getBindId() != null){
+// chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+// }
orderPrivateCar.setState(10);
orderPrivateCar.setTelX("");
@@ -814,8 +817,25 @@
UserInfo userInfo = userInfoService.selectById(uid);
map.put("balance", userInfo.getBalance());
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney());
- i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney());
+ Double orderMoney = orderPrivateCar.getOrderMoney();
+ //计算折扣
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+ if(null != query2){
+ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+ if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+ Double special = query2.getSpecial();
+ orderPrivateCar.setDiscount(special);
+ double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ if(orderMoney.compareTo(v) > 0){
+ orderPrivateCar.setDiscountMoney(orderMoney - v);
+ orderPrivateCar.setActivityId(query2.getId());
+ orderMoney = v;
+ }
+ }
+
+ }
+ int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, orderMoney);
+ i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, orderMoney);
map.put("coupon", i);
return map;
}
@@ -823,8 +843,25 @@
@Override
public List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- List<Map<String, Object>> list = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney(), pageNum, size);
- List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney(), pageNum, size);
+ Double orderMoney = orderPrivateCar.getOrderMoney();
+ //计算折扣
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+ if(null != query2){
+ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+ if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+ Double special = query2.getSpecial();
+ orderPrivateCar.setDiscount(special);
+ double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ if(orderMoney.compareTo(v) > 0){
+ orderPrivateCar.setDiscountMoney(orderMoney - v);
+ orderPrivateCar.setActivityId(query2.getId());
+ orderMoney = v;
+ }
+ }
+
+ }
+ List<Map<String, Object>> list = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 1, orderMoney, pageNum, size);
+ List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 0, orderMoney, pageNum, size);
list.addAll(list1);
return list;
}
@@ -893,25 +930,22 @@
}
}
-
+ if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
+ return ResultUtil.error("未授权微信，无法完成支付");
+ }
if(payType == 1){//微信支付
- //Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",1", 9, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/wxPayOrderTaxi", "", type, userInfo.getAppletsOpenId());
- resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"",orderId + "_1_fei",orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
-
+ resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"",orderId + "_1_" + UUIDUtil.getRandomCode(3),orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1);//添加预支付数据
- resultUtil = resultUtil;
}else{
resultUtil = ResultUtil.error("支付失败", "");
}
}
if(payType == 2) {//支付宝支付
- resultUtil = payMoneyUtil.alipay("完成订单","完成订单",orderId + "_1_fei",orderMoney+"","/base/aliPayOrderTaxi");
- //Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",1", 10, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/aliPayOrderTaxi", "", type, null);
+ resultUtil = payMoneyUtil.alipay("完成订单","完成订单", "",orderId + "_1_" + UUIDUtil.getRandomCode(3),orderMoney+"","/base/aliPayOrderTaxi");
if (resultUtil.getCode()==200) {
paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1);//添加预支付数据
- resultUtil = resultUtil;
} else {
resultUtil = ResultUtil.error("支付失败", "");
}
@@ -958,7 +992,7 @@
}
if(company.getIsSpeFixedOrProportional() == 1){//比例
Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
- d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
}
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
@@ -1091,9 +1125,9 @@
transactionDetailsService.saveData(orderPrivateCar.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
orderPrivateCar.setState(10);
//解除小号绑定
- if(orderPrivateCar.getBindId() != null){
- chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
- }
+// if(orderPrivateCar.getBindId() != null){
+// chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+// }
orderPrivateCar.setBindId("");
orderPrivateCar.setTelX("");
this.updateById(orderPrivateCar);
@@ -1185,7 +1219,7 @@
}
if(company.getIsSpeFixedOrProportional() == 1){//比例
Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
- d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
}
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
@@ -1310,8 +1344,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)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
+ t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).setScale(2, BigDecimal.ROUND_HALF_EVEN).intValue() + "";
}
OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
orderServerWarpper.setOrderId(orderPrivateCar.getId());
@@ -1333,8 +1367,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)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
+ t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).setScale(2, BigDecimal.ROUND_HALF_EVEN).intValue() + "";
}
orderServerWarpper.setReservationMileage("0");
orderServerWarpper.setReservationTime("0");
--
Gitblit v1.7.1