Skip to content

H
haoban-manage3.0
Commit dde702bf by huangZW
Options

1111

parent 16261d95
Showing with 39 additions and 35 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffDepartmentRelatedApiService.java
......@@ -41,7 +41,7 @@ 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);
......
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()){
//门店导购新增
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java
......@@ -26,6 +26,7 @@ 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;
......@@ -166,25 +167,20 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
map.put("clerkName",clerkDTO.getClerkName());
return map;
}
// @Override
// public Map<String,String> getWxUserIdByStaffId(String staffId) {
// Map<String,String> map = new HashMap<>();
// staff
// TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId);
// if(tab == null){
// return map;
// }
// ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
// if(clerkDTO == null){
// return map;
// }
// 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;
// }
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 sendStaffBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason){
......@@ -241,20 +237,20 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
}
//导购绑定，，审核记录，，消息发送
@Override
public void sendClerkBind(String clerkId,String clerkCode,int auditStatus,String auditReason){
public void sendClerkBind(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 messageContent = 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);
this.sendAuditMessage(clerkId, messageTitle, messageContent, pageUrl, auditStatus, auditReason);
this.sendAuditMessage(staffId, messageTitle, messageContent, pageUrl, auditStatus, auditReason);
}
......@@ -277,8 +273,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,"");
}
//导购删除，，审核记录，，消息发送
......@@ -293,8 +293,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,
......@@ -338,15 +342,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){
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
......@@ -234,7 +234,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);
}
}
}
......
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