From dbc747e1b12605435e467e0f4751aabfce85c605 Mon Sep 17 00:00:00 2001
From: gongbiao <gongbiao>
Date: Thu, 26 Sep 2019 15:00:43 +0800
Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E5=88=86=E8=B4=A6=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?][=E4=BF=AE=E6=94=B9][=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9D=83=E9=99=90]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WxMerchantController.java        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java
index 69ecbd91f..7b9b79baf 100644
--- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java
+++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java
@@ -52,6 +52,9 @@ public class WxMerchantController extends BaseController {
     @PostMapping("/updateAccount")
     public ResultData addAccount(@RequestBody WxMerchant wxMerchant) {
         log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::addAccount");
+        if (!hasPermission()) {
+            return new ResultData(ErrorCode.USER_NO_PERMISSION);
+        }
         if (wxMerchant.getId() == null) {
             return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空");
         }
@@ -76,6 +79,9 @@ public class WxMerchantController extends BaseController {
     @ApiImplicitParam(name = "id", value = "商户分账账户ID", dataType = "Long", paramType = "query", required = true)
     public ResultData deleteByReceiverId(@ModelAttribute WxProfitSharingReceiver receiver) {
         log.debug("[" + getIpAddr() + "] WxMerchantController::deleteByReceiverId");
+        if (!hasPermission()) {
+            return new ResultData(ErrorCode.USER_NO_PERMISSION);
+        }
         if (receiver.getId() == null) {
             return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空");
         }
@@ -87,16 +93,17 @@ public class WxMerchantController extends BaseController {
     @GetMapping("/permitModifiy")
     public ResultData permitModifiy() {
         log.debug("[" + getIpAddr() + "] WxMerchantController::permitModifiy");
+        boolean has = hasPermission();
+        return new ResultData(has);
+    }
+
+    public boolean hasPermission() {
         WxMerchantBUser user = getUser();
         WxBuser buser = getBuser();
         WxMerchant merchant = new WxMerchant();
         merchant.setId(user.getMerchantId());
         WxMerchant wxMerchant = wxMerchantService.findOne(merchant);
-        if (wxMerchant == null) {
-            return new ResultData(false);
-        }
-        boolean has = buser.getPhone().equals(wxMerchant.getLinkPhone());
-        return new ResultData(has);
+        return wxMerchant != null && buser.getPhone().equals(wxMerchant.getLinkPhone());
     }
 
 }