From 7aad41284d522002584383aaa9e34caa14a2b2aa Mon Sep 17 00:00:00 2001 From: wzp <2040239371@qq.com> Date: 星期一, 19 五月 2025 15:32:20 +0800 Subject: [PATCH] fix: 修复md5加密规则 增加介绍人字段 --- ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 89 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 84 insertions(+), 5 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 d4cfcca..5f9c32e 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 @@ -25,6 +25,31 @@ public class RyTask { private static final Logger log = LoggerFactory.getLogger(RyTask.class); + + + + // 娣诲姞鐘舵�佹槧灏勫瓧鍏� + private static final Map<String, String> ORDER_STATUS_MAP = new HashMap<String, String>() {{ + put("-1", "鏃犳晥鍙栨秷"); + put("1", "鏈姤浠�"); + put("2", "宸叉姤浠�"); + put("3", "1 - 瀹屽叏鏈‘璁�"); + put("4", "2 - 閮ㄥ垎宸茬‘璁�"); + put("5", "鏈嚭杞�"); + put("6", "3 - 宸插嚭杞︼紙鍘绘帴鎮h�呴�斾腑锛�"); + put("7", "宸插嚭杞︼紙绛夊緟鎮h�咃級"); + put("8", "4 - 宸插嚭杞︼紙鏈嶅姟涓級"); + put("9", "5 - 宸查�佽揪锛堝洖绋嬩腑锛�"); + put("10", "宸茶繑鍥�"); + put("11", "璺戠┖鍗曪紝宸茶繑鍥�"); + put("12", "鍙栨秷"); + put("13", "0 - 鏂拌皟搴﹀崟锛堟湭涓嬪彂锛�"); + put("14", "宸叉彁浜わ紝绛夊緟瀹℃牳"); + put("15", "瀹℃牳瀹屾垚"); + put("16", "瀹℃牳涓嶉�氳繃"); + put("17", "宸茬珯鐐�"); + }}; + @Autowired private IAOrderStatusService orderStatusService; @@ -40,6 +65,9 @@ @Autowired private ITbCallbackLogService tbCallbackLogService; + @Autowired + private ITbVehicleOrderService tbVehicleOrderService; + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i)); @@ -54,6 +82,9 @@ { System.out.println("鎵ц鏃犲弬鏂规硶"); } + + + /** * 鍥炶皟鎺ㄩ�佺姸鎬� @@ -75,7 +106,7 @@ //鑾峰彇杞︾墝鍙� - String carLicense = ""; + String carLicense = "-"; StringBuilder driverNames = new StringBuilder(); StringBuilder driverMobiles = new StringBuilder(); try{ @@ -106,6 +137,38 @@ } } } + + //濡傛灉杞︾墝鍙蜂笉涓虹┖ + if(carLicense!=null && carLicense.length()>0){ + log.info("鏇存柊璁㈠崟-杞︾墝鍙峰叧鑱旇〃锛屻��" + tbOrders.getOrderID() + "銆戣溅鐗屽彿锛�" + carLicense); + + //鏌ヨ鏄惁瀛樺湪鍏宠仈璁板綍 + TbVehicleOrder tbVehicleOrder = tbVehicleOrderService.selectTbVehicleOrderById(tbOrders.getOrderID()); + if(tbVehicleOrder==null){ + //涓嶅瓨鍦ㄥ叧鑱旇褰� + //鍒涘缓鍏宠仈璁板綍 + tbVehicleOrder = new TbVehicleOrder(); + tbVehicleOrder.setOrderId(tbOrders.getOrderID()); + tbVehicleOrder.setServiceOrdId(tbOrders.getServiceOrdID()); + tbVehicleOrder.setVehicle(carLicense); + tbVehicleOrder.setStatus("0"); + tbVehicleOrderService.insertTbVehicleOrder(tbVehicleOrder); + } + else{ + //瀛樺湪鍏宠仈璁板綍 + //鏇存柊鍏宠仈璁板綍 + if(orderStatus.getMsg().contains("宸茶繑鍥�")) + { + tbVehicleOrder.setStatus("1"); + tbVehicleOrderService.updateTbVehicleOrder(tbVehicleOrder); + } + else if(orderStatus.getMsg().contains("鍙栨秷")) + { + tbVehicleOrder.setStatus("2"); + tbVehicleOrderService.updateTbVehicleOrder(tbVehicleOrder); + } + } + } } } catch (Exception e) @@ -116,21 +179,37 @@ SysClientApp clientApp = sysClientAppService.selectSysClientAppByAppKey(tbOrders.getAppId()); if(clientApp==null){ log.error("鍥炶皟鍦板潃涓嶅瓨鍦�"); - return; + 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()); map.put("thirdOrderNo", orderStatus.getServiceOrdID()); - map.put("orderStatus","1"); + map.put("orderStatus", ORDER_STATUS_MAP.entrySet() + .stream() + .filter(entry -> entry.getValue().equals(orderStatus.getMsg())) + .map(Map.Entry::getKey) + .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()); - map.put("appId", tbOrders.getAppId()); + + log.info("銆愮洃娴嬨�慬" + tbOrders.getOrderID() + "]杞︾墝鍙凤細" + carLicenseStr); + //鎵撳嵃map + log.info("銆愮洃娴嬨�慬" + tbOrders.getOrderID() + "]鍥炶皟璇锋眰鍙傛暟锛�" + map); // 绗竴娆″皾璇� String response = sendCallback(callbackUrl, map); -- Gitblit v1.9.1