From 519155c26305aa6d951f1a552680b51b24e9116c Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 6 Mar 2024 16:45:11 +0800
Subject: [PATCH] bug

---
 .../src/api/EventMarketing/cardExchange.js    |  2 +-
 .../EventMarketing/cardExchange/index.vue     | 24 ++++++++++++++++---
 .../controller/CardExchangeController.java    |  8 +++----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/fuintAdmin/src/api/EventMarketing/cardExchange.js b/fuintAdmin/src/api/EventMarketing/cardExchange.js
index 1d5583fa9..19fd41c66 100644
--- a/fuintAdmin/src/api/EventMarketing/cardExchange.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchange.js
@@ -46,7 +46,7 @@ export function updateExchange(data) {
 // 删除兑换券
 export function delExchange(id) {
   return request({
-    url: '/system/exchange/' + id,
+    url: '/business/marketingActivity/cardExchange/' + id,
     method: 'delete'
   })
 }
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index 7e2f08f4b..a76ecfb5c 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -125,7 +125,16 @@
               @click="handleXia(scope.row)"
             >下线
             </el-button>
-<!--            <el-button-->
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              v-if="scope.row.isonline == 1"
+              @click="handleDelete(scope.row)"
+            >删除
+            </el-button>
+
+            <!--            <el-button-->
 <!--              size="mini"-->
 <!--              type="text"-->
 <!--              icon="el-icon-delete"-->
@@ -225,7 +234,7 @@ import {
   delExchange,
   addExchange,
   updateExchange,
-  getqueryGoods, exchangeInfo
+  getqueryGoods
 } from '@/api/EventMarketing/cardExchange'
 
 export default {
@@ -395,7 +404,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      exchangeInfo(row.id).then(res => {
+      getExchange(row.id).then(res => {
         this.form = res.data
       })
       // this.form = row
@@ -434,6 +443,15 @@ export default {
         }
       })
     },
+    handleDelete(data){
+      delExchange(data.id).then(res => {
+        if (res.code == 200) {
+          this.$message.success('删除成功')
+          this.getList()
+        }
+      })
+    },
+
     /** 上线操作 */
     handleShang(row) {
       let data = row
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java
index 03d9a48b3..cf60ad1a3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java
@@ -88,12 +88,12 @@ public class CardExchangeController extends BaseController {
     /**
      * 删除数据
      *
-     * @param idList 主键结合
+     * @param id 主键结合
      * @return 删除结果
      */
-    @DeleteMapping
-    public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
-        return getSuccessResult(this.cardExchangeService.removeByIds(idList));
+    @DeleteMapping("/{id}")
+    public ResponseObject delete(@PathVariable Long id) {
+        return getSuccessResult(this.cardExchangeService.removeById(id));
     }
 }