11

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

@@ -139,36 +139,18 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	@Override
 	public Map<String,String> getWxUserIdByClerkId(String clerkId) {
 		Map<String,String> map  = new HashMap<>();
-		ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
-		if(clerkDTO == null){
-			return map;
-		}
-		String clerkCode =clerkDTO.getClerkCode();
-		if(StringUtils.isEmpty(clerkCode) ){
-			return map;
-		}
-		String enterpriseId = clerkDTO.getEnterpriseId();
-		TabHaobanWxEnterpriseRelated relate = wxEnterpriseRelatedMapper.findOneByEnterpriseId(enterpriseId);
-		if(relate == null){
-			return map;
-		}
-		String wxEnterpriseId = relate.getWxEnterpriseId();
-		String storeId = clerkDTO.getStoreId();
-		TabHaobanDepartment tabDepart = departmentService.selectByRelatedId(storeId);
-		if(tabDepart == null){
+		
+		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId);
+		if(tab == null){
 			return map;
 		}
-		String departmentId = tabDepart.getDepartmentId();
-		
-		TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated = staffDepartmentRelatedMapper.getDepartmentIdAndCode(departmentId, clerkCode);
-		if(tabHaobanStaffDepartmentRelated == null){
+		ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
+		if(clerkDTO == null){
 			return map;
 		}
-		String wxUserId = tabHaobanStaffDepartmentRelated.getWxUserId();
-		TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(wxEnterpriseId);
-		
-		map.put("wxUserId", wxUserId);
-		map.put("wxEnterpriseId", wxEnterpriseId);
+		TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(tab.getWxEnterpriseId());
+		map.put("wxUserId", tab.getWxUserId());
+		map.put("wxEnterpriseId", tab.getWxEnterpriseId());
 		map.put("corpId", tabHaobanWxEnterprise.getCorpid());
 		map.put("clerkName",clerkDTO.getClerkName());
 		return map;

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

@@ -348,6 +348,7 @@ public class ClerkController extends WebBaseController{
 				return resultResponse(HaoBanErrCode.ERR_1);
 			}
 		}
+		//只新增gic那边的，不新增好办这边
 		boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
 		if(!flag){
 			return resultResponse(HaoBanErrCode.ERR_10010);
@@ -390,6 +391,7 @@ public class ClerkController extends WebBaseController{
 					auditApiService.insert(audit);
 				}
 			}else{
+				//只删除gic那边的
 				String[] clerkIdArr = clerkIds.split(",");
 				for (String clerkId : clerkIdArr) {
 					syncHaobanToGicServiceApi.delGicClerk(clerkId);
@@ -651,6 +653,8 @@ public class ClerkController extends WebBaseController{
 			BindClerkVO vo = EntityUtil.changeEntityByJSON(BindClerkVO.class, clerkListDTO);
 			if(bindCodeMap.keySet().contains(clerkListDTO.getClerkCode())){
 				vo.setStaffId(bindCodeMap.get(clerkListDTO.getClerkCode()).getStaffId());
+				vo.setNationCode(clerkListDTO.getNationcode());
+				vo.setPhoneNumber(clerkListDTO.getPhoneNumber());
 				bindList.add(vo);
 			}else{
 				unBindList.add(vo);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/BindClerkVO.java

@@ -14,6 +14,26 @@ public class BindClerkVO implements Serializable{
 	
 	private String clerkCode;
 
+	private String nationCode;
+
+	private String phoneNumber;
+
+	public String getNationCode() {
+		return nationCode;
+	}
+
+	public void setNationCode(String nationCode) {
+		this.nationCode = nationCode;
+	}
+
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+
+	public void setPhoneNumber(String phoneNumber) {
+		this.phoneNumber = phoneNumber;
+	}
+
 	public String getClerkId() {
 		return clerkId;
 	}