111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditStaffDTO.java

@@ -28,9 +28,18 @@ public class AuditStaffDTO implements Serializable{
 
     private String headPic;
     
+    private String enterpriseId;
 
     private static final long serialVersionUID = 1L;
 
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+
 	public String getPhoneNumber() {
 		return phoneNumber;
 	}

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

@@ -230,7 +230,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 					 insertBatchLog( batchId,1, tab);
 				}
-				staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkId(), obj.getClerkCode(), 1, "");
+				staffDepartmentRelatedApiService.sendClerkAdd(obj.getEnterpriseId(), obj.getClerkCode(), 1, "");
 			}
 
 		}else if(auditType == AuditType.CLERK_DEL.getCode()){
@@ -274,7 +274,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 		}else if(auditType == AuditType.CLERK_BIND.getCode()){
 			staffDepartmentRelatedApiService.sendClerkBind(obj.getClerkId(), obj.getClerkCode(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_ADD.getCode()) {
-			staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkId(), obj.getClerkCode(), 2, auditReason);
+			staffDepartmentRelatedApiService.sendClerkAdd(obj.getEnterpriseId(), obj.getClerkCode(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_DEL.getCode()) {
 			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkId(), obj.getClerkCode(), 2, auditReason);
 		}

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

@@ -168,6 +168,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		ClerkDTO clerk = clerkService.getclerkById(clerkId);
 		if(clerk == null){
 			logger.info("导购不存在，发送消息失败{}",clerkId);
+			return ;
 		}
         String messageTitle = "门店账号申请";
 		String messageContent = clerk.getClerkName()+"申请关联导购code（"+clerkCode+"）";
@@ -180,11 +181,12 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	
 	
 	//导购新增，，审核记录，，消息发送
-	public void sendClerkAdd (String clerkId,String clerkCode,int auditStatus,String auditReason){
+	public void sendClerkAdd (String enterpriseId,String clerkCode,int auditStatus,String auditReason){
         //TODO huang 发送店长，门店关联记录列表
-		ClerkDTO clerk = clerkService.getclerkById(clerkId);
+		ClerkDTO clerk =  clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
 		if(clerk == null){
-			logger.info("导购不存在，发送消息失败{}",clerkId);
+			logger.info("导购不存在，发送消息失败{}",clerkCode);
+			return ;
 		}
         String messageTitle = "门店导购变更";
 		String messageContent ="新增导购："+ clerk.getClerkName()+"（"+clerkCode+"）";
@@ -194,6 +196,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
 		if(gicClerk == null){
 			logger.info("店长不存在，发送消息失败{}",clerk.getStoreId());
+			return ;
 		}
 		String pageUrl = this.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
 		this.sendAuditMessage(gicClerk.getClerkId(), messageTitle, messageContent, pageUrl,auditStatus,"");
@@ -205,6 +208,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		ClerkDTO clerk = clerkService.getclerkById(clerkId);
 		if(clerk == null){
 			logger.info("导购不存在，发送消息失败{}",clerkId);
+			return ;
 		}
         String messageTitle = "门店导购变更";
 		String messageContent ="删除导购："+ clerk.getClerkName()+"（"+clerkCode+"）";

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

@@ -236,7 +236,9 @@ public class AuditController extends WebBaseController{
 					return resultResponse(HaoBanErrCode.ERR_10010);
 				}
 				audit.setAuditStatus(1);
-				staffDepartmentRelatedApiService.sendClerkAdd(clerkId, clerkCode, auditStatus, auditReason);
+//				ClerkDTO clerkDTO = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
+				
+				staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, clerkCode, auditStatus, auditReason);
 			}
 			if(audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
 				//导购删除
@@ -252,7 +254,7 @@ public class AuditController extends WebBaseController{
 			if(audit.getAuditType() == AuditType.CLERK_BIND.getCode()){
 				staffDepartmentRelatedApiService.sendClerkBind(clerkId, clerkCode, auditStatus, auditReason);
 			}else if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()){
-				staffDepartmentRelatedApiService.sendClerkAdd(clerkId, clerkCode, auditStatus, auditReason);
+				staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, clerkCode, auditStatus, auditReason);
 			}else if (audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
 				staffDepartmentRelatedApiService.sendClerkDel(clerkId, clerkCode, auditStatus, auditReason);
 			}