From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 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..99ecf32 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
@@ -35,6 +35,7 @@
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -104,21 +105,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")
@@ -150,8 +151,8 @@
*/
@GetMapping("/prizeList")
@ApiOperation(value = "获取奖品列表", tags = {"用户端-订单"})
- public R<List<Prize>> prizeList() {
- return R.ok(adminClient.prizeList().getData());
+ public R<List<Prize>> prizeList(@RequestParam("serveId") String serveId) {
+ return R.ok(adminClient.prizeList(Integer.valueOf(serveId)).getData());
}
/**
@@ -161,8 +162,8 @@
*/
@GetMapping("/allowance")
@ApiOperation(value = "抽奖获取津贴", tags = {"用户端-订单"})
- public R<Object> obtainAllowance() {
- return R.ok(orderService.obtainAllowance(adminClient.prizeList().getData()));
+ public R<Object> obtainAllowance(@RequestParam("serveId") String serveId) {
+ return R.ok(orderService.obtainAllowance(adminClient.prizeList(Integer.valueOf(serveId)).getData()));
}
/**
@@ -208,4 +209,20 @@
return result ? R.ok() : R.fail();
}
+ /**
+ * 领取补贴金
+ *
+ */
+ @GetMapping("/receivingSubsidies")
+ @ApiOperation(value = "领取补贴金", tags = {"用户端-订单-领取补贴金[2.0]"})
+ public R<Object> receivingSubsidies(@RequestParam("serveId") String serveId,@RequestParam("orderId") String orderId) {
+ // 查询补贴金
+ RecoveryServe recoveryServe = recoveryServeService.getById(serveId);
+ if (Objects.isNull(recoveryServe)) {
+ return R.fail("该服务不存在！");
+ }
+ orderClient.receiving(orderId,recoveryServe.getRecycleSubsidy());
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1