From e33b7672b2cabfc2a3b6ee64da20b71ba5dc18ac Mon Sep 17 00:00:00 2001
From: LegnaYet <1023868505@qq.com>
Date: Wed, 29 Apr 2020 23:05:45 +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

---
 .../mapper/PrivilageDomainEntityDOMapper.java  |  1 +
 .../kiisoo/ic/store/entity/StoreUserDTO.java   |  8 ++++++++
 .../ic/store/service/StoreEmployeeService.java | 18 ++++++++++++++++--
 .../mapper/PrivilageDomainEntityDOMapper.xml   |  8 ++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageDomainEntityDOMapper.java b/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageDomainEntityDOMapper.java
index 1e7c314..b62be56 100644
--- a/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageDomainEntityDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageDomainEntityDOMapper.java
@@ -23,4 +23,5 @@ public interface PrivilageDomainEntityDOMapper extends BaseMapper<PrivilageDomai
      */
     List<Long> selectEntityByUserId(@Param("userId") Long userId, @Param("type") Integer type);
 
+    Long selectDomainIdByShopEntity(Long id);
 }
diff --git a/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java b/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java
index ed1d0c4..ffd34f9 100644
--- a/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java
+++ b/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java
@@ -34,4 +34,12 @@ public class StoreUserDTO extends PoiStore{
      * 二维码
      */
     private String qrCodeAction;
+    /**
+     * 大区名
+     */
+    private String regionName;
+    /**
+     * 公司名
+     */
+    private String companyName;
 }
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 eb4e565..57c782c 100644
--- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
@@ -13,6 +13,7 @@ import com.kiisoo.ic.customer.mapper.OpSellerCustomerRelationDOMapper;
 import com.kiisoo.ic.customer.service.CustomerViewService;
 import com.kiisoo.ic.department.entity.DepartmentDO;
 import com.kiisoo.ic.department.mapper.PrivilageDepartmentDOMapper;
+import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper;
 import com.kiisoo.ic.domain.service.PrivilageDomainService;
 import com.kiisoo.ic.employee.entity.EmployeeDO;
 import com.kiisoo.ic.employee.entity.ImportErrorDTO;
@@ -76,6 +77,12 @@ public class StoreEmployeeService {
     @Autowired
     private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper;
 
+    @Autowired
+    private PrivilageDomainEntityDOMapper privilageDomainEntityDOMapper;
+
+    @Autowired
+    private RetailCompanyMapper retailCompanyMapper;
+
     @Autowired
     private PrivilageCpUserDOMapper privilageCpUserDOMapper;
 
@@ -93,8 +100,6 @@ public class StoreEmployeeService {
     @Autowired
     private OpSellerCustomerRelationDOMapper opSellerCustomerRelationDOMapper;
 
-    @Autowired
-    private RetailCompanyMapper retailCompanyMapper;
 
     @Autowired
     private RetailCompanyService retailCompanyService;
@@ -147,6 +152,15 @@ public class StoreEmployeeService {
                     cpUserStore.setName(poiStore.getName());
                     cpUserStore.setCode(poiStore.getCode());
                 }
+                //客户orgId
+                Long customerId = privilageDomainEntityDOMapper.selectDomainIdByShopEntity(cpUserStore.getId());
+
+                PrivilageOrganizational company = retailCompanyMapper.selectById(customerId);
+                PrivilageOrganizational region = retailCompanyMapper.selectById(company.getParentId());
+
+                cpUserStore.setCompanyName(company.getName());
+                cpUserStore.setRegionName(region.getName());
+
 
                 String qrCodeAction = cpUserStore.getQrCodeAction();
                 if (StringUtils.isBlank(qrCodeAction)){
diff --git a/src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml b/src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml
index d4d7dfe..2eb45f7 100644
--- a/src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml
@@ -9,4 +9,12 @@
         and t1.user_id = #{userId}
     </select>
 
+    <select id="selectDomainIdByShopEntity" resultType="java.lang.Long">
+      select t1.org_id from  privilage_domain_entity t1,privilage_organizational_domain t2
+        where t1.entity_id = #{shopId}
+        and t1.domain_id = t2.domain_id
+        and t1.type = 3
+        limit 1
+    </select>
+
 </mapper>