From 365af808539413d618747e8e1fb6ed35d153064d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 09 八月 2024 11:26:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
index 5b79243..840f928 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.service.TExchangeOrderService;
@@ -12,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
@@ -34,6 +36,13 @@
private TShoppingOrderService tShoppingOrderService;
@Autowired
private TExchangeOrderService exchangeOrderService;
+
+ //订单详情
+ @PostMapping(value = "/detail")
+ public R<TExchangeOrder> detail(@RequestParam Long orderId) {
+ return R.ok(exchangeOrderService.getById(orderId));
+ }
+
/**
* 管理后台 根据商品ids 查询对应的销量
* @param goodsIds 订单号-商品类型
@@ -69,49 +78,45 @@
return R.ok(res);
}
/**
- * 管理后台 根据t_app_coupon流水号查询现金优惠券的订单编号
+ * 管理后台 根据t_app_coupon订单ids查询优惠券的订单编号
* @param goodsIds 订单号-商品类型
* @return
*/
- @PostMapping("/getCodeBySerialNumber")
- public R<List<String>> getCodeBySerialNumber(String goodsIds){
+ @PostMapping("/getCodeByOrderId")
+ public R<List<String>> getCodeByOrderId(String goodsIds){
String[] split = goodsIds.split("-");
List<String> strings = new ArrayList<>();
for (String s : split) {
- TShoppingOrder one = tShoppingOrderService.getOne(new QueryWrapper<TShoppingOrder>()
- .eq("order_type", 2)
- .eq("serial_number", s));
- if (one != null){
- strings.add(one.getCode());
+ if (s.contains("-")){
+ // 带有负号的是积分兑换的订单
+ TExchangeOrder one = exchangeOrderService.getOne(new QueryWrapper<TExchangeOrder>()
+ .eq("order_type", 2)
+ .eq("id", s.replace("-","")));
+ if (one != null){
+ strings.add(one.getCode());
+ }else{
+ strings.add("");
+ }
}else{
- strings.add("");
+ TShoppingOrder one = tShoppingOrderService.getOne(new QueryWrapper<TShoppingOrder>()
+ .eq("order_type", 2)
+ .eq("id", s));
+ if (one != null){
+ strings.add(one.getCode());
+ }else{
+ strings.add("");
+ }
}
+
}
return R.ok(strings);
}
/**
- * 管理后台 根据t_app_coupon流水号查询积分兑换优惠券的订单编号
+ * 管理后台 根据t_app_coupon订单ids查询积分兑换优惠券的订单编号
* @param goodsIds 订单号-商品类型
* @return
*/
- @PostMapping("/getCodeBySerialNumberIntegral")
- public R<List<String>> getCodeBySerialNumberIntegral(String goodsIds){
- String[] split = goodsIds.split("-");
- List<String> strings = new ArrayList<>();
- for (String s : split) {
- TExchangeOrder one = exchangeOrderService.getOne(new QueryWrapper<TExchangeOrder
- >()
- .eq("order_type", 2)
- .eq("serial_number", s));
- if (one != null){
- strings.add(one.getCode());
- }else{
- strings.add("");
- }
- }
- return R.ok(strings);
- }
}
--
Gitblit v1.7.1