From 1278e530632f39e95e19a890e210a4e366b0c3f5 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Thu, 30 Jul 2020 15:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0-=E5=88=9B=E5=BB=BA=E6=9C=BA=E5=85=B3?=
 =?UTF-8?q?=E3=80=81=E6=88=91=E5=BE=97=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/PaCustomerController.java  | 10 ++++++----
 .../com/epmet/dao/PaCustomerUserAgencyDao.java  |  2 +-
 .../com/epmet/service/PaCustomerService.java    |  6 ++++--
 .../service/impl/PaCustomerServiceImpl.java     |  9 ++++++---
 .../mapper/PaCustomerUserAgencyDao.xml          | 17 ++++++++++-------
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
index 144b38aace..26ad711e95 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
@@ -61,25 +61,27 @@ public class PaCustomerController {
 
     /**
      * @param formDTO
+     * @param source 服务端类型  dev:开发 test:体验 prod:生产
      * @return
      * @Author sun
      * @Description 公众号-创建组织
      **/
     @PostMapping("createagency")
-    public Result<CreateAgencyResultDTO> createAgency(@LoginUser TokenDto tokenDTO, @RequestBody CreateAgencyFormDTO formDTO) {
+    public Result<CreateAgencyResultDTO> createAgency(@LoginUser TokenDto tokenDTO, @RequestBody CreateAgencyFormDTO formDTO,@RequestHeader("source")String source) {
         ValidatorUtils.validateEntity(formDTO, DefaultGroup.class);
-        return new Result<CreateAgencyResultDTO>().ok(paCustomerService.createAgency(tokenDTO, formDTO));
+        return new Result<CreateAgencyResultDTO>().ok(paCustomerService.createAgency(tokenDTO, formDTO,source));
     }
 
     /**
      * @param tokenDTO
+     * @param source 服务端类型  dev:开发 test:体验 prod:生产
      * @return
      * @Author sun
      * @Description 公众号-查询我的信息
      **/
     @PostMapping("myinfo")
-    public Result<MyInfoResultDTO> myInfo(@LoginUser TokenDto tokenDTO) {
-        return new Result<MyInfoResultDTO>().ok(paCustomerService.myInfo(tokenDTO));
+    public Result<MyInfoResultDTO> myInfo(@LoginUser TokenDto tokenDTO,@RequestHeader("source")String source) {
+        return new Result<MyInfoResultDTO>().ok(paCustomerService.myInfo(tokenDTO,source));
     }
 
     /**
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java
index 123300af1a..cb819bdee8 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java
@@ -38,5 +38,5 @@ public interface PaCustomerUserAgencyDao extends BaseDao<PaCustomerUserAgencyEnt
      * @Author sun
      * @Description 根据userId查询客户信息
      **/
-    PaCustomerUserAgencyDTO selectByUserId(@Param("userId") String userId);
+    PaCustomerUserAgencyDTO selectByUserId(@Param("userId") String userId, @Param("source")String source);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
index a48b2b7d88..829029168f 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
@@ -116,19 +116,21 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
 
     /**
      * @param formDTO
+     * @param source 服务端类型 dev:开发 test:体验 prod:生产
      * @return
      * @Author sun
      * @Description 公众号-创建组织
      **/
-    CreateAgencyResultDTO createAgency(TokenDto tokenDTO, CreateAgencyFormDTO formDTO);
+    CreateAgencyResultDTO createAgency(TokenDto tokenDTO, CreateAgencyFormDTO formDTO,String source);
 
     /**
      * @param tokenDTO
+     * @param source 服务端类型  dev:开发 test:体验 prod:生产
      * @return
      * @Author sun
      * @Description 公众号-查询我的信息
      **/
-    MyInfoResultDTO myInfo(TokenDto tokenDTO);
+    MyInfoResultDTO myInfo(TokenDto tokenDTO,String source);
 
     /**
      * @param formDTO
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
index fb4c90293b..3c2205f2c4 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
@@ -289,17 +289,19 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
 
     /**
      * @param formDTO
+     * @param source 服务端类型  dev:开发 test:体验 prod:生产
      * @return
      * @Author sun
      * @Description 公众号-创建组织
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CreateAgencyResultDTO createAgency(TokenDto tokenDTO, CreateAgencyFormDTO formDTO) {
+    public CreateAgencyResultDTO createAgency(TokenDto tokenDTO, CreateAgencyFormDTO formDTO,String source) {
         //1.客户表初始化数据
         PaCustomerEntity entity = new PaCustomerEntity();
         entity.setIsInitialize(NumConstant.ZERO);
         entity.setCustomerName(formDTO.getAgencyName());
+        entity.setSource(source);
         baseDao.insert(entity);
 
         //2.客户组织表初始化数据
@@ -356,15 +358,16 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
 
     /**
      * @param tokenDTO
+     * @param source 服务端类型  dev:开发 test:体验 prod:生产
      * @return
      * @Author sun
      * @Description 公众号-查询我的信息
      **/
     @Override
-    public MyInfoResultDTO myInfo(TokenDto tokenDTO) {
+    public MyInfoResultDTO myInfo(TokenDto tokenDTO,String source) {
 
         //0.根据token中userId查询对应的客户Id，客户Id没有则表示用户没有填写过组织信息，需要继续完善信息
-        PaCustomerUserAgencyDTO dto = paCustomerUserAgencyDao.selectByUserId(tokenDTO.getUserId());
+        PaCustomerUserAgencyDTO dto = paCustomerUserAgencyDao.selectByUserId(tokenDTO.getUserId(),source);
         if (null == dto || null == dto.getCustomerId()) {
             return new MyInfoResultDTO();
         }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml
index 36465c774b..6d87b3e9af 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerUserAgencyDao.xml
@@ -5,15 +5,18 @@
 
     <select id="selectByUserId" resultType="com.epmet.dto.PaCustomerUserAgencyDTO">
         SELECT
-            id,
-            customer_id,
-            agency_id,
-            user_id
+            pcua.id,
+            pcua.customer_id,
+            pcua.agency_id,
+            pcua.user_id
         FROM
-            pa_customer_user_agency
+            pa_customer_user_agency pcua
+            LEFT JOIN pa_user pu ON pu.id = pcua.user_id
         WHERE
-            del_flag = '0'
-        AND user_id = #{userId}
+            pcua.del_flag = '0'
+            AND pu.del_flag = '0'
+            AND pcua.user_id = #{userId}
+            AND pu.source = #{source}
     </select>
 
 </mapper>
\ No newline at end of file