111

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

@@ -45,6 +45,6 @@ public interface StaffDepartmentRelatedApiService {
 
 	public void sendClerkAdd (String clerkId,String clerkCode,int auditStatus,String auditReason);
 
-	public void sendClerkDel (String clerkId,String clerkCode,int auditStatus,String auditReason);
+	public void sendClerkDel (String clerkName,String clerkCode,String storeId,int auditStatus,String auditReason);
 
 }

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

@@ -241,7 +241,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 				 insertBatchLog( batchId,AuditRsultType.success.getCode(),tab);
 			}
-			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkId(), obj.getClerkCode(), 1, "");
+			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 1, "");
 		}else if(auditType == AuditType.CLERK_UNBIND.getCode()){
 			//解绑申请，无需审核，直接通过
 		}
@@ -277,7 +277,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 		}else if(auditType == AuditType.CLERK_ADD.getCode()) {
 			staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, obj.getClerkCode(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_DEL.getCode()) {
-			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkId(), obj.getClerkCode(), 2, auditReason);
+			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 2, auditReason);
 		}
 	}
 	@Override

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

@@ -203,21 +203,16 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	}
 	
 	//导购删除，，审核记录，，消息发送
-	public void sendClerkDel (String clerkId,String clerkCode,int auditStatus,String auditReason){
+	public void sendClerkDel (String clerkName,String clerkCode,String storeId,int auditStatus,String auditReason){
         //TODO huang 发送店长，门店关联记录列表
-		ClerkDTO clerk = clerkService.getclerkById(clerkId);
-		if(clerk == null){
-			logger.info("导购不存在，发送消息失败{}",clerkId);
-			return ;
-		}
         String messageTitle = "门店导购变更";
-		String messageContent ="删除导购："+ clerk.getClerkName()+"（"+clerkCode+"）";
+		String messageContent ="删除导购："+ clerkName+"（"+clerkCode+"）";
 		JSONObject jsonObject = new JSONObject();
-		jsonObject.put("storeId", clerk.getStoreId());
+		jsonObject.put("storeId", storeId);
 		String data = jsonObject.toJSONString();
-        ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
+        ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(storeId);
 		if(gicClerk == null){
-			logger.info("店长不存在，发送消息失败{}",clerk.getStoreId());
+			logger.info("店长不存在，发送消息失败{}",storeId);
 		}
 		String pageUrl = this.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
 		this.sendAuditMessage(gicClerk.getClerkId(), messageTitle, messageContent, pageUrl,auditStatus,"");

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

@@ -197,6 +197,7 @@ public class AuditController extends WebBaseController{
 		String clerkCode = json.get("clerkCode")==null?"":json.get("clerkCode").toString();
 		String enterpriseId = audit.getEnterpriseId();
 		String clerkId = json.getString("clerkId")==null?"":json.get("clerkId").toString();
+		String clerkName = json.get("clerkName")==null?"":json.get("clerkName").toString();
 		String wxUserId = json.getString("wxUserId")==null?"":json.get("wxUserId").toString();
 		Integer sex  = json.getInteger("sex")==null?0:json.getInteger("sex");
 		String phoneNumber = json.getString("phoneNumber")==null?"":json.get("phoneNumber").toString();
@@ -244,7 +245,7 @@ public class AuditController extends WebBaseController{
 				//导购删除
 				syncHaobanToGicServiceApi.delGicClerk(clerkId);
 				audit.setAuditStatus(1);
-				staffDepartmentRelatedApiService.sendClerkDel(clerkId, clerkCode, auditStatus, auditReason);
+				staffDepartmentRelatedApiService.sendClerkDel(clerkName, clerkCode,storeId, auditStatus, auditReason);
 			}
 		}else if(auditStatus == 2){
 			//审核拒绝
@@ -256,7 +257,7 @@ public class AuditController extends WebBaseController{
 			}else if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()){
 				staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, clerkCode, auditStatus, auditReason);
 			}else if (audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
-				staffDepartmentRelatedApiService.sendClerkDel(clerkId, clerkCode, auditStatus, auditReason);
+				staffDepartmentRelatedApiService.sendClerkDel(clerkName, clerkCode,storeId, auditStatus, auditReason);
 			}
 			
 		}else if(auditStatus == 3){

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

@@ -272,7 +272,11 @@ public class ClerkController extends WebBaseController{
 					logger.info("已经存在了审核记录，待审核{}",clerkId);
 					continue;
 				}
-				
+				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+				if(clerkDTO ==null){
+					logger.info("导购不存在",clerkId);
+					continue;
+				}
 				AuditDTO audit = new AuditDTO();
 				audit.setCommitStaffName(staff.getStaffName());
 				audit.setCommitStaffId(staffId);
@@ -287,13 +291,15 @@ public class ClerkController extends WebBaseController{
 
 				JSONObject json = new JSONObject();
 				json.put("clerkId", clerkId);
+				json.put("clerkCode", clerkDTO.getClerkCode());
+				json.put("clerkName", clerkDTO.getClerkName());
 				audit.setOldValue(json.toJSONString());
 				audit.setCommitTime(new Date());
 				audit.setAuditType(4);
 				auditApiService.insert(audit);
 			}
 		}else{
-			//只删除gic那边的
+			//无需审核
 			String[] clerkIdArr = clerkIds.split(",");
 			for (String clerkId : clerkIdArr) {
 				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);