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

好办小程序id

See merge request !1192

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

@@ -22,6 +22,15 @@ public class WxEnterpriseQwDTO implements Serializable {
     private String selfSecret ;
     // 自建请求地址
     private String urlHost ;
+    private String selfAppid ;
+    
+    public String getSelfAppid() {
+        return selfAppid;
+    }
+
+    public void setSelfAppid(String selfAppid) {
+        this.selfAppid = selfAppid;
+    }
 
     public String getUrlHost() {
         return urlHost;

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

@@ -112,6 +112,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
             qw.setSelfSecret(secret.getSecretVal());
             qw.setAgentId(secret.getAgentId());
             qw.setAgentName(secret.getAgentName());
+            qw.setSelfAppid(wxEnterprise.getWxaAppid());
         }
         logger.info("企微所有corpid信息={}",JSON.toJSON(qw));
         return qw;

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

@@ -11,4 +11,12 @@ public class QwUtils {
         }
         return secret;
     }
+    
+    public static String getHbAppid(WxEnterpriseQwDTO qwDTO, String thirdAppid) {
+        String appid = thirdAppid;
+        if (qwDTO.isSelf()) {
+            appid = qwDTO.getSelfAppid();
+        }
+        return appid;
+    }
 }