fix

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

@@ -120,7 +120,7 @@ public interface DepartmentApiService {
 	List<DepartmentDTO> listByChainId(String chainId,String wxEnterpriseId);
 
 
-	void initwxDepartment(String corpid, String suiteid, String wxEnterpriseId);
+	void initwxDepartment(String corpid, String contactSecret, String wxEnterpriseId);
 	/**
 	 * 回收站的数量
 	 * @param wxEnterpriseId

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

@@ -47,7 +47,7 @@ public interface StaffApiService {
 
 	StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
 
-	void initWxUser(String corpid, String suiteid, String wxEnterpriseId, Integer wxDepartmentId);
+	void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId);
 
 	public List<String> listUnBindClerk(String storeId);
 

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

@@ -47,17 +47,14 @@ import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
-import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
 import com.gic.haoban.manage.service.service.DepartmentService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.UserLoginLogService;
-import com.gic.haoban.manage.service.service.WxApplicationService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
 
 @Service
 public class StaffApiServiceImpl implements StaffApiService {
@@ -77,8 +74,6 @@ public class StaffApiServiceImpl implements StaffApiService {
 	@Autowired
 	private WxEnterpriseService wxEnterpriseService;
 	@Autowired
-	private WxApplicationService wxApplicationService;
-	@Autowired
 	private DepartmentService departmentService;
 	@Autowired
 	private ClerkService clerkService;
@@ -126,9 +121,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 		//调接口获取
 		String wxUserId = "";
 		WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(staff.getWxEnterpriseId());
-		TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(staff.getWxEnterpriseId(),1);
 		if(enterpriseDTO != null) {
-			if(application != null) {
 			UserDTO userDTO = new UserDTO();
 			userDTO.setCorpid(enterpriseDTO.getCorpid());
 			String[] departmentIdArr = departmentIds.split(",");
@@ -151,7 +144,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 				userDTO.setTo_invite(true);
 			}
 			logger.info("【店员新增】userDTO = {}",JSON.toJSONString(userDTO));
-				JSONResponse jp = qywxUserApiService.createWorkWxUser(userDTO, enterpriseDTO.getCorpid(), application.getSiteId());
+			JSONResponse jp = qywxUserApiService.createSelfWorkWxUser(userDTO, enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret());
 			logger.info("【店员新增】jp = {}",JSON.toJSONString(jp));
 			if(jp.getErrorCode() != 0) {
 				hr.setCode(0);
@@ -161,7 +154,6 @@ public class StaffApiServiceImpl implements StaffApiService {
 			staffService.add(tab);
 			wxUserId = staffId;
 		}
-		}
 		if(StringUtils.isNotBlank(wxUserId)){
 			String[] departmentIdArr = departmentIds.split(",");
 			for (String string : departmentIdArr) {
@@ -229,13 +221,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 			if(relatedList.size() == 1) {
 				TabHaobanStaff staff = staffService.selectById(relatedList.get(0).getStaffId());
 				WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(staff.getWxEnterpriseId());
-				TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(staff.getWxEnterpriseId(),1);
 				if(enterpriseDTO != null) {
-					if(application != null) {
-						JSONResponse jp =  qywxUserApiService.deleteWorkWxUser(enterpriseDTO.getCorpid(), application.getSiteId(), staff.getWxUserId());
+					JSONResponse jp =  qywxUserApiService.deleteSelfWorkWxUser(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), staff.getWxUserId());
 					logger.info("【删除成员】jp={}",JSON.toJSONString(jp));
 				}
-				}
 				staffDepartmentRelatedService.del(related);
 				staffService.delByuserid(relatedList.get(0).getStaffId());
 				
@@ -297,14 +286,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId,wxEnterpriseId);
 		if(staff == null) {
 			WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-			TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,1);
-			if(application == null){
-				application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,2);
-			}
 			if(enterpriseDTO != null) {
-				if(application != null) {
 				Date now = new Date();
-					UserDTO user = qywxUserApiService.getWorkWxUser(enterpriseDTO.getCorpid(), application.getSiteId(), userId);
+				UserDTO user = qywxUserApiService.getSelfWorkWxUser(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), userId);
 				logger.info("【新增用户】user={}",JSON.toJSONString(user));
 				TabHaobanStaff tab = new TabHaobanStaff();
 				tab.setWxUserId(userId);
@@ -353,16 +337,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 					}
 				}
 			}
-			}
 		}else{
 			WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-			TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,1);
-			if(application == null){
-				application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,2);
-			}
 			if(enterpriseDTO != null) {
-				if(application != null) {
-					UserDTO user = qywxUserApiService.getWorkWxUser(enterpriseDTO.getCorpid(), application.getSiteId(), userId);
+				UserDTO user = qywxUserApiService.getSelfWorkWxUser(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), userId);
 				logger.info("【修改用户】user={}",JSON.toJSONString(user));
 				Integer[] departmentId = user.getDepartment();
 				String departmentIds = "";
@@ -382,7 +360,6 @@ public class StaffApiServiceImpl implements StaffApiService {
 			}
 		}
 	}
-	}
 
 	@Override
 	public void staffEdit(StaffDTO staffDTO, String departmentIds) {
@@ -492,9 +469,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 		Boolean weixinPush = staffDTO.getWeixinPush();
 		if(weixinPush == null || !weixinPush){
 			WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(oldStaff.getWxEnterpriseId());
-			TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(oldStaff.getWxEnterpriseId(),1);
 			if(enterpriseDTO != null) {
-				if(application != null) {
 				UserDTO userDTO = new UserDTO();
 				userDTO.setCorpid(enterpriseDTO.getCorpid());
 				userDTO.setAlias(staffDTO.getNickName());
@@ -514,12 +489,11 @@ public class StaffApiServiceImpl implements StaffApiService {
 				userDTO.setUserid(oldStaff.getWxUserId());
 				userDTO.setPosition(staffDTO.getPostion());
 				userDTO.setExternal_position(staffDTO.getExtendPostion());
-					JSONResponse jp = qywxUserApiService.updateWorkWxUser(userDTO, enterpriseDTO.getCorpid(), application.getSiteId());
+				JSONResponse jp = qywxUserApiService.updateSelfWorkWxUser(userDTO, enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret());
 					
 			}
 		}
 	}
-	}
 
 	@Override
 	public void syscGicClerk(String fieldListString) {
@@ -773,12 +747,11 @@ public class StaffApiServiceImpl implements StaffApiService {
             return staff;
         }
         WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 1);
 
-        if (null == enterpriseDTO || application == null) {
+        if (null == enterpriseDTO ) {
             return null;
         }
-        String userId = qywxUserApiService.getWxUserIdByPhonenumber(enterpriseDTO.getCorpid(), application.getSiteId(), phoneNumber);
+        String userId = qywxUserApiService.getSelfWxUserIdByPhonenumber(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), phoneNumber);
         logger.info("获取userId:{}，{}", phoneNumber, userId);
         if (userId == null) {
             return null;
@@ -793,8 +766,8 @@ public class StaffApiServiceImpl implements StaffApiService {
 	}
 
 	@Override
-	public void initWxUser(String corpid, String suiteid, String wxEnterpriseId, Integer wxDepartmentId) {
-		List<UserDTO> list = this.qywxUserApiService.listDepartmentUser(corpid, suiteid, wxDepartmentId.toString(), 0);
+	public void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId) {
+		List<UserDTO> list = this.qywxUserApiService.listSelfDepartmentUser(corpid, contactSecret, wxDepartmentId.toString(), 0);
 		if(CollectionUtils.isNotEmpty(list)){
 			for(UserDTO dto : list){
 				this.wxGetAdd(dto.getUserid(), wxEnterpriseId);

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

@@ -47,10 +47,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 	private WxEnterpriseMapper wxEnterpriseMapper;
 	@Autowired
 	private WxApplicationService wxApplicationService;
-	@Autowired
-	private QywxDepartmentApiService qywxDepartmentApiService;
-	@Autowired
-	private DepartmentService departmentService;
 	
 	@Override
 	public void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto) {

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

@@ -48,7 +48,7 @@ public class AdminController extends WebBaseController{
 	public HaobanResponse adminList() {
 		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
-		WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 1);
+		WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 2);
 		WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		logger.info("【管理员查询】corpid={},siteId={},agentId={}",enterprise.getCorpid(),application.getSiteId(),application.getAgentId());
 		String adminList = qywxSuiteApiService.getAdminList(enterprise.getCorpid(), application.getSiteId(), Integer.parseInt(application.getAgentId()));

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

@@ -102,13 +102,18 @@ public class ApplicationController extends WebBaseController{
 	}
 	@RequestMapping("has-bind-contract")
 	public HaobanResponse hasBindContract(){
-		LoginVO login = AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
-		WxApplicationDTO wxApplicationDTO = this.wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 1);
-		if(wxApplicationDTO != null){
-			return resultResponse(HaoBanErrCode.ERR_1, true);
+		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
+		if(enterpriseDTO != null){
+			if(StringUtils.isNotBlank(enterpriseDTO.getContactSecret()) && enterpriseDTO.getContactFlag() != null && enterpriseDTO.getContactFlag() == 1){
+				this.departmentApiService.initwxDepartment(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), enterpriseDTO.getWxEnterpriseId());
+				enterpriseDTO.setContactFlag(1);
+				wxEnterpriseApiService.update(enterpriseDTO);
 			}
-		return resultResponse(HaoBanErrCode.ERR_1, false);
+		}
+		
+		return resultResponse(HaoBanErrCode.ERR_1, true);
 	}
 
 	@RequestMapping("get-auth-url")
@@ -136,7 +141,7 @@ public class ApplicationController extends WebBaseController{
 			applicationDTO.setAgentName(dto.getAgentName());
 			applicationDTO.setSiteId(dto.getSuiteId());
 			wxApplicationApiService.addSuite(applicationDTO);
-			this.departmentApiService.initwxDepartment(dto.getCorpid(), suiteId, enterpriseDTO.getWxEnterpriseId());
+			this.departmentApiService.initwxDepartment(dto.getCorpid(), enterpriseDTO.getContactSecret(), enterpriseDTO.getWxEnterpriseId());
 			enterpriseDTO.setContactFlag(1);
 			wxEnterpriseApiService.update(enterpriseDTO);
 		}