From 1529842471c8c07a5181a10404b6dff2a0944500 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 06 八月 2024 09:00:22 +0800
Subject: [PATCH] 8.6
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java
index c9e3635..4fc037f 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java
@@ -104,21 +104,21 @@
})
public R<BigDecimal> estimate(@RequestParam String orderId, String city) {
Order order = orderClient.detail(orderId).getData();
- RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
- .eq(RecoveryServe::getId, order.getServeId())
- .eq(RecoveryServe::getIsDelete, 0).one();
- BigDecimal money = recoveryServe.getDefaultPrice();
- if (StringUtils.isNotBlank(city)) {
- CityInfoVO info = GaoDeMapUtil.getAddressInfo(city).getDatas();
- RecoveryServePrice price = recoveryServePriceService.lambdaQuery()
- .eq(RecoveryServePrice::getRecoveryServeId, recoveryServe.getId())
- .eq(RecoveryServePrice::getCityCode, info.getCode())
- .eq(RecoveryServePrice::getIsDelete, Constants.ZERO).one();
- if (null != price) {
- money = price.getRecoveryPrice();
- }
- }
- return R.ok(money);
+// RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
+// .eq(RecoveryServe::getId, order.getServeId())
+// .eq(RecoveryServe::getIsDelete, 0).one();
+// BigDecimal money = recoveryServe.getDefaultPrice();
+// if (StringUtils.isNotBlank(city)) {
+// CityInfoVO info = GaoDeMapUtil.getAddressInfo(city).getDatas();
+// RecoveryServePrice price = recoveryServePriceService.lambdaQuery()
+// .eq(RecoveryServePrice::getRecoveryServeId, recoveryServe.getId())
+// .eq(RecoveryServePrice::getCity, info.getCode())
+// .eq(RecoveryServePrice::getIsDelete, Constants.ZERO).one();
+// if (null != price) {
+// money = price.getRecoveryPrice();
+// }
+// }
+ return R.ok(order.getServePrice());
}
@GetMapping("/detail")
--
Gitblit v1.7.1