From 5636a3b962bc19c4e46e67646c74018037ee8792 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 13:26:40 +0800
Subject: [PATCH] 修改bug
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 130 +++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 35 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 1d5349b..0142c10 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
@@ -33,6 +33,7 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
@@ -46,7 +47,9 @@
import java.math.MathContext;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.*;
+import java.util.stream.Collectors;
@Service
@@ -646,16 +649,16 @@
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
if(null != query){
+ String code = id + "_1_" + UUIDUtil.getRandomCode(3);
if(payType == 1){//微信支付
if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
return ResultUtil.error("未授权微信，无法完成支付");
}
- String code = id + "_1_" + UUIDUtil.getRandomCode(3);
orderCancel.setPayType(1);
orderCancelService.updateById(orderCancel);
resultUtil = payMoneyUtil.weixinpay("订单取消",id +"",code,query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1, code);//添加预支付数据
new Thread(()->{
int num = 1;
int min = 5000;
@@ -701,7 +704,7 @@
}
}
}).start();
-
+
}else{
resultUtil = ResultUtil.error("支付失败", "");
}
@@ -710,9 +713,9 @@
if(payType == 2){//支付宝支付
orderCancel.setPayType(2);
orderCancelService.updateById(orderCancel);
- resultUtil = payMoneyUtil.alipay("订单取消","订单取消", "",id + "_1_" + UUIDUtil.getRandomCode(3),query.getMoney()+"","/base/aliCancelOrderTaxi");
+ resultUtil = payMoneyUtil.alipay("订单取消","订单取消", "",code,query.getMoney()+"","/base/aliCancelOrderTaxi");
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1, code);//添加预支付数据
resultUtil = resultUtil;
}else{
resultUtil = ResultUtil.error("支付失败", "");
@@ -795,10 +798,20 @@
//获取空闲司机
List<Driver> list = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
if(list.size() > 0){
+ // 查询预约单
+ List<Integer> driverIds = list.stream().map(Driver::getId).collect(Collectors.toList());
+ List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
list = list.subList(0, lastIndex);//获取空闲司机中占比数据
for(Driver driver : list){//开始进行推送
+ // 判断该司机是否有30分钟内预约单
+ long count = orderPrivateCars.stream().filter(orderPrivateCar1 -> driver.getId().equals(orderPrivateCar1.getDriverId())
+ && DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).minusMinutes(30).isBefore(LocalDateTime.now())
+ && DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).isAfter(LocalDateTime.now())).count();
+ if(count > 0){
+ continue;
+ }
boolean bo = false;
for(Integer integer : integers){
if(integer.compareTo(driver.getId()) == 0){
@@ -911,9 +924,16 @@
list.addAll(list1);
return list;
}
+
+
+
@Override
public ResultUtil payPrivateCarOrder(Integer payType, Integer orderId, Integer couponId, Integer type) throws Exception {
+ String value = redisUtil.getValue(orderId + "_status_1");
+ if(ToolUtil.isNotEmpty(value) && "8".equals(value)){
+ return ResultUtil.error("订单已完成支付，不允许重复支付", "");
+ }
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
return ResultUtil.error("订单已完成支付，不允许重复支付", "");
@@ -921,6 +941,40 @@
if(orderPrivateCar.getState() != 7){
return ResultUtil.error("订单不在待支付状态，不允许支付", "");
}
+ PaymentRecord query3 = paymentRecordService.query(1, null, null, orderId, 1, null, 1);
+ if(null != query3){
+ ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", query3.getSerialNumber(), "JSAPI");
+ if (resultUtil1.getCode() == 200) {
+ /**
+ * SUCCESS--支付成功
+ * REFUND--转入退款
+ * NOTPAY--未支付
+ * CLOSED--已关闭
+ * REVOKED--已撤销(刷卡支付)
+ * USERPAYING--用户支付中
+ * PAYERROR--支付失败(其他原因，如银行返回失败)
+ * ACCEPT--已接收，等待扣款
+ */
+ String result_code = resultUtil1.getData().get("result_code").toString();
+ if("SUCCESS".equals(result_code)){
+ String s = resultUtil1.getData().get("trade_state").toString();
+ if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s)) {
+ payMoneyUtil.closeWXOrder(query3.getSerialNumber());
+ paymentRecordService.deleteById(query3.getId());
+ }
+ if ("SUCCESS".equals(s) || "ACCEPT".equals(s)) {
+ return ResultUtil.error("不允许重复支付");
+ }
+ if ("NOTPAY".equals(s) || "USERPAYING".equals(s)) {
+ payMoneyUtil.closeWXOrder(query3.getSerialNumber());
+ paymentRecordService.deleteById(query3.getId());
+ }
+ }
+ }
+ }
+
+
+
Integer uid = orderPrivateCar.getUserId();
Double orderMoney = orderPrivateCar.getOrderMoney();
UserInfo userInfo = userInfoService.selectById(uid);
@@ -932,7 +986,7 @@
UserCouponRecord userCouponRecord = null;
if(null != couponId){
userCouponRecord = userCouponRecordService.selectById(couponId);
- if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
+ if(userCouponRecord.getCompanyId().compareTo(orderPrivateCar.getCompanyId()) != 0){
return ResultUtil.error("优惠券不能用于此订单", "");
}
if(userCouponRecord.getState() == 2){
@@ -979,24 +1033,22 @@
if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
return ResultUtil.error("未授权微信，无法完成支付");
}
+ String code = orderId + "_1_" + UUIDUtil.getRandomCode(5);
if(payType == 1){//微信支付
- String code = orderId + "_1_" + UUIDUtil.getRandomCode(3);
- resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"",code,orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
+ resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"", code,orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderId, 1, 1, orderMoney, null, 1, code);//添加预支付数据
new Thread(()->{
- int num = 1;
- int min = 5000;
- int w = 0;
- while (num <= 10) {
+ long time = orderPrivateCar.getInsertTime().getTime();
+ //订单创建后15分钟
+ while (System.currentTimeMillis() - time <= 900000) {
try {
- w += min * num;
- OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderId);
- if (orderPrivateCar1.getState() != 7) {
+ String value1 = redisUtil.getValue(orderId + "_status_1");
+ if(ToolUtil.isNotEmpty(value1) && "8".equals(value1)){
break;
}
- ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", code, "JSAPI");
- if (resultUtil1.getCode() == 200) {
+ ResultUtil<Map<String, Object>> resultUtil2 = payMoneyUtil.queryWXOrder("", code, "JSAPI");
+ if (resultUtil2.getCode() == 200) {
/**
* SUCCESS--支付成功
* REFUND--转入退款
@@ -1007,25 +1059,30 @@
* PAYERROR--支付失败(其他原因，如银行返回失败)
* ACCEPT--已接收，等待扣款
*/
- String s = resultUtil1.getData().get("trade_state").toString();
- if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+ String s = resultUtil2.getData().get("trade_state").toString();
+ if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s)) {
break;
}
if ("SUCCESS".equals(s) || "ACCEPT".equals(s)) {
- String transaction_id = resultUtil1.getData().get("transaction_id").toString();
+ String transaction_id = resultUtil2.getData().get("transaction_id").toString();
payOrderPrivateCarCallback(orderId, transaction_id, 1);
break;
}
if ("NOTPAY".equals(s) || "USERPAYING".equals(s)) {
- Thread.sleep(w);
- num++;
}
- } else {
- Thread.sleep(w);
- num++;
}
+ Thread.sleep(5000);
}catch (Exception e){
e.printStackTrace();
+ }
+ }
+ String value1 = redisUtil.getValue(orderId + "_status_1");
+ if(ToolUtil.isNotEmpty(value1) && "7".equals(value1)){
+ //关闭订单，不允许支付
+ payMoneyUtil.closeWXOrder(code);
+ PaymentRecord paymentRecord = paymentRecordService.selectOne(new EntityWrapper<PaymentRecord>().eq("serialNumber", code));
+ if(null != paymentRecord){
+ paymentRecordService.deleteById(paymentRecord.getId());
}
}
}).start();
@@ -1035,9 +1092,9 @@
}
if(payType == 2) {//支付宝支付
- resultUtil = payMoneyUtil.alipay("完成订单","完成订单", "",orderId + "_1_" + UUIDUtil.getRandomCode(3),orderMoney+"","/base/aliPayOrderTaxi");
+ resultUtil = payMoneyUtil.alipay("完成订单","完成订单", "",code,orderMoney+"","/base/aliPayOrderTaxi");
if (resultUtil.getCode()==200) {
- paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderId, 1, 2, orderMoney, null, 1, code);//添加预支付数据
} else {
resultUtil = ResultUtil.error("支付失败", "");
}
@@ -1267,14 +1324,16 @@
}
@Override
- public void payOrderPrivateCarCallback(Integer id, String order_id, Integer type) throws Exception {
- OrderPrivateCar orderPrivateCar = this.selectById(id);
- if(orderPrivateCar.getState() != 7){
- return;
- }
- PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, 1);
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized void payOrderPrivateCarCallback(Integer id, String order_id, Integer type) throws Exception {
+ PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, null);
if(null != query){
+ String value = redisUtil.getValue(order_id + "_status_1");
+ if(ToolUtil.isNotEmpty(value) && "8".equals(value)){
+ return;
+ }
//添加交易明细
+ OrderPrivateCar orderPrivateCar = this.selectById(id);
transactionDetailsService.saveData(orderPrivateCar.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(type);
@@ -1301,10 +1360,11 @@
userRedPacketRecordService.updateById(userRedPacketRecord);
}
-
query.setState(2);
query.setCode(order_id);
paymentRecordService.updateById(query);
+ redisUtil.setStrValue(order_id + "_status_1", "8");
+
if(orderPrivateCar.getIsplatPay()==1){
//添加已收入明细
Company company = companyService.selectById(orderPrivateCar.getCompanyId());
--
Gitblit v1.7.1