From 3bbd80a63ac7728ac01b641a48a26befcb171a0f Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 15 十二月 2025 07:19:21 +0800
Subject: [PATCH] feat:增加企业微信登录判断
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index c94dfb6..e70255f 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -10,6 +10,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
@@ -99,14 +103,14 @@
for (AOrderStatus orderStatus : orderStatusList) {
int count = tbOrdersService.checkServiceOrdIDExists(orderStatus.getServiceOrdID());
if (count > 0) {
- log.info("鏈嶅姟璁㈠崟ID瀛樺湪锛�" + orderStatus.getServiceOrdID());
+// log.info("鏈嶅姟璁㈠崟ID瀛樺湪锛�" + orderStatus.getServiceOrdID());
TbOrders tbOrders = tbOrdersService.selectTbOrdersByServiceOrdID(orderStatus.getServiceOrdID());
//鑾峰彇杞︾墝鍙�
- String carLicense = "";
+ String carLicense = "-";
StringBuilder driverNames = new StringBuilder();
StringBuilder driverMobiles = new StringBuilder();
try{
@@ -140,7 +144,7 @@
//濡傛灉杞︾墝鍙蜂笉涓虹┖
if(carLicense!=null && carLicense.length()>0){
- log.info("鏇存柊璁㈠崟-杞︾墝鍙峰叧鑱旇〃锛屻��" + tbOrders.getOrderID() + "銆戣溅鐗屽彿锛�" + carLicense);
+// log.info("鏇存柊璁㈠崟-杞︾墝鍙峰叧鑱旇〃锛屻��" + tbOrders.getOrderID() + "銆戣溅鐗屽彿锛�" + carLicense);
//鏌ヨ鏄惁瀛樺湪鍏宠仈璁板綍
TbVehicleOrder tbVehicleOrder = tbVehicleOrderService.selectTbVehicleOrderById(tbOrders.getOrderID());
@@ -179,11 +183,19 @@
SysClientApp clientApp = sysClientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
if(clientApp==null){
log.error("鍥炶皟鍦板潃涓嶅瓨鍦�");
+ orderStatusService.updateAOrderStatusFlag(orderStatus.getId());
continue;
}
String callbackUrl = clientApp.getCallbackUrl();
try {
+
+ String carLicenseStr = "-";
+ if(carLicense!=null && carLicense.length()>0){
+ carLicenseStr = carLicense;
+ }
+
+
// 鏋勫缓璇锋眰鍙傛暟
Map<String, String> map = new HashMap<>();
map.put("orderID", tbOrders.getOrderID().toString());
@@ -195,10 +207,30 @@
.findFirst()
.orElse("0"));
map.put("orderRemark", orderStatus.getMsg());
- map.put("plateNo",carLicense);
+ map.put("plateNo",carLicenseStr);
map.put("driverMobile",driverMobiles.toString());
map.put("driverName", driverNames.toString());
+ //鏍煎紡鍖栨洿鏂版椂闂�
+ try {
+
+ // 2. 瀹氫箟鐩爣鏍煎紡锛�24灏忔椂鍒� "HH"锛�
+ DateTimeFormatter targetFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String formattedTime = orderStatus.getUpdateTime().format(targetFormat);
+ map.put("updateTime", formattedTime);
+ }
+ catch (Exception ex)
+ {
+ log.error("鏃堕棿鏍煎紡杞寲鍑洪敊");
+ }
+
+
+
+
+ log.info("銆愮洃娴嬨�慬" + tbOrders.getOrderID() + "]杞︾墝鍙凤細" + carLicenseStr);
+ //鎵撳嵃map
+ log.info("銆愮洃娴嬨�慬" + tbOrders.getOrderID() + "]鍥炶皟璇锋眰鍙傛暟锛�" + map);
+
// 绗竴娆″皾璇�
String response = sendCallback(callbackUrl, map);
--
Gitblit v1.9.1