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-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index c3b447b..7462917 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -1,9 +1,21 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.account.api.feignClient.AppCouponClient;
+import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
+import com.ruoyi.account.api.vo.ExchangeRecordVO;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TGoods;
+import com.ruoyi.other.api.dto.GoodsDTO;
+import com.ruoyi.other.query.CouponQuery;
+import com.ruoyi.other.service.TActivityService;
+import com.ruoyi.other.service.TCouponService;
+import com.ruoyi.other.service.TGoodsService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -16,6 +28,49 @@
@RestController
@RequestMapping("/t-coupon")
public class TCouponController {
+ @Autowired
+ private TCouponService tCouponService;
+ @Autowired
+ private AppCouponClient appCouponClient;
+ @PostMapping("/saveGoods")
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券添加")
+ public AjaxResult saveActivity(@RequestBody TCoupon dto) {
+ tCouponService.save(dto);
+ return AjaxResult.success();
+ }
+ @GetMapping("/delete")
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券删除")
+ public AjaxResult delete(Integer id) {
+ tCouponService.removeById(id);
+ return AjaxResult.success();
+ }
+ @PostMapping("/updateVip")
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券修改")
+ public AjaxResult updateActivity(@RequestBody TCoupon dto) {
+ tCouponService.updateById(dto);
+ return AjaxResult.success();
+ }
+ @GetMapping("/getInfo")
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情")
+ public AjaxResult<TCoupon> getInfo(Integer id) {
+ TCoupon byId = tCouponService.getById(id);
+ // 查询累计发放数量
+ byId.setCount(appCouponClient.getCountByCouponIds(String.valueOf(id)).getData().get(0));
+ // 查询累计使用数量
+ byId.setUseCount(appCouponClient.getUseCountByCouponId(id).getData());
+ return AjaxResult.ok(byId);
+ }
+ @PostMapping("/exchangeRecord")
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录")
+ public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
+
+ return AjaxResult.ok(null);
+ }
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券列表分页查询")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TCoupon>> pageList(@RequestBody CouponQuery dto) {
+ return AjaxResult.ok(tCouponService.pageList(dto));
+ }
}
--
Gitblit v1.7.1