后台

tour-module/src/main/java/com/tour/module/service/ILineCommissionService.java

@@ -16,4 +16,6 @@ public interface ILineCommissionService extends IService<LineCommission> {
     List<LineCommission> queryList(LineCommission commission);
 
     Boolean saveCommission(LineCommission commission);
+
+    Boolean updateCommission(LineCommission commission);
 }

tour-module/src/main/java/com/tour/module/service/impl/LineCommissionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.tour.module.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -13,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Demo class
@@ -40,6 +42,7 @@ public class LineCommissionServiceImpl extends ServiceImpl<LineCommissionMapper,
         if (StringUtils.isNotBlank(commission.getCityName())) {
             lqw.apply("(find_in_set("+commission.getCityName()+",city_name)");
         }
+        lqw.orderByDesc(LineCommission::getCreateTime);
 
         List<LineCommission> commissions = this.list(lqw);
         return commissions;
@@ -57,4 +60,19 @@ public class LineCommissionServiceImpl extends ServiceImpl<LineCommissionMapper,
         baseMapper.insert(commission);
         return true;
     }
+
+    @Override
+    public Boolean updateCommission(LineCommission commission) {
+        LineCommission commission1 = baseMapper.selectOne(new QueryWrapper<LineCommission>()
+                .eq("deleted", 0)
+                .eq("line_id", commission.getLineId())
+                .eq("province_name", commission.getProvinceName()));
+        if (Objects.isNull(commission1)) {
+            throw new CustomAppException("该省设置不存在！");
+        }
+        commission.setId(commission1.getId());
+        BeanUtil.copyProperties(commission, commission1);
+        baseMapper.updateById(commission1);
+        return true;
+    }
 }

tour-oms/src/main/java/com/tour/web/controller/LineCommissionController.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -35,4 +36,14 @@ public class LineCommissionController extends BaseController {
     public Result add(@RequestBody LineCommission commission) {
         return toAjax(iLineCommissionService.saveCommission(commission) ? 1 : 0);
     }
+
+    @PutMapping
+    public Result edit(@RequestBody LineCommission commission) {
+        return toAjax(iLineCommissionService.updateCommission(commission) ? 1 : 0);
+    }
+
+    @DeleteMapping("/{ids}" )
+    public Result remove(@PathVariable Long[] ids) {
+        return toAjax(iLineCommissionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
 }

web-ui/src/api/module/line.js

@@ -58,4 +58,19 @@ export function addLineCommission(data) {
     method: 'post',
     data: data
   })
+}
+
+export function delLineCommission(id) {
+  return request({
+    url: '/module/line/commission/' + id,
+    method: 'delete'
+  })
+}
+
+export function updatLineCommission(data) {
+  return request({
+    url: '/module/line/commission',
+    method: 'put',
+    data: data
+  })
 }

web-ui/src/components/area/lineArea.vue

@@ -73,6 +73,7 @@ export default {
     },
     changeCity(val) {
       this.provinceAndCity.cityName = ''
+      this.provinceAndCity.cityNames = []
       this.provinceAndCity.cityValues.forEach(item => {
         val.forEach(v => {
           if (item.id === v) {

web-ui/src/views/module/line/index.vue

@@ -232,6 +232,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-position" @click="commissionSubmit">提交</el-button>
+          <el-button type="success" icon="el-icon-edit" @click="commissionEdit">修改</el-button>
         </el-form-item>
       </el-form>
       <template>已设置省份</template>
@@ -240,6 +241,17 @@
         <el-table-column label="不参与分佣市名称" align="center" prop="cityName"/>
         <el-table-column label="佣金" align="center" prop="commission"/>
         <el-table-column label="创建时间" align="center" prop="createTime"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="commissionDelete(scope.row)"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
       </el-table>
 
       <pagination
@@ -256,7 +268,7 @@
 </template>
 
 <script>
-import { getList,addLine,updatLine,getInfo,delLine,getLineCommissionList,addLineCommission } from "@/api/module/line";
+import { getList,addLine,updatLine,getInfo,delLine,getLineCommissionList,addLineCommission,delLineCommission,updatLineCommission } from "@/api/module/line";
 import Area from '@/components/area'
 import {getToken} from "@/utils/auth";
 import Editor from '@/components/Editor';
@@ -512,7 +524,17 @@ export default {
     commissionSubmit() {
       this.$refs["form1"].validate(valid => {
         if (valid) {
-          if (this.startArea.province === undefined || this.startArea.province === '') {
+          this.setArea();
+          addLineCommission(this.form1).then(response => {
+              this.msgSuccess("新增成功");
+              this.getCommissionList();
+            });
+        }
+        });
+    },
+    
+    setArea() {
+      if (this.startArea.province === undefined || this.startArea.province === '') {
             this.$message({
               message: '请选择地区',
               type: 'error',
@@ -529,12 +551,33 @@ export default {
           this.form1.provinceName = this.startArea.provinceName
           this.form1.cityName = this.startArea.cityName
           console.log('form1', this.form1)
-          addLineCommission(this.form1).then(response => {
-              this.msgSuccess("新增成功");
-              this.getCommissionList();
-            });
+    },
+
+    commissionDelete(row) {
+      const ids = row.id ;
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delLineCommission(ids);
+      }).then(() => {
+        this.getCommissionList();
+        this.msgSuccess("删除成功");
+      })
+    },
+
+    commissionEdit() {
+      this.$refs["form1"].validate(valid => {
+        if (valid) {
+          this.setArea();
+          updatLineCommission(this.form1).then(response => {
+            this.msgSuccess("修改成功");
+            this.open = false;
+            this.getCommissionList();
+          });
         }
-        });
+      });
     },
    
     /** 提交按钮 */