From 0846753b50b65e8974b3860e6064c38be9c114a9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 18:40:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 1 +
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java | 24 ------------------------
2 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 0e2b70b..aafb2a0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -907,6 +907,7 @@
return R.fail("订单不存在");
}
order.setSubsidy(recycleSubsidy);
+ order.setOrderMoney(order.getOrderMoney().add(recycleSubsidy));
orderService.updateById(order);
return R.ok();
}
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 0bbcee0..4acf1bf 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
@@ -191,30 +191,6 @@
return R.ok(orderClient.supplementAllowance(orderId, prizeMoney).getData());
}
- /**
- * 分享获取津贴
- *
- * @return 奖品列表
- */
- @GetMapping("/shareAllowanceMoney")
- @ApiOperation(value = "分享获取津贴", tags = {"用户端-订单"})
- public R<Object> shareAllowanceMoney(@RequestParam("orderId") String orderId, @RequestParam("prizeId") String prizeId) {
- Prize data = adminClient.prizeDetail(prizeId).getData();
- if (null == data) {
- return R.fail(adminClient.prizeDetail(prizeId).getMsg());
- }
- if(Objects.isNull(data.getPrizeType()) || data.getPrizeType() == 2){
- return R.fail("该津贴为非补贴金类型");
- }
- String prizeMoney;
- if (data.getPrizeType()==1) {
- prizeMoney = data.getPrizeName().substring(Constants.ONE);
- } else {
- prizeMoney = "0";
- }
- return R.ok(orderClient.supplementAllowance(orderId, prizeMoney).getData());
- }
-
@PostMapping("/orderEstimate")
@ApiOperation(value = "下单评估，生成预订单信息", tags = {"用户端-订单"})
public R<String> orderEstimate(@RequestBody OrderRequest orderRequest) {
--
Gitblit v1.7.1