From e21119007e7d9899376c0dce4ed406a4c2901310 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 12 五月 2025 16:34:05 +0800
Subject: [PATCH] fix:新增订单-车牌号关联表。修复bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 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 2ed5f28..d08fc1c 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
@@ -8,9 +8,7 @@
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.core.domain.entity.ServiceOrderAppResultVo;
-import com.ruoyi.common.core.domain.entity.ServiceOrderAppVo;
-import com.ruoyi.common.core.domain.entity.ServiceOrderDelVo;
+import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.utils.civilAviation.ServiceOrderUtil;
import com.ruoyi.system.domain.SysClientApp;
import com.ruoyi.system.service.ISysClientAppService;
@@ -30,7 +28,6 @@
import com.ruoyi.system.service.ITbOrdersService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.entity.OrderCancelVo;
/**
* ordersController
@@ -118,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());
@@ -128,6 +132,8 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
+ model.setOrderClass(scApp.getOrderClass()); // 璁剧疆姘戣埅瀛楀吀orderClass
+ model.setUserID(scApp.getUserId()); // 璁剧疆姘戣埅鍒嗗叕鍙窱d
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
@@ -144,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()); // 鐢熸垚鎶ヤ环
@@ -185,12 +203,12 @@
return AjaxResult.error("璁㈠崟鐘舵�佸凡鍙栨秷");
}
- SysClientApp scApp = clientAppService.selectSysClientAppByAppKey("appId1");
+ SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
- model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
+ model.setAppId(tbOrders.getAppId()); // 璁剧疆鍟嗘埛 APPID
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
@@ -240,9 +258,9 @@
@ApiImplicitParam(name = "thirdOrderNo", value = "绗笁鏂硅鍗曞彿", required = true, dataType = "String"),
@ApiImplicitParam(name = "reason", value = "鍙栨秷鍘熷洜", required = true, dataType = "String")
})
- @Anonymous
+ @Anonymous(needSign = true)
@PostMapping("/cancelOrder")
- public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo)
+ public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo,String appId)
{
try {
if (cancelVo == null || cancelVo.getOrderID() == null ||
@@ -250,7 +268,7 @@
return AjaxResult.error("蹇呰鍙傛暟涓嶈兘涓虹┖锛�");
}
- SysClientApp scApp = clientAppService.selectSysClientAppByAppId(1L);
+ SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(appId);
ServiceOrderDelVo model = new ServiceOrderDelVo();
model.setMethod("ServiceOrder_DEL"); // 璁剧疆鎺ュ彛鍚嶇О
@@ -258,7 +276,7 @@
model.setServiceOrdID(cancelVo.getThirdOrderNo()); // 璁剧疆绗笁鏂硅鍗曞彿
model.setDELRemarks(cancelVo.getReason()); // 璁剧疆鍙栨秷鍘熷洜
- ServiceOrderAppResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
+ ServiceOrderDelResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
if (result.getResult() == 1) {
// 鏇存柊鏈湴璁㈠崟鐘舵��
@@ -268,7 +286,7 @@
tbOrdersService.updateTbOrders(tbOrders);
return AjaxResult.success(result);
} else {
- return AjaxResult.error("鍙栨秷璁㈠崟澶辫触");
+ return AjaxResult.error("鍙栨秷璁㈠崟澶辫触",result);
}
} catch (Exception e) {
return AjaxResult.error("鍙栨秷璁㈠崟澶辫触:" + e.getMessage());
--
Gitblit v1.9.1