CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
荒
2025-10-31 15:30:50 +08:00
parent 8db691cb66
commit 8f255a97a3
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GiftCouponController.java
View File

@@ -6,7 +6,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.jarvis.domain.GiftCoupon;
import com.ruoyi.jarvis.domain.OrderRows;
import com.ruoyi.jarvis.service.IGiftCouponService;
import com.ruoyi.jarvis.service.IOrderRowsService;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@@ -25,9 +27,11 @@ import com.ruoyi.common.core.page.TableDataInfo;
public class GiftCouponController extends BaseController {
private final IGiftCouponService giftCouponService;
private final IOrderRowsService orderRowsService;
public GiftCouponController(IGiftCouponService giftCouponService) {
public GiftCouponController(IGiftCouponService giftCouponService, IOrderRowsService orderRowsService) {
this.giftCouponService = giftCouponService;
this.orderRowsService = orderRowsService;
}
/**
@@ -79,7 +83,31 @@ public class GiftCouponController extends BaseController {
*/
@GetMapping(value = "/{giftCouponKey}")
public AjaxResult getInfo(@PathVariable("giftCouponKey") String giftCouponKey) {
return success(giftCouponService.selectGiftCouponByKey(giftCouponKey));
GiftCoupon giftCoupon = giftCouponService.selectGiftCouponByKey(giftCouponKey);
if (giftCoupon != null) {
// 查询关联的订单
OrderRows query = new OrderRows();
query.setGiftCouponKey(giftCouponKey);
List<OrderRows> orders = orderRowsService.selectOrderRowsList(query);
// 将订单列表添加到返回数据中
java.util.Map<String, Object> result = new java.util.HashMap<>();
result.put("giftCoupon", giftCoupon);
result.put("orders", orders);
return success(result);
}
return success(giftCoupon);
}
/**
* 查询礼金关联的订单列表
*/
@GetMapping("/{giftCouponKey}/orders")
public TableDataInfo getOrders(@PathVariable("giftCouponKey") String giftCouponKey) {
startPage();
OrderRows query = new OrderRows();
query.setGiftCouponKey(giftCouponKey);
List<OrderRows> list = orderRowsService.selectOrderRowsList(query);
return getDataTable(list);
}
/**