Merge remote-tracking branch 'origin/developer' into developer

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

@@ -41,7 +41,9 @@ public interface StaffDepartmentRelatedApiService {
 
 	List<StaffDepartmentRelatedDTO> listByStaffIds(List<String> staffIds);
 	
-	public void sendClerkBind(String clerkId,String clerkCode,int auditStatus,String auditReason);
+	public void sendClerkBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason);
+	
+	public void sendStaffBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason);
 
 	public void sendClerkAdd (String clerkId,String clerkCode,int auditStatus,String auditReason);
 

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

@@ -211,7 +211,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 				 insertBatchLog( batchId,AuditRsultType.success.getCode(), tab);
 			}
-			staffDepartmentRelatedApiService.sendClerkBind(obj.getClerkId(), obj.getClerkCode(), 1, "");
+			staffDepartmentRelatedApiService.sendClerkBind(obj.getStaffId(), obj.getClerkCode(),storeId, 1, "");
     		
 		}else if(auditType == AuditType.CLERK_ADD.getCode()){
 			//门店导购新增
@@ -263,7 +263,6 @@ public class AuditApiServiceImpl implements AuditApiService{
 		int auditType = tab2.getAuditType();
 		String oldValue = tab2.getOldValue();
 		String enterpriseId = tab2.getEnterpriseId();
-		AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
 		//发送消息
 		if(auditType == AuditType.STORE_CHANGE.getCode()){
 			String changeField = tab2.getChangeField();
@@ -274,10 +273,13 @@ public class AuditApiServiceImpl implements AuditApiService{
 			String storeId = tab2.getCommitStoreId();
 			this.sendMessageByStaffId(staffId, storeId, title, content);
 		}else if(auditType == AuditType.CLERK_BIND.getCode()){
-			staffDepartmentRelatedApiService.sendClerkBind(obj.getClerkId(), obj.getClerkCode(), 2, auditReason);
+			AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
+			staffDepartmentRelatedApiService.sendStaffBind(obj.getStaffId(), obj.getClerkCode(), tab2.getCommitStoreId(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_ADD.getCode()) {
+			AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
 			staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, obj.getClerkCode(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_DEL.getCode()) {
+			AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
 			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 2, auditReason);
 		}
 	}

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

@@ -346,7 +346,6 @@ public class StaffApiServiceImpl implements StaffApiService {
 		if(StringUtils.isNotBlank(user.getAvatar())){
 			staff.setHeadImg(changeHeaderImageUrl(user.getAvatar()));
 		}
-		staff.setPhoneNumber(user.getMobile());
 		if (StringUtils.isNotBlank(user.getName())) {
 			user.setName(EmojiParser.removeAllEmojis(user.getName()));
 			staff.setStaffName((user.getName()));
@@ -355,7 +354,16 @@ public class StaffApiServiceImpl implements StaffApiService {
 			user.setAlias(EmojiParser.removeAllEmojis(user.getAlias()));
 			staff.setNickName((user.getAlias()));
 		}
-		staff.setNationCode("86");
+		String phoneNumber = user.getMobile();
+		if(StringUtils.isBlank(phoneNumber)){
+			logger.info("手机号为空:{}:{}",userId,phoneNumber);
+			res.setMessage("手机号为空");
+			res.setCode(3);
+			return res;
+		}
+		String[] arr = getNationCodeAndPhoneNumber(phoneNumber);
+		staff.setPhoneNumber(arr[1]);
+		staff.setNationCode(arr[0]);
 		staff.setSex(user.getGender() == null ? 1:Integer.parseInt(user.getGender()));
 		staff.setActiveFlag(1);
 		staff.setPostion(user.getPosition());
@@ -373,6 +381,37 @@ public class StaffApiServiceImpl implements StaffApiService {
 		staffDepartChange(staff,wxEnterpriseId,user);
 		return res;
 	}
+	
+	private String[] getNationCodeAndPhoneNumber(String phoneNumber){
+		String[] arr = {};
+		arr[0] = "86";
+		arr[1] = phoneNumber;
+		if(phoneNumber.startsWith("853")){
+			arr[0] = "853";
+			arr[1] = phoneNumber.replace("853", "");
+		}
+		if(phoneNumber.startsWith("852")){
+			arr[0] = "852";
+			arr[1] = phoneNumber.replace("852", "");
+		}
+		if(phoneNumber.startsWith("886")){
+			arr[0] = "886";
+			arr[1] = phoneNumber.replace("886", "");
+		}
+		if(phoneNumber.startsWith("65")){
+			arr[0] = "65";
+			arr[1] = phoneNumber.replace("65", "");
+		}
+		if(phoneNumber.startsWith("66")){
+			arr[0] = "66";
+			arr[1] = phoneNumber.replace("66", "");
+		}
+		if(phoneNumber.startsWith("853")){
+			arr[0] = "853";
+			arr[1] = phoneNumber.replace("853", "");
+		}
+		return arr;
+	}
 
 	private void staffDepartChange(TabHaobanStaff staff,String wxEnterpriseId,UserDTO user){
 

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

@@ -21,9 +21,12 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.MessageDTO;
 import com.gic.haoban.manage.api.dto.ApplicationDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.enums.AppPageType;
 import com.gic.haoban.manage.api.service.ApplicationApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
@@ -67,6 +70,8 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	private Config config;
 	@Autowired
 	private TabHaobanStaffClerkRelationMapper tabHaobanStaffClerkRelationMapper;
+	@Autowired
+	private  StaffApiService staffApiService;
 	
 	@Override
 	public List<StaffDepartmentRelatedDTO> listByDepartmentId(
@@ -162,22 +167,94 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		map.put("clerkName",clerkDTO.getClerkName());
 		return map;
 	}
+	
+	public Map<String,String> getWxUserIdByStaffId(String staffId) {
+		Map<String,String> map  = new HashMap<>();
+		StaffDTO staffDTO = staffApiService.selectById(staffId);
+		if(staffDTO == null){
+			return map;
+		}
+		TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(staffDTO.getWxEnterpriseId());
+		map.put("wxUserId", staffDTO.getWxUserId());
+		map.put("wxEnterpriseId", tabHaobanWxEnterprise.getWxEnterpriseId());
+		map.put("corpId", tabHaobanWxEnterprise.getCorpid());
+		map.put("staffName",staffDTO.getStaffName());
+		return map;
+	}
 	//导购绑定，，审核记录，，消息发送
 	@Override
-	public void sendClerkBind(String clerkId,String clerkCode,int auditStatus,String auditReason){
+	public void sendStaffBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason){
         //TODO huang 发送申请人，我的记录页
-		ClerkDTO clerk = clerkService.getclerkById(clerkId);
-		if(clerk == null){
-			logger.info("导购不存在，发送消息失败{}",clerkId);
+		StaffDTO staffDTO = staffApiService.selectById(staffId);
+		if(staffDTO == null){
+			logger.info("staff不存在，发送消息失败{}",staffId);
 			return ;
 		}
         String messageTitle = "门店账号申请";
-		String messageContent = clerk.getClerkName()+"申请关联导购code（"+clerkCode+"）";
+		String content = staffDTO.getStaffName()+"申请关联导购code（"+clerkCode+"）";
 		JSONObject jsonObject = new JSONObject();
-		jsonObject.put("storeId", clerk.getStoreId());
+		jsonObject.put("storeId", storeId);
+		String data = jsonObject.toJSONString();
+		String pageUrl = this.getPageUrl(AppPageType.MY_RELATED_RECORD.getCode(), data);
+		TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(staffDTO.getWxEnterpriseId());
+		String wxUserId = staffDTO.getWxUserId();
+		String corpId = tabHaobanWxEnterprise.getCorpid();
+		String name = staffDTO.getStaffName();
+		if(content.length()>30){
+			content = content.substring(0, 26);
+			content = content+"...";
+		}
+		//先发送下，试试
+		QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
+		List<ItemDTO> items = new ArrayList();;
+		ItemDTO dto1 = new ItemDTO();
+		ItemDTO dto2 = new ItemDTO();
+		ItemDTO dto3 = new ItemDTO();
+		ItemDTO dto4 = new ItemDTO();
+
+		dto1.setKey("接收人");
+		dto1.setValue(name);
+		dto2.setKey("接收事件");
+		dto2.setValue(content);
+		dto3.setKey("结果");
+		dto3.setValue(auditStatus == 1?"已同意":"已拒绝");
+		items.add(dto1);
+		items.add(dto2);
+		items.add(dto3);
+		if(StringUtils.isNotEmpty(auditReason)){
+			dto4.setKey("理由");
+			dto4.setValue(auditReason);
+			items.add(dto4);
+		}
+        ArrayList<String> list = new ArrayList<>();
+        list.add(wxUserId);
+		messageDTO.setAppid(config.getAppid());
+        messageDTO.setUserIds(list);
+        messageDTO.setPage(pageUrl);
+        messageDTO.setTitle(messageTitle);
+        messageDTO.setItems(items);
+
+		logger.info("发送参数为corpId============:{},suitId============:{},messageDTO============:{},",corpId, config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
+		
+		boolean b = qywxSuiteApiService.sendMessage(corpId,config.getWxSuiteid(), messageDTO);
+		logger.info("发送===============》{}",b);
+	}
+	//导购绑定，，审核记录，，消息发送
+	@Override
+	public void sendClerkBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason){
+        //TODO huang 发送申请人，我的记录页
+		StaffDTO staffDTO = staffApiService.selectById(staffId);
+		if(staffDTO == null){
+			logger.info("staff不存在，发送消息失败{}",staffId);
+			return ;
+		}
+        String messageTitle = "门店账号申请";
+		String messageContent = staffDTO.getStaffName()+"申请关联导购code（"+clerkCode+"）";
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("storeId", storeId);
 		String data = jsonObject.toJSONString();
 		String pageUrl = this.getPageUrl(AppPageType.MY_RELATED_RECORD.getCode(), data);
-		this.sendAuditMessage(clerkId, messageTitle, messageContent, pageUrl, auditStatus, auditReason);
+		this.sendAuditMessage(staffId, messageTitle, messageContent, pageUrl, auditStatus, auditReason);
 	}
 	
 	
@@ -200,8 +277,12 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 			logger.info("店长不存在，发送消息失败{}",clerk.getStoreId());
 			return ;
 		}
+		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
+		if(tab == null){
+			logger.info("店长未绑定clerkId={}",gicClerk.getClerkId());
+		}
 		String pageUrl = this.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
-		this.sendAuditMessage(gicClerk.getClerkId(), messageTitle, messageContent, pageUrl,auditStatus,"");
+		this.sendAuditMessage(tab.getStaffId(), messageTitle, messageContent, pageUrl,auditStatus,"");
 	}
 	
 	//导购删除，，审核记录，，消息发送
@@ -216,8 +297,12 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		if(gicClerk == null){
 			logger.info("店长不存在，发送消息失败{}",storeId);
 		}
+		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
+		if(tab == null){
+			logger.info("店长未绑定clerkId={}",gicClerk.getClerkId());
+		}
 		String pageUrl = this.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
-		this.sendAuditMessage(gicClerk.getClerkId(), messageTitle, messageContent, pageUrl,auditStatus,"");
+		this.sendAuditMessage(tab.getStaffId(), messageTitle, messageContent, pageUrl,auditStatus,"");
 	}
 	@Override
 	public boolean sendSingleMessage(String clerkId, String title,
@@ -261,15 +346,15 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		return b;
 	}
 	@Override
-	public boolean sendAuditMessage(String clerkId, String title,
+	public boolean sendAuditMessage(String staffId, String title,
 			String content, String pageUrl,int auditStatus, String auditReason) {
-		Map<String,String> map = getWxUserIdByClerkId(clerkId);
+		Map<String,String> map = getWxUserIdByStaffId(staffId);
 		String wxUserId = map.get("wxUserId");
 		String corpId = map.get("corpId");
-		String name = map.get("clerkName");
+		String name = map.get("staffName");
 
 		if(jodd.util.StringUtil.isEmpty(wxUserId)){
-			logger.info("wxUserId不存在============clerkId={}",clerkId);
+			logger.info("wxUserId不存在============clerkId={}",staffId);
 			return false;
 		}
 		if(content.length()>30){
@@ -294,6 +379,10 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		dto4.setValue(auditReason);
 		items.add(dto1);
 		items.add(dto2);
+		items.add(dto3);
+		if(org.apache.commons.lang.StringUtils.isNotBlank(auditReason)){
+			items.add(dto4);
+		}
         ArrayList<String> list = new ArrayList<>();
         list.add(wxUserId);
 		messageDTO.setAppid(config.getAppid());

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

@@ -113,6 +113,8 @@ public class AuditController extends WebBaseController{
 			JSONObject json = JSON.parseObject(oldValue);
 			clerkCode = json.getString("clerkCode");
 			staffName = json.getString("staffName");
+			String headPic = json.get("headPic")== null ? "": json.get("headPic").toString();
+
 			if(auditDTO.getAuditType() == 3){
 				vo.setCommitReason("添加导购账号：("+clerkCode+")");
 			}else if(auditDTO.getAuditType() == 4){
@@ -126,6 +128,7 @@ public class AuditController extends WebBaseController{
 			vo.setFailReason(auditDTO.getAuditReason());
 			vo.setStaffName(auditDTO.getCommitName());
 			vo.setClerkName(auditDTO.getCommitName());
+			vo.setHeadPic(headPic);
 			if(auditDTO.getAuditType() != 0){
 				vo.setUpdateTime(auditDTO.getUpdateTime());
 			}
@@ -155,6 +158,7 @@ public class AuditController extends WebBaseController{
 		JSONObject json = JSON.parseObject(oldValue);
 		clerkCode = json.getString("clerkCode");
 		staffName = json.getString("staffName");
+		String headPic = json.get("headPic")== null ? "": json.get("headPic").toString();
 		if(auditDTO.getAuditType() == 3){
 			vo.setCommitReason("添加导购账号：("+clerkCode+")");
 		}else if(auditDTO.getAuditType() == 4){
@@ -164,6 +168,7 @@ public class AuditController extends WebBaseController{
 		}else{
 			vo.setCommitReason("绑定申请{"+staffName+"}绑定登录导购code "+clerkCode);
 		}
+		vo.setHeadPic(headPic);
 		vo.setCommitName(auditDTO.getCommitStaffName());
 		vo.setFailReason(auditDTO.getAuditReason());
 		vo.setStaffName(auditDTO.getCommitName());
@@ -234,7 +239,7 @@ public class AuditController extends WebBaseController{
 						staffClerkRelationApiService.delAndInsert(staffClerkRelation);
 						audit.setAuditStatus(1);
 						//发送消息
-						staffDepartmentRelatedApiService.sendClerkBind(clerkId, clerkCode, auditStatus, auditReason);
+						staffDepartmentRelatedApiService.sendClerkBind(auditStaffId, clerkCode,storeId, auditStatus, auditReason);
 					}
 				}
 			}
@@ -261,7 +266,7 @@ public class AuditController extends WebBaseController{
 			audit.setAuditStatus(2);
 			//发送消息
 			if(audit.getAuditType() == AuditType.CLERK_BIND.getCode()){
-				staffDepartmentRelatedApiService.sendClerkBind(clerkId, clerkCode, auditStatus, auditReason);
+				staffDepartmentRelatedApiService.sendStaffBind(auditStaffId, clerkCode, storeId, auditStatus, auditReason);
 			}else if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()){
 				staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, clerkCode, auditStatus, auditReason);
 			}else if (audit.getAuditType() == AuditType.CLERK_DEL.getCode()){