Merge branch 'feature/自建应用验证' into 'developer'

Feature/自建应用验证

See merge request !1191

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SecretTypeEnum.java

@@ -4,8 +4,8 @@ package com.gic.haoban.manage.api.enums;
  * Created by hua on 2020/6/3.
  */
 public enum SecretTypeEnum {
-    
-    CONTACT_CUSTOMER(1, "自建(原顾客联系)"),
+    SELF_APP(1, "好办自建"),
+    CONTACT_CUSTOMER(8, "顾客联系(目前无用)"),
     MEMBER_WAPP(4, "会员工具"),
     CUSTOMIZED_APP(5, "自建代开发"),
     WEWORK_PAY(6, "企业支付"),

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

@@ -75,7 +75,7 @@ public class SecretSettingServiceImpl implements SecretSettingService {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         // 如果是纯自建,使用自建的token
         if(qwDTO.isSelf()) {
-            secretType = SecretTypeEnum.CONTACT_CUSTOMER.getVal() ;
+            secretType = SecretTypeEnum.SELF_APP.getVal() ;
         }
         TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
         return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);

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

@@ -108,7 +108,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
             qw.setDkCorpid(wxEnterprise.getWxCorpid());
             qw.setThirdCorpid(wxEnterprise.getWxCorpid());
             qw.setMemberCorpid(wxEnterprise.getWxCorpid());
-            TabSecretSetting secret = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal(), null);
+            TabSecretSetting secret = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.SELF_APP.getVal(), null);
             qw.setSelfSecret(secret.getSecretVal());
             qw.setAgentId(secret.getAgentId());
             qw.setAgentName(secret.getAgentName());

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

@@ -323,7 +323,7 @@ public class WxEnterpriseController extends WebBaseController {
         // 如果是第三方校验待开发
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
         if(qwDTO.isSelf()) {
-            if ((secretTypeList.contains(SecretTypeEnum.CONTACT_CUSTOMER.getVal()))) {
+            if ((secretTypeList.contains(SecretTypeEnum.SELF_APP.getVal()))) {
                 return resultResponse(HaoBanErrCode.ERR_1, true);
             }
         }else {
@@ -357,12 +357,12 @@ public class WxEnterpriseController extends WebBaseController {
         if(StringUtils.isEmpty(token) || token.length() < 10) {
             return this.fail("请确认secret是否正确") ;
         }
-        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal(), null);
+        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.SELF_APP.getVal(), null);
         if (null == secretSetting) {
             secretSetting = new SecretSettingDTO();
         }
-        secretSetting.setSecretType(SecretTypeEnum.CONTACT_CUSTOMER.getVal());
-        secretSetting.setSecretName(SecretTypeEnum.CONTACT_CUSTOMER.getName());
+        secretSetting.setSecretType(SecretTypeEnum.SELF_APP.getVal());
+        secretSetting.setSecretName(SecretTypeEnum.SELF_APP.getName());
         secretSetting.setWxEnterpriseId(wxEnterpriseId);
         secretSetting.setEnterpriseId("-1");
         secretSetting.setSecretVal(wxSecretKey);