From 413ba399d9248733ccb63ded8816c3053cd1dc1e Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Mon, 11 May 2020 14:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/system/bean/AccountBean.java    | 15 ++++++++++++++
 .../impl/PrivilageAccountServiceImpl.java     | 20 ++++++++++++++++++-
 .../mapper/PrivilageAccountDOMapper.xml       |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/system/bean/AccountBean.java b/src/main/java/com/kiisoo/ic/system/bean/AccountBean.java
index 6c334bc..bb41d33 100644
--- a/src/main/java/com/kiisoo/ic/system/bean/AccountBean.java
+++ b/src/main/java/com/kiisoo/ic/system/bean/AccountBean.java
@@ -43,6 +43,11 @@ public class AccountBean {
      */
     private String userName;
 
+    /**
+     * 用户别名
+     */
+    private String abbreviation;
+
     /**
      * 角色名
      */
@@ -63,11 +68,21 @@ public class AccountBean {
      */
     private Long shopId;
 
+    /**
+     * 零售公司名字
+     */
+    private String companyName;
+
     /**
      * 店铺名字
      */
     private String shopName;
 
+    /**
+     * 店铺code
+     */
+    private String shopCode;
+
     /**
      * 角色码
      */
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 3f739b4..34a3154 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
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kiisoo.ic.common.utils.MD5FileUtil;
 import com.kiisoo.ic.constants.Constants;
+import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper;
 import com.kiisoo.ic.domain.service.PrivilageDomainService;
 import com.kiisoo.ic.generalize.entity.PrivilageOrganizational;
 import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember;
@@ -104,6 +105,12 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
     @Autowired
     private RetailCompanyService retailCompanyService;
 
+    /**
+     * 域 service
+     */
+    @Autowired
+    private PrivilageDomainEntityDOMapper privilageDomainEntityDOMapper;
+
     @Autowired
     public PrivilageAccountServiceImpl(PrivilageAccountDOMapper privilageAccountDOMapper, PrivilageUserDOMapper privilageUserDOMapper, PrivilageUserService privilageUserService, PrivilageUserRoleService privilageUserRoleService, PrivilageDomainService privilageDomainService, PrivilageRoleDOMapper privilageRoleDOMapper, PoiStoreStaffDOMapper poiStoreStaffDOMapper, PoiStoreDOMapper poiStoreDOMapper) {
         this.privilageAccountDOMapper = privilageAccountDOMapper;
@@ -330,6 +337,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
             if (!roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) && !roleCode.equals(RoleEnum.ROLE_CODE_DG.getRoleCode()) && !roleCode.equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) {
                 accountBean.setChannel(AccountBean.ALL_SHOP);
                 accountBean.setShopName(AccountBean.ALL_SHOP);
+                accountBean.setCompanyName(AccountBean.ALL_SHOP);
             }
             //运营人员
             if (roleCode.equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) {
@@ -339,7 +347,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
                 if (p1 != null) {
                     accountBean.setOrgId(p1.getOrgId());
                     PrivilageOrganizational list1 = retailCompanyMapper.selectById(p1.getOrgId());
-                    accountBean.setShopName(list1.getName());
+                    accountBean.setCompanyName(list1.getName());
                 }
             }
             //店长角色查询店铺信息和渠道
@@ -352,7 +360,17 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
                     PoiStore poiStore = poiStoreDOMapper.selectById(shopNameByUserId.getStoreId());
                     accountBean.setShopId(shopNameByUserId.getStoreId());
                     accountBean.setShopName(poiStore == null ? null : poiStore.getName());
+                    accountBean.setShopCode(poiStore == null ? null : poiStore.getCode());
                     accountBean.setStaffCode(shopNameByUserId.getStaffCode());
+                    //客户orgId
+                    Long customerId = privilageDomainEntityDOMapper.selectDomainIdByShopEntity(shopNameByUserId.getStoreId());
+
+                    if (customerId != null){
+                        PrivilageOrganizational customer = retailCompanyMapper.selectById(customerId);
+                        PrivilageOrganizational company = retailCompanyMapper.selectById(customer.getParentId());
+
+                        accountBean.setCompanyName(company.getName());
+                    }
                 }
             }
             accountBean.setAccount(privilageAccountDO.getLogin());
diff --git a/src/main/resources/mapper/PrivilageAccountDOMapper.xml b/src/main/resources/mapper/PrivilageAccountDOMapper.xml
index 0454c9f..bc6a063 100644
--- a/src/main/resources/mapper/PrivilageAccountDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageAccountDOMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper">
 
     <select id="selectUserAndRoleInfo" resultType="com.kiisoo.ic.system.bean.AccountBean">
-        select t1.id as userId,t1.name as userName, t3.name as roleName, t3.id as roleId, t3.code as roleCode,t1.mobil
+        select t1.id as userId,t1.name as userName, t3.name as roleName, t3.id as roleId, t3.code as roleCode,t1.mobil,t1.abbreviation
         from privilage_user t1, privilage_user_role t2, privilage_role t3
         where t1.id = t2.user_id
         and t2.role_id = t3.id