feat：授权流程支持代开发多模板

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/SecretSettingDTO.java

@@ -10,6 +10,9 @@ import java.util.Date;
  * @author fdh
  */
 public class SecretSettingDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
     /**
      *
      */
@@ -67,187 +70,84 @@ public class SecretSettingDTO implements Serializable {
      */
     private Date updateTime;
 
-    /**
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.secret_id
-     *
-     * @return the value of tab_haoban_secret_setting.secret_id
-     */
     public String getSecretId() {
         return secretId;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.secret_id
-     *
-     * @param secretId the value for tab_haoban_secret_setting.secret_id
-     */
     public void setSecretId(String secretId) {
         this.secretId = secretId;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.wx_enterprise_id
-     *
-     * @return the value of tab_haoban_secret_setting.wx_enterprise_id
-     */
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.wx_enterprise_id
-     *
-     * @param wxEnterpriseId the value for tab_haoban_secret_setting.wx_enterprise_id
-     */
     public void setWxEnterpriseId(String wxEnterpriseId) {
         this.wxEnterpriseId = wxEnterpriseId;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.secret_name
-     *
-     * @return the value of tab_haoban_secret_setting.secret_name
-     */
     public String getSecretName() {
         return secretName;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.secret_name
-     *
-     * @param secretName the value for tab_haoban_secret_setting.secret_name
-     */
     public void setSecretName(String secretName) {
         this.secretName = secretName;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.secret_val
-     *
-     * @return the value of tab_haoban_secret_setting.secret_val
-     */
     public String getSecretVal() {
         return secretVal;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.secret_val
-     *
-     * @param secretVal the value for tab_haoban_secret_setting.secret_val
-     */
     public void setSecretVal(String secretVal) {
         this.secretVal = secretVal;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.enterprise_id
-     *
-     * @return the value of tab_haoban_secret_setting.enterprise_id
-     */
     public String getEnterpriseId() {
         return enterpriseId;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.enterprise_id
-     *
-     * @param enterpriseId the value for tab_haoban_secret_setting.enterprise_id
-     */
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.secret_type
-     *
-     * @return the value of tab_haoban_secret_setting.secret_type
-     */
     public Integer getSecretType() {
         return secretType;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.secret_type
-     *
-     * @param secretType the value for tab_haoban_secret_setting.secret_type
-     */
     public void setSecretType(Integer secretType) {
         this.secretType = secretType;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.check_flag
-     *
-     * @return the value of tab_haoban_secret_setting.check_flag
-     */
     public Integer getCheckFlag() {
         return checkFlag;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.check_flag
-     *
-     * @param checkFlag the value for tab_haoban_secret_setting.check_flag
-     */
     public void setCheckFlag(Integer checkFlag) {
         this.checkFlag = checkFlag;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.status_flag
-     *
-     * @return the value of tab_haoban_secret_setting.status_flag
-     */
     public Integer getStatusFlag() {
         return statusFlag;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.status_flag
-     *
-     * @param statusFlag the value for tab_haoban_secret_setting.status_flag
-     */
     public void setStatusFlag(Integer statusFlag) {
         this.statusFlag = statusFlag;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.create_time
-     *
-     * @return the value of tab_haoban_secret_setting.create_time
-     */
     public Date getCreateTime() {
         return createTime;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.create_time
-     *
-     * @param createTime the value for tab_haoban_secret_setting.create_time
-     */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    /**
-     * This method returns the value of the database column tab_haoban_secret_setting.update_time
-     *
-     * @return the value of tab_haoban_secret_setting.update_time
-     */
     public Date getUpdateTime() {
         return updateTime;
     }
 
-    /**
-     * This method sets the value of the database column tab_haoban_secret_setting.update_time
-     *
-     * @param updateTime the value for tab_haoban_secret_setting.update_time
-     */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
 }
\ No newline at end of file

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

@@ -22,9 +22,10 @@ public class Config {
     private String appid;
     @Value("${memberOpenPage}")
     private String memberOpenPage;
-
     @Value("${historyMbrMassOperWhiteList}")
     private String historyMbrMassOperWhiteList;
+    @Value("${qywx_member_suite}")
+    private String qywxMemberSuite;
 
     public String getMemberOpenPage() {
         return memberOpenPage;
@@ -81,4 +82,12 @@ public class Config {
     public void setHistoryMbrMassOperWhiteList(String historyMbrMassOperWhiteList) {
         this.historyMbrMassOperWhiteList = historyMbrMassOperWhiteList;
     }
+
+    public String getQywxMemberSuite() {
+        return qywxMemberSuite;
+    }
+
+    public void setQywxMemberSuite(String qywxMemberSuite) {
+        this.qywxMemberSuite = qywxMemberSuite;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/SecretSettingMapper.java

@@ -41,9 +41,9 @@ public interface SecretSettingMapper {
 
     /**
      * 获取配置
-     *
      * @param wxEnterpriseId
      * @param secretType
+     * @param enterpriseId
      * @return
      */
     TabSecretSetting getSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId,

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

@@ -7,6 +7,7 @@ import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.service.dao.mapper.SecretSettingMapper;
 import com.gic.haoban.manage.service.entity.TabSecretSetting;
 import com.gic.haoban.manage.service.service.SecretSettingService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,7 +82,11 @@ public class SecretSettingServiceImpl implements SecretSettingService {
 
     @Override
     public SecretSettingDTO getMemberSecretSetting(String wxEnterpriseId, String enterpriseId) {
-        TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
+        if (StringUtils.isNotBlank(enterpriseId)) {
+            TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
+            return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
+        }
+        TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), null);
         return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
     }
 }

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

@@ -2,7 +2,6 @@ package com.gic.haoban.manage.service.service.out.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.ToolUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -68,6 +67,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         String applicationName = dto.getName();
         String userId = dto.getUserid();
         Integer isCustomizedApp = dto.getIsCustomizedApp();
+        String qywxMemberSuite = config.getQywxMemberSuite();
         WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, dto);
         String wxEnterpriseId = "";
         TabHaobanWxEnterprise wxEnterprise = null;
@@ -115,8 +115,14 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             if (secretSetting == null) {
                 secretSetting = new SecretSettingDTO();
                 secretSetting.setWxEnterpriseId(wxEnterpriseId);
-                secretSetting.setSecretType(SecretTypeEnum.CUSTOMIZED_APP.getVal());
-                secretSetting.setSecretName(SecretTypeEnum.CUSTOMIZED_APP.getName());
+                //兼容代开发会员小程序
+                if (qywxMemberSuite.equals(siteId)) {
+                    secretSetting.setSecretType(SecretTypeEnum.MEMBER_WAPP.getVal());
+                    secretSetting.setSecretName(SecretTypeEnum.MEMBER_WAPP.getName());
+                } else {
+                    secretSetting.setSecretType(SecretTypeEnum.CUSTOMIZED_APP.getVal());
+                    secretSetting.setSecretName(SecretTypeEnum.CUSTOMIZED_APP.getName());
+                }
                 secretSetting.setEnterpriseId("-1");
                 secretSetting.setCheckFlag(1);
             }
@@ -194,7 +200,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     @Override
     public void update(WxEnterpriseDTO enterpriseDTO) {
         wxEnterpriseService.update(enterpriseDTO);
-
     }
 
     @Override

haoban-manage3-service/src/main/resources/mapper/SecretSettingMapper.xml

@@ -169,5 +169,6 @@
     <if test="enterpriseId!=null">
       and  enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
     </if>
+    ORDER BY create_time desc LIMIT 1
   </select>
 </mapper>
\ No newline at end of file