Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_thirdplatform

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

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

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

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

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>