fix：授权流程支持代开发多模板bug修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java

@@ -205,4 +205,14 @@ public interface WxEnterpriseApiService {
      */
     void wellDoneLoginAddPrivacy(StaffPrivacyUseLogDTO staffPrivacyUseLogDTO);
 
+    /**
+     * 通过id获取密钥设置
+     *
+     * @param secretId 秘密身份
+     * @return {@link SecretSettingDTO }
+     * @author mozhu
+     * @date 2022-06-27 13:44:16
+     */
+    SecretSettingDTO getSecretSettingById(String secretId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/SecretSettingService.java

 package com.gic.haoban.manage.service.service;
 
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
-import com.gic.haoban.manage.service.entity.TabSecretSetting;
 
 import java.util.List;
 
@@ -47,4 +46,14 @@ public interface SecretSettingService {
      * @return
      */
     public SecretSettingDTO getMemberSecretSetting(String wxEnterpriseId,String enterpriseId);
+
+    /**
+     * 通过id获取密钥设置
+     *
+     * @param secretId 秘密身份
+     * @return {@link SecretSettingDTO }
+     * @author mozhu
+     * @date 2022-06-27 13:39:58
+     */
+    SecretSettingDTO getSecretSettingById(String secretId);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/SecretSettingServiceImpl.java

@@ -89,4 +89,10 @@ public class SecretSettingServiceImpl implements SecretSettingService {
         TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), null);
         return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
     }
+
+    @Override
+    public SecretSettingDTO getSecretSettingById(String secretId) {
+        TabSecretSetting secretSetting = secretSettingMapper.selectByPrimaryKey(secretId);
+        return EntityUtil.changeEntity(SecretSettingDTO.class, secretSetting);
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -365,4 +365,9 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             staffPrivacyUseLogService.insert(staffPrivacyUseLogBO);
         }
     }
+
+    @Override
+    public SecretSettingDTO getSecretSettingById(String secretId) {
+        return secretSettingService.getSecretSettingById(secretId);
+    }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

 package com.gic.haoban.manage.web.controller;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.DateUtil;
-import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
-import com.gic.enterprise.api.dto.EnterpriseWxaRelationDTO;
-import com.gic.enterprise.api.dto.StoreDTO;
-import com.gic.enterprise.api.dto.StoreSearchDTO;
+import com.gic.enterprise.api.dto.*;
 import com.gic.enterprise.api.service.AuthorizeService;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
@@ -36,27 +17,11 @@ import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.api.dto.AgentEnterpriseDTO;
-import com.gic.haoban.manage.api.dto.BindStoreInfoDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
-import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
-import com.gic.haoban.manage.api.dto.HaobanUserDTO;
-import com.gic.haoban.manage.api.dto.MaterialDTO;
-import com.gic.haoban.manage.api.dto.MiniprogramSettingDTO;
-import com.gic.haoban.manage.api.dto.SecretSettingDTO;
-import com.gic.haoban.manage.api.dto.StaffDTO;
-import com.gic.haoban.manage.api.dto.StoreOrGroupInfoDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
-import com.gic.haoban.manage.api.service.DepartmentApiService;
-import com.gic.haoban.manage.api.service.HaobanUserApiService;
-import com.gic.haoban.manage.api.service.MaterialApiService;
-import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
-import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.MiniprogramSettingQo;
@@ -70,8 +35,17 @@ import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.gic.wechat.token.api.dto.QywxCorpInfoDTO;
 import com.gic.wechat.token.api.service.QywxTokenManageService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 public class WxEnterpriseController extends WebBaseController {
@@ -403,8 +377,8 @@ public class WxEnterpriseController extends WebBaseController {
      * @return
      */
     @RequestMapping("wx-enterprise-member-secret-set")
-    public HaobanResponse wxEnterpriseMemberSecretSet(String memberSecret, String enterpriseId, String secretName) {
-        if (StringUtils.isAnyBlank(memberSecret)) {
+    public HaobanResponse wxEnterpriseMemberSecretSet(String secretId,String memberSecret, String enterpriseId, String secretName) {
+        if (StringUtils.isAnyBlank(memberSecret,enterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         String wxEnterpriseId = "";
@@ -415,9 +389,8 @@ public class WxEnterpriseController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }
         memberSecret = memberSecret.trim();
-
-        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
-        if (null == secretSetting) {
+        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSettingById(secretId);
+        if (StringUtils.isBlank(secretId)) {
             secretSetting = new SecretSettingDTO();
         } else {
             if (memberSecret.equals(secretSetting.getSecretVal())) {