代码优化

lb-web/src/main/java/com/ydd/web/controller/AgentController.java

@@ -170,6 +170,7 @@ public class AgentController extends BaseController {
     }
 
     @GetMapping("/updateAgentStatus")
+    @Log(title = "变更代理商状态" , businessType = BusinessType.UPDATE)
     public Result updateAgentStatus(Integer id){
         iAgentService.updateAgentStatus(id);
         return Result.success();

lb-web/src/main/java/com/ydd/web/controller/MerchantController.java

@@ -67,6 +67,7 @@ public class MerchantController extends BaseController {
         return Result.success(list);
     }
 
+    @Log(title = "变更商户状态" , businessType = BusinessType.UPDATE)
     @GetMapping("/updateStatus")
     public Result updateStatus(Integer id){
         iMerchantService.updateStatus(id);

lb-web/src/main/java/com/ydd/web/controller/OrderController.java

@@ -145,12 +145,14 @@ public class OrderController extends BaseController {
 
     // 手动取消订单
     @PostMapping("/cancelOrder")
+    @Log(title = "手动取消订单" , businessType = BusinessType.UPDATE)
     public Result cancelOrder(@RequestBody Order order) {
         return toAjax(iOrderService.cancelOrder(order) ? 1 : 0);
     }
 
     // 手动完成订单
     @PostMapping("/finishOrder")
+    @Log(title = "手动完成订单" , businessType = BusinessType.UPDATE)
     public Result finishOrder(@RequestBody Order order) {
         return toAjax(iOrderService.finishOrder(order) ? 1 : 0);
     }

lb-web/src/main/java/com/ydd/web/controller/ShopController.java

@@ -49,6 +49,7 @@ public class ShopController extends BaseController {
     }
 
     @GetMapping("/updateStatus")
+    @Log(title = "变更门店状态" , businessType = BusinessType.UPDATE)
     public Result updateStatus(Integer id){
         Shop shop = iShopService.getById(id);
         if (shop != null){

web-ui/src/views/module/agent/agent.vue

@@ -121,7 +121,7 @@
         </el-table-column>
         <!-- <el-table-column label="佣金比率(%)" align="center" prop="commissionRate" /> -->
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="状态" align="center" prop="status">
+        <el-table-column label="状态" align="center" prop="status" v-if="hasPermission(['module:agent:status'])">
           <template slot-scope="scope">
             <el-switch @change="updateAgentStatus(scope.row.id,scope.row.status)" :active-value="1" :inactive-value="0"
                 v-model="scope.row.status" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
@@ -191,7 +191,7 @@
               <span>{{scope.row.contactName}} / {{scope.row.mobile}}</span>
             </template>
           </el-table-column>
-           <el-table-column label="状态" align="center" prop="status">
+           <el-table-column label="状态" align="center" prop="status" v-if="hasPermission(['module:merchant:status'])">
             <template slot-scope="scope">
               <el-switch @change="updateStatus(scope.row.id,scope.row.status)" :active-value="2" :inactive-value="0"
                 v-model="scope.row.status" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
@@ -296,6 +296,7 @@
 import { listAgent, getAgent, delAgent, addAgent, updateAgent, exportAgent,listMerchant } from "@/api/module/agent";
 import { getAgentLevelList } from "@/api/module/agentLevel";
 import Area from '@/components/area'
+import {checkPermi} from '@/utils/permission'
 
 export default {
   components: {
@@ -481,6 +482,10 @@ export default {
         }
       })
     },
+    // 判断权限
+    hasPermission(value) {
+        return checkPermi(value);
+    },
     gotoInfo(id){
       this.$router.push({ path: '/agent/agent/agent', query: { id: id } })
     },

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

@@ -180,7 +180,7 @@
       <!-- <el-table-column label="法人姓名" align="center" prop="legalPerson" />
       <el-table-column label="身份证号码" align="center" prop="idcardNo" /> -->
       <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="状态" align="center" prop="status" v-if="hasPermission(['module:merchant:status'])">
         <template slot-scope="scope">
           <el-switch @change="updateStatus(scope.row.id,scope.row.status)" :active-value="2" :inactive-value="0"
             v-model="scope.row.status" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
@@ -373,6 +373,7 @@ import wditor from '@/components/Wditor';
 import user from '@/store/modules/user'
 import OldSend from '@/components/area/oldSend'
 import { getPersonnelByAgent } from "@/api/module/personnel";
+import {checkPermi} from '@/utils/permission'
 
 
 export default {
@@ -552,6 +553,8 @@ export default {
   },
   created() {
     this.user = user.actions.getSysUser()
+    var permissons = user.state.permissions;
+    this.hasMerchantStatusPermi = permissons.some(animal => animal == "module:merchant:status");
     this.userType = localStorage.getItem("SYS_USER_TYPE")
     this.getList();
     getAgentList().then(response => {
@@ -664,6 +667,10 @@ export default {
       this.open = false;
       this.reset();
     },
+    // 判断权限
+    hasPermission(value) {
+      return checkPermi(value);
+    },
     // 表单重置
     reset() {
       this.form = {

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

@@ -75,7 +75,7 @@
       <!-- <el-table-column label="营业时间" align="center" prop="openingHours" /> -->
       <el-table-column label="联系人姓名" align="center" prop="contactName" />
       <el-table-column label="联系电话" align="center" prop="mobile" />
-      <el-table-column label="门店状态" align="center" prop="status">
+      <el-table-column label="门店状态" align="center" prop="status" v-if="hasPermission(['module:shop:status'])">
         <template slot-scope="scope">
           <el-switch @change="updateStatus(scope.row.id,scope.row.status)" :active-value="1" :inactive-value="0"
             v-model="scope.row.status" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
@@ -222,6 +222,7 @@ import { getMerchantCategoryList } from "@/api/module/merchant";
 import area from '@/api/oldCity'
 import Area from '@/components/area/oldArea'
 import user from '@/store/modules/user'
+import {checkPermi} from '@/utils/permission'
 
 export default {
   name: "Shop",
@@ -395,6 +396,10 @@ export default {
       });
       this.packageRequestOpen = true;
     },
+    // 判断权限
+    hasPermission(value) {
+      return checkPermi(value);
+    },
 
     init(id) {
       this.queryParams.merchantId = id;