From 5a3f811a95601ec5f4ffd9275d105416806f0935 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 11 Mar 2024 10:33:51 +0800
Subject: [PATCH] bug

---
 .../src/api/EventMarketing/activeNewlyweds.js | 10 ++++
 .../EventMarketing/activeNewlyweds/index.vue  | 48 +++++++++++++------
 .../EventMarketing/yijiancoupon/index.vue     |  2 +-
 .../controller/ActiveNewlywedsController.java | 14 ++++++
 .../service/ActiveNewlywedsService.java       |  8 ++++
 .../impl/ActiveNewlywedsServiceImpl.java      | 12 +++++
 6 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
index 3f2c7ea26..3222b39d5 100644
--- a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
+++ b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
@@ -51,6 +51,16 @@ export function updateActiveNewlyweds(data) {
   })
 }
 
+
+// 修改新人有礼活动
+export function editActiveNewlyweds(data) {
+  return request({
+    url: '/business/marketingActivity/activeNewlyweds/edit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除新人有礼活动
 export function delActiveNewlyweds(id) {
   return request({
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index 03ce014e3..baae7e83f 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -504,10 +504,23 @@
 </template>
 
 <script>
-import { listActiveNewlyweds, getActiveNewlyweds, delActiveNewlyweds, addActiveNewlyweds, updateActiveNewlyweds,huiActiveNewlyweds } from "@/api/EventMarketing/activeNewlyweds";
+import {
+  listActiveNewlyweds,
+  getActiveNewlyweds,
+  delActiveNewlyweds,
+  addActiveNewlyweds,
+  updateActiveNewlyweds,
+  huiActiveNewlyweds,
+  editActiveNewlyweds
+} from "@/api/EventMarketing/activeNewlyweds";
 import {getoilName, listExchange, listFavorable, looklook, looklooklook} from "@/api/EventMarketing/activeConsumption";
 import QRCode from "qrcodejs2";
-import {delActiveFullminus, getActiveFullminus, updateActiveFullminus} from "@/api/EventMarketing/activeFullminus";
+import {
+  delActiveFullminus,
+  editActiveFullminus,
+  getActiveFullminus,
+  updateActiveFullminus
+} from "@/api/EventMarketing/activeFullminus";
 
 export default {
   name: "ActiveNewlyweds",
@@ -887,17 +900,24 @@ export default {
       });
     },
     handleDeletexia(row){
-      getActiveNewlyweds(row.id).then(response => {
-
-        let data = response.data
-        data.isonline = 1
-        updateActiveNewlyweds(data).then(response => {
-          this.$modal.msgSuccess("下线成功");
-          this.open = false;
-          this.getList();
-        });
-
-      });
+      // getActiveNewlyweds(row.id).then(response => {
+      //
+      //   let data = response.data
+      //   data.isonline = 1
+      //   updateActiveNewlyweds(data).then(response => {
+      //     this.$modal.msgSuccess("下线成功");
+      //     this.open = false;
+      //     this.getList();
+      //   });
+      //
+      // });
+      this.$modal.confirm('确定下线此条新人有礼活动信息？').then(function() {
+        return editActiveNewlyweds({id:row.id,isonline:1});
+      }).then(() => {
+        this.$modal.msgSuccess("下线成功");
+        this.open = false;
+        this.getList();
+      }).catch(() => {});
     },
     submitForm() {
       // this.form.activeNewlywedsChildList
@@ -949,7 +969,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除新人有礼活动编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除此条新人有礼活动信息？').then(function() {
         return delActiveNewlyweds(ids);
       }).then(() => {
         this.getList();
diff --git a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
index a85bb8021..aa632873e 100644
--- a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
@@ -1098,7 +1098,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除此条一键发券活动的信息？').then(function() {
         return deleteCardFavorable(ids);
       }).then(() => {
         this.getList();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
index 9c288604e..af6057f9b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 新人有礼活动(ActiveNewlyweds)表控制层
@@ -91,6 +92,19 @@ public class ActiveNewlywedsController extends BaseController {
         return getSuccessResult(this.activeNewlywedsService.updateOneById(activeNewlywedsDTO));
     }
 
+    /**
+     * 修改数据
+     *
+     * @param map 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/edit")
+    public ResponseObject updateIsOnline(@RequestBody Map<String,String> map) {
+        Integer id = Integer.valueOf(map.get("id"));
+        String isonline = map.get("isonline");
+        return getSuccessResult(this.activeNewlywedsService.updateIsonline(id,isonline));
+    }
+
     /**
      * 删除数据
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java
index bd5c6ba59..6258b29a5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java
@@ -51,6 +51,14 @@ public interface ActiveNewlywedsService extends IService<ActiveNewlyweds> {
      */
     Boolean updateOneById(ActiveNewlywedsDTO activeNewlywedsDTO);
 
+    /**
+     * 修改下线
+     * @param id
+     * @param isonline
+     * @return
+     */
+    Boolean updateIsonline(Integer id,String isonline);
+
     /**
      * 查询单条数据(小程序端)
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java
index b7a46ae17..93b9e0ca0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java
@@ -473,6 +473,18 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
         return update;
     }
 
+    @Override
+    public Boolean updateIsonline(Integer id, String isonline) {
+        int row = 0;
+        ActiveNewlyweds activeNewlyweds = baseMapper.selectById(id);
+        if (ObjectUtil.isNotEmpty(activeNewlyweds)){
+            activeNewlyweds.setStatus("2");
+            activeNewlyweds.setIsonline(isonline);
+            row = baseMapper.updateById(activeNewlyweds);
+        }
+        return row == 1;
+    }
+
     @Override
     public List<ActiveNewlywedsAppletVO> selectApplet(ActiveConsumption activeConsumption) {
         ArrayList<ActiveNewlywedsAppletVO> arrayList = new ArrayList<>();