From 76f04927058e3b144ff0e5dd8cde01b7fe069d74 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 22 四月 2025 17:28:07 +0800
Subject: [PATCH] 2.0bug修改
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 dde572e..0bbcee0 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
@@ -173,14 +173,18 @@
*/
@GetMapping("/allowanceMoney")
@ApiOperation(value = "补充订单津贴金额", tags = {"用户端-订单"})
- public R<Object> allowanceMoney(@RequestParam("orderId") String orderId, @RequestParam("prizeId") String prizeId) {
+ public R<Object> allowanceMoney(@RequestParam("orderId") String orderId,
+ @RequestParam("prizeId") String prizeId,
+ @RequestParam("serveId") String serveId) {
Prize data = adminClient.prizeDetail(prizeId).getData();
if (null == data) {
return R.fail(adminClient.prizeDetail(prizeId).getMsg());
}
String prizeMoney;
- if (data.getPrizeName().contains(Constants.SUBSIDY_MONEY)) {
- prizeMoney = data.getPrizeName().substring(Constants.ONE);
+ if (data.getPrizeType() == 1) {
+ // 查询服务回收补贴金
+ RecoveryServe recoveryServe = recoveryServeService.getById(serveId);
+ prizeMoney = recoveryServe.getRecycleSubsidy().toString();
} else {
prizeMoney = "0";
}
--
Gitblit v1.7.1