From 6f65725ca1524d27f90edcc4e5237ef9161c4bac Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Wed, 4 Sep 2024 16:23:49 +0800
Subject: [PATCH] 9.4

---
 .../openCardGift/api/separate.js              | 17 ++++++
 .../EventMarketing/openCardGift/separate.vue  | 56 ++++++++++++++-----
 .../controller/ActivePriceController.java     |  4 +-
 3 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/api/separate.js b/fuintAdmin/src/views/EventMarketing/openCardGift/api/separate.js
index d33c25032..ddb8e8db4 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/api/separate.js
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/api/separate.js
@@ -15,6 +15,15 @@ export function getID(id) {
 
   })
 }
+//修改
+export function updateActivePrice(data) {
+  return request({
+    url: '/business/activePrice/update',
+    method: 'post',
+    data: data
+
+  })
+}
 // 查询oil油号列表
 export function getoilList(query) {
   return request({
@@ -31,3 +40,11 @@ export function postaddList(data) {
     data: data
   })
 }
+// 删除分时优惠
+export function deleteList(id) {
+  return request({
+    url: '/business/activePrice/del/'+id,
+    method: 'delete',
+
+  })
+}
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
index b71a64440..be7a4f1d4 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
@@ -68,7 +68,7 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="createBy"
+          prop="createName"
           label="创建人"
         >
         </el-table-column>
@@ -407,7 +407,7 @@
   </div>
 </template>
 <script>
-import {getoilList, getRequestList, postaddList, getID} from "./api/separate";
+import {getoilList, getRequestList, postaddList, getID,updateActivePrice} from "./api/separate";
 import {oilNumberList1} from "@/api/order/oilnumgun";
 
 export default {
@@ -450,6 +450,19 @@ export default {
     this.getList()
   },
   methods: {
+    // 分时优惠制空
+    Blank(){
+      this.ruleForm ={
+        activeType: 1,
+        title: '',
+        name: '',
+        region: '',
+        category: '',
+        disValue: '',
+        type: [],
+        oilList: []
+      }
+    },
     // 修改
     modifySeparateList(id) {
       getID(id).then(res => {
@@ -460,19 +473,35 @@ export default {
         }
       })
     },
-    // 新增
+    // 新增/修改
     addSeparateList() {
+
       this.centerDialogVisible = false
-      postaddList(this.ruleForm).then(res => {
-        console.log(res)
-        if (res.code == 200) {
-          this.$message({
-            message: '添加成功',
-            type: 'success'
-          })
-          this.getList()
-        }
-      })
+      if(this.ruleForm.id){
+        updateActivePrice(this.ruleForm).then(res => {
+          console.log(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '添加成功',
+              type: 'success'
+            })
+            this.getList()
+          }
+        })
+      }else{
+        postaddList(this.ruleForm).then(res => {
+          console.log(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '添加成功',
+              type: 'success'
+            })
+            this.getList()
+          }
+        })
+      }
+
+
     },
     //列表查询
     getList() {
@@ -483,6 +512,7 @@ export default {
     },
     // 新增分时
     Timeshare() {
+      this.Blank()
       oilNumberList1().then(res => {
         this.ruleForm.oilList = res.data.records
         for (let i = 0; i < this.ruleForm.oilList.length; i++) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceController.java
index 1d29e9738..a6d72e5e6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceController.java
@@ -100,8 +100,8 @@ public class ActivePriceController extends BaseController {
      * @author PQZ
      * @date 11:30 2024/9/2
      **/
-    @DeleteMapping("del")
-    public ResponseObject del(@RequestParam("id") Integer id) {
+    @DeleteMapping("del/{id}")
+    public ResponseObject del(@PathVariable Integer id) {
         activePriceService.removeByActId(id);
         return getSuccessResult("删除成功", null);
     }