From e961d2daa7f0fab9257ec411491cb23ab8a6c919 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 22 五月 2025 17:42:55 +0800
Subject: [PATCH] fix: 修复地址不显示的问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 144 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 109 insertions(+), 35 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 50ab317..f53cd8c 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
@@ -4,12 +4,11 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
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;
@@ -29,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
@@ -83,8 +81,8 @@
* @param tbOrders
* @return
*/
-// @Anonymous(needSign = true)
- @Anonymous
+ @Anonymous(needSign = true)
+// @Anonymous
// @Log(title = "orders", businessType = BusinessType.INSERT)
@ApiOperation("鏂板璁㈠崟")
@ApiImplicitParams({
@@ -103,23 +101,44 @@
@ApiImplicitParam(name = "bookingPrice", value = "鎶ヤ环", dataType = "BigDecimal")
})
@PostMapping("/add")
- public AjaxResult add(@RequestBody TbOrders tbOrders) {
+ public AjaxResult add(@RequestBody TbOrders tbOrders,String appId) {
try {
if (tbOrders == null || tbOrders.getOrderID() == null) {
return AjaxResult.error("浼犺緭鏁版嵁涓虹┖锛�");
}
+ if(appId ==null|| Objects.equals(appId, ""))
+ {
+ return AjaxResult.error("appid涓嶈兘涓虹┖锛�");
+ }
+
+ tbOrders.setAppId(appId);
tbOrders.setCreateTime(new Date());
- tbOrdersService.insertTbOrders(tbOrders);
+ try
+ {
+ tbOrdersService.insertTbOrders(tbOrders);
+ }
+ catch (Exception ex)
+ {
+ return AjaxResult.error("璁㈠崟鍙蜂笉鑳介噸澶�");
+ }
- SysClientApp scApp = clientAppService.selectSysClientAppByAppId(1L);
+ 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("瀹跺睘"); // 闅忔満璁剧疆瀹㈡埛鑱旂郴浜轰笌鎮ｈ�呭叧绯�
@@ -127,20 +146,45 @@
Calendar calendar = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
+
+ if(tbOrders.getPatientName() != null && !tbOrders.getPatientName().equals(""))
+ {
+ model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ }
+ else
+ {
+ model.setPtName("鎮ｈ��"); // 闅忔満鐢熸垚鎮ｈ�呭鍚�
+ }
- model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
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());
@@ -176,12 +220,14 @@
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.setUserID(scApp.getUserId());
+
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
@@ -191,21 +237,49 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
- model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ if(tbOrders.getPatientName() != null && !tbOrders.getPatientName().equals(""))
+ {
+ model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ }
+ else
+ {
+ model.setPtName("鎮ｈ��"); // 闅忔満鐢熸垚鎮ｈ�呭鍚�
+ }
+
+
model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
- model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
-// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�--榛樿涓浗锛屼笉闇�瑕佽缃�
+ model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�");
+// 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());
@@ -231,9 +305,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 ||
@@ -241,7 +315,7 @@
return AjaxResult.error("蹇呰鍙傛暟涓嶈兘涓虹┖锛�");
}
- SysClientApp scApp = clientAppService.selectSysClientAppByAppId(1L);
+ SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(appId);
ServiceOrderDelVo model = new ServiceOrderDelVo();
model.setMethod("ServiceOrder_DEL"); // 璁剧疆鎺ュ彛鍚嶇О
@@ -249,7 +323,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) {
// 鏇存柊鏈湴璁㈠崟鐘舵��
@@ -259,7 +333,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