微信第三方平台-创建机关、我得信息添加数据来源

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));
     }
 
     /**

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);
 }

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

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();
         }

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>