Commit f12e0af8 by 徐高华

加日志,去掉授权创建staff

parent 61cf4885
package com.gic.haoban.manage.api.service; package com.gic.haoban.manage.api.service;
import com.gic.haoban.manage.api.dto.CommonMQDTO;
/** /**
* *
* @ClassName: HaobanCommonMQApiService * @ClassName: HaobanCommonMQApiService
...@@ -10,4 +12,6 @@ package com.gic.haoban.manage.api.service; ...@@ -10,4 +12,6 @@ package com.gic.haoban.manage.api.service;
*/ */
public interface HaobanCommonMQApiService { public interface HaobanCommonMQApiService {
public void commonHandler(CommonMQDTO dto) ;
} }
...@@ -34,6 +34,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService { ...@@ -34,6 +34,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
@Override @Override
public String add(WxEnterpriseDTO wxDTO) { public String add(WxEnterpriseDTO wxDTO) {
logger.info("新增wx_enterprise,dto={}",JSON.toJSONString(wxDTO));
Date now = new Date(); Date now = new Date();
wxDTO.setWxEnterpriseId(StringUtil.randomUUID()); wxDTO.setWxEnterpriseId(StringUtil.randomUUID());
wxDTO.setCreateTime(now); wxDTO.setCreateTime(now);
......
package com.gic.haoban.manage.service.service.out.impl; package com.gic.haoban.manage.service.service.out.impl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.gic.haoban.manage.api.dto.CommonMQDTO;
import com.gic.haoban.manage.api.service.HaobanCommonMQApiService; import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
@Service("haobanCommonMQApiService") @Service("haobanCommonMQApiService")
public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService { public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
@Override
public void commonHandler(CommonMQDTO dto) {
}
} }
...@@ -34,7 +34,6 @@ import com.gic.haoban.manage.api.dto.WelcomeDTO; ...@@ -34,7 +34,6 @@ import com.gic.haoban.manage.api.dto.WelcomeDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO; import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO; import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
import com.gic.haoban.manage.api.enums.SecretTypeEnum; import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService; import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.service.config.Config; import com.gic.haoban.manage.service.config.Config;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper; import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper;
...@@ -60,8 +59,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -60,8 +59,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
@Autowired @Autowired
private WxEnterpriseService wxEnterpriseService; private WxEnterpriseService wxEnterpriseService;
@Autowired @Autowired
private StaffApiService staffApiService;
@Autowired
private WxEnterpriseMapper wxEnterpriseMapper; private WxEnterpriseMapper wxEnterpriseMapper;
@Autowired @Autowired
private WxApplicationService wxApplicationService; private WxApplicationService wxApplicationService;
...@@ -92,7 +89,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -92,7 +89,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
String agentName = dto.getAgentName(); String agentName = dto.getAgentName();
String permanentCode = dto.getPermanentCode(); String permanentCode = dto.getPermanentCode();
String applicationName = dto.getName(); String applicationName = dto.getName();
String userId = dto.getUserid();
Integer isCustomizedApp = dto.getIsCustomizedApp(); Integer isCustomizedApp = dto.getIsCustomizedApp();
String qywxMemberSuite = config.getQywxMemberSuite(); String qywxMemberSuite = config.getQywxMemberSuite();
WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, dto); WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, dto);
...@@ -101,6 +97,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -101,6 +97,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
// 获取授权好办小程序 // 获取授权好办小程序
wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpid); wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpid);
if (wxEnterprise == null) { if (wxEnterprise == null) {
log.info("通过corpid={}未查到记录",corpid);
wxEnterprise = this.wxEnterpriseService.getEnterpriseByCorpName(corpName); wxEnterprise = this.wxEnterpriseService.getEnterpriseByCorpName(corpName);
} }
...@@ -110,16 +107,19 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -110,16 +107,19 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
wxEnterpriseDTO.setWxEnterpriseId(wxEnterpriseId); wxEnterpriseDTO.setWxEnterpriseId(wxEnterpriseId);
wxEnterpriseDTO.setStatusFlag(1); wxEnterpriseDTO.setStatusFlag(1);
wxEnterpriseDTO.setBindFlag(1); wxEnterpriseDTO.setBindFlag(1);
wxEnterpriseService.update(wxDTO); // 如果corpid为空且是好办小程序,写入corpid
wxEnterpriseService.update(wxEnterpriseDTO);
} else { } else {
// 如果不是好办,不需要写入corpid
wxEnterpriseId = wxEnterpriseService.add(wxDTO); wxEnterpriseId = wxEnterpriseService.add(wxDTO);
} }
if (StringUtils.isNotBlank(userId)) { /*if (StringUtils.isNotBlank(userId)) {
staffApiService.wxGetAdd(userId, wxEnterpriseId); staffApiService.wxGetAdd(userId, wxEnterpriseId);
} }*/
TabHaobanWxApplication haobanWxApplication = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId, TabHaobanWxApplication haobanWxApplication = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId,
wxEnterpriseId); wxEnterpriseId);
if (haobanWxApplication == null) { if (haobanWxApplication == null) {
log.info("新增应用,suiteid={}",siteId);
haobanWxApplication = new TabHaobanWxApplication(); haobanWxApplication = new TabHaobanWxApplication();
haobanWxApplication.setAgentId(agentId); haobanWxApplication.setAgentId(agentId);
haobanWxApplication.setCorpid(corpid); haobanWxApplication.setCorpid(corpid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment