feat：企微授权修改

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

@@ -26,6 +26,11 @@ public interface WxEnterpriseApiService {
 	 */
 	WxEnterpriseDTO getOne(String wxEnterpriseId);
 
+	/**
+	 * 根据corpId查询一条数据
+	 * @param corpId
+	 * @return
+	 */
 	WxEnterpriseDTO getEnterpriseBycorpId(String corpId);
 	/**
 	 * 更新企业
@@ -36,7 +41,12 @@ public interface WxEnterpriseApiService {
 	List<YwWxEnterpriseDTO> listAll();
 	
 	List<YwWxEnterpriseDTO> listByIds(Set<String> enterpriseIds);
-	
+
+	/**
+	 * 企业是否过期 true是
+	 * @param enterpriseId
+	 * @return
+	 */
 	boolean enterpriseIsOver(String enterpriseId);
 
 	/**

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

@@ -69,11 +69,11 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, dto);
         String wxEnterpriseId = "";
         //获取授权好办小程序
-        TabHaobanWxEnterprise enterprise = this.wxEnterpriseService.getEnterpriseByCorpName(corpName);
-        if (enterprise != null) {
-            wxEnterpriseId = enterprise.getWxEnterpriseId();
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseByCorpName(corpName);
+        if (wxEnterprise != null) {
+            wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
             WxEnterpriseDTO wxEnterpriseDTO = new WxEnterpriseDTO();
-            wxEnterpriseDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
+            wxEnterpriseDTO.setWxEnterpriseId(wxEnterpriseId);
             wxEnterpriseDTO.setStatusFlag(1);
             wxEnterpriseDTO.setBindFlag(1);
             wxEnterpriseService.update(wxDTO);
@@ -83,24 +83,24 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         if (StringUtils.isNotBlank(userId)) {
             staffApiService.wxGetAdd(userId, wxEnterpriseId);
         }
-        TabHaobanWxApplication tab = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId, wxEnterpriseId);
-        if (tab == null) {
-            tab = new TabHaobanWxApplication();
-            tab.setAgentId(agentId);
-            tab.setCorpid(corpid);
-            tab.setSiteId(siteId);
-            tab.setAgentName(agentName);
-            tab.setName(applicationName);
-            tab.setPermanentCode(permanentCode);
-            tab.setIsCustomizedApp(isCustomizedApp);
+        TabHaobanWxApplication haobanWxApplication = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId, wxEnterpriseId);
+        if (haobanWxApplication == null) {
+            haobanWxApplication = new TabHaobanWxApplication();
+            haobanWxApplication.setAgentId(agentId);
+            haobanWxApplication.setCorpid(corpid);
+            haobanWxApplication.setSiteId(siteId);
+            haobanWxApplication.setAgentName(agentName);
+            haobanWxApplication.setName(applicationName);
+            haobanWxApplication.setPermanentCode(permanentCode);
+            haobanWxApplication.setIsCustomizedApp(isCustomizedApp);
             if (isCustomizedApp != null && isCustomizedApp == 1) {
-                tab.setApplicationType(3);
+                haobanWxApplication.setApplicationType(3);
             }
-            tab.setWxEnterpriseId(wxEnterpriseId);
-            wxApplicationService.insert(tab);
+            haobanWxApplication.setWxEnterpriseId(wxEnterpriseId);
+            wxApplicationService.insert(haobanWxApplication);
         } else {
-            tab.setPermanentCode(permanentCode);
-            wxApplicationService.update(tab);
+            haobanWxApplication.setPermanentCode(permanentCode);
+            wxApplicationService.update(haobanWxApplication);
         }
         //企业代开发Secret = permanentCode
         if (isCustomizedApp != null && isCustomizedApp == 1) {