From 04eb306aee2ffa4c06860d5935aac3360463f73b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 八月 2025 10:17:03 +0800
Subject: [PATCH] update
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 16 +++++++++-------
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 2 +-
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java | 4 ++--
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java | 2 +-
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index 57c6917..33a76f7 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.account.service.ITEnterpriseWithdrawalService;
@@ -137,14 +138,13 @@
types=2;
// return ResultUtil.error("您提交的申请正在处理中");
}
-
//获取支付金额
-// Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType());
-// reassign.setMoney(aDouble);
-// reassign.setOriginalDriverId(uid);
-// reassign.setOriginalCarId(driver.getCarId());
-// reassign.setInsertTime(new Date());
-// this.insert(reassign);
+ Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType());
+ reassign.setMoney(aDouble);
+ reassign.setOriginalDriverId(uid);
+ reassign.setOriginalCarId(driver.getCarId());
+ reassign.setInsertTime(new Date());
+ this.insert(reassign);
// systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1);
//开始支付
@@ -284,6 +284,7 @@
Driver driver = driverService.selectById(uid);
//修改改派通知状态
switch (reassign.getOrderType()) {
+
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(reassign.getOrderId());
orderPrivateCar.setState(orderPrivateCar.getOldState());
@@ -322,6 +323,7 @@
OrderUtil.modifyTravelItinerary(request1);
break;
}
+ reassignMapper.delete(new EntityWrapper<Reassign>().eq("orderId",reassign.getOrderId()).eq("orderType",reassign.getOrderType()));
return ResultUtil.success();
}
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index ae9ba2f..024aeaa 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -57,7 +57,7 @@
private Map<String, Timer> taskMap = new HashMap<>();//存储定时推送的定时器
- private final String socket_uri = "http://192.168.110.85:6000";
+ private final String socket_uri = "http://192.168.110.111:6000";
// qyt 改派重新推单
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
index faa0c9f..fde5644 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
@@ -17,7 +17,7 @@
* 私钥地址
*/
// String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
- String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
+ String privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
/**
* 私钥地址
*/
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
index 9c21368..8e8822b 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
@@ -58,8 +58,8 @@
this.merchNo = "B00000871";
this.encrpNo = "1055490595";
this.signNo = "1066348524";
- this.cer = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\1055490595.cer";
- this.sm2 = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\871_111111.sm2";
+ this.cer = "C:\\Users\\Admin\\Desktop\\qyt\\1055490595.cer";
+ this.sm2 = "C:\\Users\\Admin\\Desktop\\qyt\\871_111111.sm2";
this.password = "111111";
}
if("test".equals(activeProfile)){
--
Gitblit v1.7.1