From 64bfdd5d310d07c69deead7ebafc9b00fcb3258b Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 14 五月 2025 14:00:25 +0800
Subject: [PATCH] fix:修复广交集团订单
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 64a46e6..4e3c7b8 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
@@ -115,7 +115,14 @@
tbOrders.setAppId(appId);
tbOrders.setCreateTime(new Date());
- tbOrdersService.insertTbOrders(tbOrders);
+ try
+ {
+ tbOrdersService.insertTbOrders(tbOrders);
+ }
+ catch (Exception ex)
+ {
+ return AjaxResult.error("璁㈠崟鍙蜂笉鑳介噸澶�");
+ }
SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
@@ -125,6 +132,8 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
+ model.setOrdClass(scApp.getOrderClass()); // 璁剧疆姘戣埅瀛楀吀orderClass
+ model.setUserID(scApp.getUserId()); // 璁剧疆姘戣埅鍒嗗叕鍙窱d
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
@@ -141,8 +150,20 @@
model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌
model.setInHosp(tbOrders.getSendAddress()); // 璁剧疆杞叆鍖婚櫌
// model.setPtServices("绉戝" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呮墍鍦ㄧ瀹�
- model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
- model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
+
+ //濡傛灉璇婃柇淇℃伅涓虹┖锛屽垯涓嶈缃瘖鏂俊鎭�
+ if(tbOrders.getComplaint() != null && !tbOrders.getComplaint().equals(""))
+ {
+ model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
+ }
+
+ //濡傛灉澶囨敞淇℃伅涓虹┖锛屽垯涓嶈缃娉ㄤ俊鎭�
+ if(tbOrders.getRemark() != null && !tbOrders.getRemark().equals(""))
+ {
+ model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
+ }
+
+
// model.setDoctor("鍖荤敓" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呭尰鐢�
// model.setDoctorPhone("13" + (int) (Math.random() * 900000000 + 100000000)); // 闅忔満鐢熸垚鎮ｈ�呭尰鐢熺數璇�
model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环
--
Gitblit v1.9.1