From de5f47468762de1dd31bac481e3b7607df570338 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 8 Mar 2024 17:55:52 +0800
Subject: [PATCH] bug

---
 .../api/EventMarketing/activeConsumption.js    |  9 +++++++++
 .../EventMarketing/activeConsumption/index.vue | 18 ++++++++++++++++--
 .../ActiveConsumptionController.java           | 14 ++++++++++++++
 .../service/ActiveConsumptionService.java      |  8 ++++++++
 .../impl/ActiveConsumptionServiceImpl.java     | 12 ++++++++++++
 5 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/fuintAdmin/src/api/EventMarketing/activeConsumption.js b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
index 46c2cfa8c..4d257ea8d 100644
--- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js
+++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
@@ -75,6 +75,15 @@ export function updateActiveConsumption(data) {
   })
 }
 
+// 修改消费有礼活动
+export function editActiveConsumption(data) {
+  return request({
+    url: 'business/marketingActivity/activeConsumption/edit',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除消费有礼活动
 export function delActiveConsumption(id) {
   return request({
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 67c563479..4b67da8b5 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -635,7 +635,21 @@
 </template>
 
 <script>
-import { getoiltype,getoilName, listActiveConsumption,listExchange,listLJGoods, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption,listFavorable,looklook,looklooklook } from "@/api/EventMarketing/activeConsumption";
+import {
+  getoiltype,
+  getoilName,
+  listActiveConsumption,
+  listExchange,
+  listLJGoods,
+  getActiveConsumption,
+  delActiveConsumption,
+  addActiveConsumption,
+  updateActiveConsumption,
+  listFavorable,
+  looklook,
+  looklooklook,
+  editActiveConsumption
+} from "@/api/EventMarketing/activeConsumption";
 import {listUserGrade} from "@/api/staff/user/usergrade";
 import {getOilNameList} from "@/api/order/oilnumgun";
 import {updateExchange} from "@/api/EventMarketing/cardExchange";
@@ -1164,7 +1178,7 @@ export default {
       // });
 
       this.$modal.confirm('确定下线此条修改消费有礼活动信息？').then(function() {
-        return updateActiveConsumption({id:row.id,isonline:1});
+        return editActiveConsumption({id:row.id,isonline:1});
       }).then(() => {
         this.$modal.msgSuccess("下线成功");
         this.open = false;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
index 35f394a60..2273b6c9d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 消费有礼活动(ActiveConsumption)表控制层
@@ -101,6 +102,19 @@ public class ActiveConsumptionController extends BaseController {
         return getSuccessResult(this.activeConsumptionService.updateOneById(activeConsumptionDTO));
     }
 
+    /**
+     * 修改数据
+     *
+     * @param map 实体对象
+     * @return 修改结果
+     */
+    @PutMapping("/edit")
+    public ResponseObject edit(@RequestBody Map<String,String> map) {
+        Integer id = Integer.valueOf(map.get("id"));
+        String isonline = map.get("isonline");
+        return getSuccessResult(this.activeConsumptionService.editIsLone(id, isonline));
+    }
+
     /**
      * 删除数据
      * @param ids
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java
index 341c5d878..4d35a1e1c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java
@@ -49,6 +49,14 @@ public interface ActiveConsumptionService extends IService<ActiveConsumption> {
      */
     Boolean updateOneById(ActiveConsumptionDTO activeConsumptionDTO);
 
+    /**
+     * 修改下线
+     * @param id
+     * @param isonline
+     * @return
+     */
+    Boolean editIsLone(Integer id,String isonline);
+
     /**
      * 查询所有数据(小程序端)
      * @param activeConsumption
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
index 05a8abe3d..202e67d0f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
@@ -363,6 +363,18 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
         return update;
     }
 
+    @Override
+    public Boolean editIsLone(Integer id, String isonline) {
+        int row = 0;
+        ActiveConsumption activeConsumption = baseMapper.selectById(id);
+        if (ObjectUtil.isNotEmpty(activeConsumption)){
+            activeConsumption.setIsonline(isonline);
+            activeConsumption.setStatus("1");
+            row = baseMapper.updateById(activeConsumption);
+        }
+        return row == 1;
+    }
+
     /**
      * 查询所有数据(小程序端)
      * @param activeConsumption