From 09e6dc3fb7266620fafb5e341808a8eb36e080a1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 13 十二月 2025 22:51:52 +0800
Subject: [PATCH] feat:增加企业微信消息提醒
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index 9ca4f68..d22458c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -130,7 +130,7 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
-// model.setUserID(scApp.getUserId());
+ model.setUserID(scApp.getUserId());
//璁剧疆璁㈠崟绫诲瀷
if(tbOrders.getTypeCode() == 0) {
@@ -226,11 +226,20 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
-// model.setUserID(scApp.getUserId());
+ model.setUserID(scApp.getUserId());
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
- model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
+
+ if(tbOrders.getLinkPerson() != null && !tbOrders.getLinkPerson().equals(""))
+ {
+ model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
+ }
+ else
+ {
+ model.setCoName("鑱旂郴浜�"); // 闅忔満鐢熸垚鎮ｈ�呭鍚�
+ }
+
// model.setCoTies("瀹跺睘"); // 闅忔満璁剧疆瀹㈡埛鑱旂郴浜轰笌鎮ｈ�呭叧绯�
// 璁剧疆棰勭害鏃堕棿涓轰竴澶╁悗
Calendar calendar = Calendar.getInstance();
@@ -247,7 +256,15 @@
}
- model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
+
+ if(tbOrders.getAge()!=null && !tbOrders.getAge().equals(""))
+ {
+ model.setPtAge(tbOrders.getAge()); // 鎮ｈ�呭勾榫�
+ }
+ else {
+ model.setPtAge("骞撮緞");
+ }
+
model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�");
// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌
@@ -322,6 +339,7 @@
model.setAPPID(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
model.setServiceOrdID(cancelVo.getThirdOrderNo()); // 璁剧疆绗笁鏂硅鍗曞彿
model.setDELRemarks(cancelVo.getReason()); // 璁剧疆鍙栨秷鍘熷洜
+ logger.info("鍙栨秷璁㈠崟-{}",cancelVo.getThirdOrderNo());
ServiceOrderDelResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
@@ -331,6 +349,7 @@
tbOrders.setOrderID(cancelVo.getOrderID());
tbOrders.setOrderStatus(2); // 2鏄彇娑�
tbOrdersService.updateTbOrders(tbOrders);
+ logger.info("璁㈠崟鍙栨秷鎴愬姛锛�");
return AjaxResult.success(result);
} else {
return AjaxResult.error("鍙栨秷璁㈠崟澶辫触",result);
--
Gitblit v1.9.1