From 4977a87b8a9ce3d4ed566a91ba83ba1ba9caba2b Mon Sep 17 00:00:00 2001
From: LegnaYet <1023868505@qq.com>
Date: Fri, 24 Apr 2020 22:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=8F=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kiisoo/ic/login/service/impl/LoginServiceImpl.java     | 3 +++
 .../java/com/kiisoo/ic/store/service/PoiStoreStaffService.java | 3 +--
 .../java/com/kiisoo/ic/store/service/StoreEmployeeService.java | 1 -
 .../ic/system/service/impl/PrivilageAccountServiceImpl.java    | 2 +-
 src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java  | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
index bbd3898..c5aee6e 100644
--- a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
@@ -106,6 +106,9 @@ public class LoginServiceImpl implements LoginService {
             loginBean.setLogin(login);
             loginInfoMap.put("code", LoginEnum.LOGIN_SUCCEED.getCode());
             loginBean.setLoginInfo(loginInfoMap);
+            if (StringUtils.isNotBlank(roleDO.getCode()) && MINI_ROLE_CODE.contains(roleDO.getCode())){
+                return new LoginBean(Constants.ERROR_ROLE_NO_PERMISSION);
+            }
         }else {
             return new LoginBean(Constants.LOGIN_NO_PERMISSIONS);
         }
diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
index 55ffa48..f1fd529 100644
--- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
@@ -120,7 +120,6 @@ public class PoiStoreStaffService {
             QueryWrapper<OpSellerCustomerRelation> wrapper2 = new QueryWrapper<>();
             wrapper2.eq("store_id",shopId);
             wrapper2.eq("user_id",poiStoreStaff.getUserId());
-            wrapper2.eq("type",1);
             List<OpSellerCustomerRelation> opRelations = opSellerCustomerRelationDOMapper.selectList(wrapper2);
             long count = opRelations.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count();
             poiStoreStaffVO.setCustomerNum((int)count);
@@ -261,7 +260,7 @@ public class PoiStoreStaffService {
         String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(poiStoreStaffVO.getStoreId());
 
         PoiStore poiStore = poiStoreDOMapper.selectById(poiStoreStaffVO.getStoreId());
-
+        poiStoreStaffVO.setStoreCode(poiStore.getCode());
 
         String[] data = new String[1];
         //选择店铺对应店长的编码
diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
index 7a1f59d..56fb5aa 100644
--- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
@@ -146,7 +146,6 @@ public class StoreEmployeeService {
                 //客户数
                 QueryWrapper<OpSellerCustomerRelation> wrapper2 = new QueryWrapper<>();
                 wrapper2.eq("store_id",cpUserStore.getId());
-                wrapper2.eq("type",1);
                 List<OpSellerCustomerRelation> opRelations = opSellerCustomerRelationDOMapper.selectList(wrapper2);
                 long count = opRelations.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count();
                 cpUserStore.setCustomerNum((int)count);
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
index 4290aa5..989ae1b 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
@@ -157,7 +157,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectById(saveAccountInput.getRoleId());
         //店长维护用户店铺关系1.店长。4.导购
         if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DG.getRoleCode())) {
-            privilageDomainService.saveOneShop(userId, saveAccountInput.getStaffCode(), shopId, saveAccountInput.getType());
+            privilageDomainService.saveOneShop(userId, saveAccountInput.getAccount(), shopId, saveAccountInput.getType());
             return true;
         }
         //运营人员维护全店铺域实体关系
diff --git a/src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java b/src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java
index c4d8b46..9e6b0a8 100644
--- a/src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java
+++ b/src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java
@@ -461,6 +461,7 @@ public class WxResponseService {
         ocew.setState(state);
         CustomerDTO customerDTO = new CustomerDTO();
         customerDTO.setUniId(ocew.getUnionid());
+        customerDTO.setName(ocew.getName());
         customerDTO.setExternalUserid(ocew.getExternalUserid());
         if (StringUtils.isNotBlank(ocew.getState())){
             //解析state 店铺code-导购