From 9a91f7c649c8415de326e8a225fd9ba7b9a6204c Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Fri, 24 Jul 2020 17:56:51 +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-=E6=8E=88=E6=9D=83=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/OpenAppIdFormDTO.java   | 5 +++++
 .../com/epmet/controller/AppLetAuthorizationController.java  | 5 ++---
 .../java/com/epmet/service/AppLetAuthorizationService.java   | 3 +--
 .../epmet/service/impl/AppLetAuthorizationServiceImpl.java   | 5 ++---
 .../src/main/resources/mapper/CustomerMpDao.xml              | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/OpenAppIdFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/OpenAppIdFormDTO.java
index ddd36a2376..a4ac48fe47 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/OpenAppIdFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/OpenAppIdFormDTO.java
@@ -17,4 +17,9 @@ public class OpenAppIdFormDTO implements Serializable {
      * 客户端类型
      */
     private String clientType;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java
index 34d3d87cf2..0ef2d05e5a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java
@@ -53,13 +53,12 @@ public class AppLetAuthorizationController {
 
     /**
      * @Description  查看小程序绑定的开放平台账号
-     * @param tokenDto
      * @param formDTO
      * @author zxc
      */
     @PostMapping("getopenappidbyauthappid")
-    public Result<String> getOpenAppId(@LoginUser TokenDto tokenDto , @RequestBody OpenAppIdFormDTO formDTO){
-        String openAppId = appLetAuthorizationService.getOpenAppId(tokenDto, formDTO);
+    public Result<String> getOpenAppId( @RequestBody OpenAppIdFormDTO formDTO){
+        String openAppId = appLetAuthorizationService.getOpenAppId(formDTO);
         return new Result<String>().ok(openAppId);
     }
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/AppLetAuthorizationService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/AppLetAuthorizationService.java
index abb8f4bfbd..fd659764b9 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/AppLetAuthorizationService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/AppLetAuthorizationService.java
@@ -29,10 +29,9 @@ public interface AppLetAuthorizationService {
 
     /**
      * @Description  查看小程序绑定的开放平台账号
-     * @param tokenDto
      * @param formDTO
      * @author zxc
      */
-    String getOpenAppId(TokenDto tokenDto, OpenAppIdFormDTO formDTO);
+    String getOpenAppId(OpenAppIdFormDTO formDTO);
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java
index db41634212..ba3c63d941 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java
@@ -102,13 +102,12 @@ public class AppLetAuthorizationServiceImpl implements AppLetAuthorizationServic
 
     /**
      * @Description  查看小程序绑定的开放平台账号
-     * @param tokenDto
      * @param formDTO
      * @author zxc
      */
     @Override
-    public String getOpenAppId(TokenDto tokenDto, OpenAppIdFormDTO formDTO) {
-        String customerId = componentVerifyTicketServiceImpl.getLoginUserCustomerId(tokenDto);
+    public String getOpenAppId(OpenAppIdFormDTO formDTO) {
+        String customerId = formDTO.getCustomerId();
         String clientType = formDTO.getClientType();
         String authAppId = customerMpDao.getAppId(customerId, clientType);
         Map<String, Object> authInfo = redisThird.getAuthInfo(customerId, clientType);
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
index cd54689027..9c3c48b996 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml
@@ -135,7 +135,7 @@
         WHERE
             del_flag = 0
             AND customer_id = #{customerId}
-            AND client_type = #{clientType}
+            AND client = #{clientType}
     </select>
 
 </mapper>
\ No newline at end of file