From 6b79e22056bcc2c14d3e20802174b89bc2a0a204 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 09 八月 2024 10:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 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 1c24499..5b79243 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
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -67,5 +68,50 @@
}
return R.ok(res);
}
+ /**
+ * 管理后台 根据t_app_coupon流水号查询现金优惠券的订单编号
+ * @param goodsIds 订单号-商品类型
+ * @return
+ */
+ @PostMapping("/getCodeBySerialNumber")
+ public R<List<String>> getCodeBySerialNumber(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());
+ }else{
+ strings.add("");
+ }
+ }
+
+ return R.ok(strings);
+ }
+ /**
+ * 管理后台 根据t_app_coupon流水号查询积分兑换优惠券的订单编号
+ * @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