9.9

fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue

@@ -176,7 +176,7 @@
         ref="drawer"
       >
         <div class="demo-drawer__content">
-          <el-form :model="form"  :rules="rules" :inline="true" :label-position="labelPosition"  >
+          <el-form :model="form"  :rules="rules" :inline="true" :label-position="labelPosition" label-width="100px" >
 <!--            <div style="display: flex;">-->
 <!--              <div style="font-size: 14px;margin-right: 15px;padding-top: 8px;">电子储值卡活动适配对象</div>-->
 
@@ -191,8 +191,8 @@
 <!--            <div>{{form.membershipLevel}}</div>-->
             <el-row :gutter="20">
               <el-col :span="14">
-              <el-form-item   label="活动名称" label-width="formLabelWidth" prop="activeName">
+              <el-form-item   label="活动名称"  prop="activeName">
-                <el-input v-model="form.activeName"></el-input>
+                <el-input style="width: 250px" v-model="form.activeName"></el-input>
               </el-form-item>
               </el-col>
             </el-row>
@@ -438,7 +438,7 @@
       </el-dialog>
       <!--      规则-->
       <el-dialog title="新增储值卡规则" :visible.sync="Crule">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" :label-position="labelPosition">
           <el-form-item label="名称" prop="name">
             <el-input v-model="ruleForm.name"></el-input>
           </el-form-item>
@@ -574,7 +574,7 @@ import {
           name: '王小虎',
           address: '上海市普陀区金沙江路 1518 弄'
         }, ],
-        labelPosition:'left',
+        labelPosition:'right',
         pdidlist:[],//判断优惠券id
         pddhidlist:[],//判断兑换券id
         youhuiquanlist:[],

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponController.java

@@ -105,6 +105,17 @@ public class CardCouponController extends BaseController {
         return getSuccessResult(this.cardCouponService.updateById(cardCoupon));
     }
 
+    /**
+     * 删除数据
+     *
+     * @param id 主键结合
+     * @return 删除结果
+     */
+    @DeleteMapping("delete/{id}")
+    public ResponseObject deleteById(@PathVariable Serializable id) {
+        return getSuccessResult(this.cardCouponService.removeById(id));
+    }
+
     /**
      * 删除数据
      *
@@ -115,5 +126,15 @@ public class CardCouponController extends BaseController {
     public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
         return getSuccessResult(this.cardCouponService.removeByIds(idList));
     }
+
+    /**
+     * 上下架
+     * @param id
+     * @return
+     */
+    @GetMapping("isOnLine/{id}")
+    public ResponseObject isOnLine(@PathVariable Integer id) {
+        return getSuccessResult(cardCouponService.isOnLine(id));
+    }
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponService.java

@@ -13,5 +13,12 @@ import com.fuint.business.marketingActivity.cardCoupon.entity.CardCoupon;
  */
 public interface CardCouponService extends IService<CardCoupon> {
     IPage<CardCoupon> pageVo(Page page, CardCoupon cardCoupon);
+
+    /**
+     * 上下架
+     * @param id
+     * @return
+     */
+    int isOnLine(Integer id);
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fuint.business.marketingActivity.cardCoupon.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,5 +22,15 @@ public class CardCouponServiceImpl extends ServiceImpl<CardCouponMapper, CardCou
     public IPage<CardCoupon> pageVo(Page page, CardCoupon cardCoupon) {
         return baseMapper.pageVo( page,  cardCoupon);
     }
+
+    @Override
+    public int isOnLine(Integer id) {
+        CardCoupon cardCoupon = baseMapper.selectById(id);
+        if (ObjectUtil.isEmpty( cardCoupon)) {
+            return 0;
+        }
+        cardCoupon.setStatus(cardCoupon.getStatus().equals("0") ? "1" : "0");
+        return baseMapper.updateById(cardCoupon);
+    }
 }