From e6d10b40cf08fb35a73552aa4f0d2e9ac0b227df Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 21 五月 2025 15:36:54 +0800
Subject: [PATCH] fix: 修复客户提交的订单类型，如果传的是0，替换为1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 93 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 72 insertions(+), 21 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..1c907a9 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,17 +115,30 @@
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());
-
-
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
- model.setOrdType(tbOrders.getTypeCode().intValue());
+ model.setUserID(scApp.getUserId());
+
+ //璁剧疆璁㈠崟绫诲瀷
+ if(tbOrders.getTypeCode() == 0) {
+ model.setOrdType(1);
+ } else {
+ model.setOrdType(tbOrders.getTypeCode().intValue());
+ }
+
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
// model.setCoTies("瀹跺睘"); // 闅忔満璁剧疆瀹㈡埛鑱旂郴浜轰笌鎮ｈ�呭叧绯�
@@ -141,12 +154,29 @@
model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌
model.setInHosp(tbOrders.getSendAddress()); // 璁剧疆杞叆鍖婚櫌
// model.setPtServices("绉戝" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呮墍鍦ㄧ瀹�
- model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
- model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
-// model.setDoctor("鍖荤敓" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呭尰鐢�
-// model.setDoctorPhone("13" + (int) (Math.random() * 900000000 + 100000000)); // 闅忔満鐢熸垚鎮ｈ�呭尰鐢熺數璇�
- model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环
-// model.setReferrals("鎺ㄤ粙浜�" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎺ㄤ粙浜轰俊鎭�
+
+ //濡傛灉璇婃柇淇℃伅涓虹┖锛屽垯涓嶈缃瘖鏂俊鎭�
+ if(tbOrders.getComplaint() != null && !tbOrders.getComplaint().equals(""))
+ {
+ model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
+ }
+
+
+ //棰勪及璺濈
+ if(tbOrders.getBookingKM()!=null)
+ {
+ model.setTraDistance(tbOrders.getBookingKM().toString());
+ }
+
+ //濡傛灉澶囨敞淇℃伅涓虹┖锛屽垯涓嶈缃娉ㄤ俊鎭�
+ if(tbOrders.getRemark() != null && !tbOrders.getRemark().equals(""))
+ {
+ model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
+ }
+
+ model.setPrice(tbOrders.getBookingPrice().doubleValue());
+ model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环
+ model.setReferrals(scApp.getReferrals()); // 璁剧疆鎺ㄤ粙浜哄悕绉颁负鏈烘瀯鍚嶇О
// model.setUnitRemarks("鍟嗘埛闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆鍟嗘埛澶囨敞
model.setPayQRcodeURL(scApp.getPayUrl());
@@ -187,7 +217,9 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
- model.setAppId(tbOrders.getAppId()); // 璁剧疆鍟嗘埛 APPID
+ model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
+ model.setUserID(scApp.getUserId());
+
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
@@ -200,18 +232,37 @@
model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
-// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�--榛樿涓浗锛屼笉闇�瑕佽缃�
+// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌
model.setInHosp(tbOrders.getSendAddress()); // 璁剧疆杞叆鍖婚櫌
-// model.setPtServices("绉戝")); // 璁剧疆鎮ｈ�呮墍鍦ㄧ瀹�
- model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
- model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
-// model.setDoctor("鍖荤敓")); // 璁剧疆鎮ｈ�呭尰鐢�--娌℃湁鍖荤敓淇℃伅
-// model.setDoctorPhone("")); // 璁剧疆鎮ｈ�呭尰鐢熺數璇�--娌℃湁鍖荤敓鐢佃瘽
- model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鎶ヤ环
-// model.setReferrals("鎺ㄤ粙浜�")); // 璁剧疆鎺ㄤ粙浜轰俊鎭�--娌℃湁鎺ㄤ粙浜轰俊鎭�
-// model.setUnitRemarks("鍟嗘埛澶囨敞淇℃伅"); // 璁剧疆鍟嗘埛澶囨敞--娌℃湁鍟嗘埛澶囨敞
- model.setPayQRcodeURL(scApp.getPayUrl());
+// model.setPtServices("绉戝" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呮墍鍦ㄧ瀹�
+
+ //濡傛灉璇婃柇淇℃伅涓虹┖锛屽垯涓嶈缃瘖鏂俊鎭�
+ if(tbOrders.getComplaint() != null && !tbOrders.getComplaint().equals(""))
+ {
+ model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
+ }
+
+
+ //棰勪及璺濈
+ if(tbOrders.getBookingKM()!=null)
+ {
+ model.setTraDistance(tbOrders.getBookingKM().toString());
+ }
+
+ //濡傛灉澶囨敞淇℃伅涓虹┖锛屽垯涓嶈缃娉ㄤ俊鎭�
+ if(tbOrders.getRemark() != null && !tbOrders.getRemark().equals(""))
+ {
+ model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
+ }
+
+
+ model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环
+ model.setPrice(tbOrders.getBookingPrice().doubleValue());
+ model.setReferrals(scApp.getReferrals()); // 璁剧疆鎺ㄤ粙浜哄悕绉颁负鏈烘瀯鍚嶇О
+// model.setUnitRemarks("鍟嗘埛闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆鍟嗘埛澶囨敞
+ model.setPayQRcodeURL(scApp.getPayUrl());
+
ServiceOrderAppResultVo result = ServiceOrderUtil.CreateServiceOrder(model,scApp.getMinAppSecret());
--
Gitblit v1.9.1