111

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

@@ -45,7 +45,7 @@ public interface StaffDepartmentRelatedApiService {
 	
 	public void sendStaffBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason);
 
-	public void sendClerkAdd (String clerkId,String clerkCode,int auditStatus,String auditReason);
+	public void sendClerkAdd (String clerkName,String clerkCode,String storeId,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

@@ -232,7 +232,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 					 insertBatchLog( batchId,1, tab);
 				}
-				staffDepartmentRelatedApiService.sendClerkAdd(tab.getEnterpriseId(), obj.getClerkCode(), 1, "");
+				staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 1, "");
 			}
 
 		}else if(auditType == AuditType.CLERK_DEL.getCode()){
@@ -280,7 +280,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			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);
+			staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkName(), obj.getClerkCode(),tab2.getCommitStoreId(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_DEL.getCode()) {
 			AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
 			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab2.getCommitStoreId(), 2, auditReason);

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

@@ -260,21 +260,16 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	
 	//导购新增，，审核记录，，消息发送
 	@Override
-	public void sendClerkAdd (String enterpriseId,String clerkCode,int auditStatus,String auditReason){
+	public void sendClerkAdd (String clerkName,String clerkCode,String storeId,int auditStatus,String auditReason){
         //TODO huang 发送店长，门店关联记录列表
-		ClerkDTO clerk =  clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
-		if(clerk == null){
-			logger.info("导购不存在，发送消息失败{}",clerkCode);
-			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);
 			return ;
 		}
 		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
@@ -283,7 +278,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 			return ;
 		}
 		String pageUrl = this.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
-		this.sendAuditMessage(tab.getStaffId(), messageTitle, messageContent, pageUrl,auditStatus,"");
+		this.sendAuditMessage(tab.getStaffId(), messageTitle, messageContent, pageUrl,auditStatus,auditReason);
 	}
 	
 	//导购删除，，审核记录，，消息发送

haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml

@@ -301,7 +301,7 @@
 	          and audit_status = 0
 			 </if>
 			<if test = "auditFlag != null and auditFlag != 0">
-	          and audit_status in (1,2,5)
+	          and audit_status in (1,2,4,5)
 			 </if>
 			 <if test = "auditStatus != null">
 	          and audit_status = #{auditStatus,jdbcType=INTEGER}
@@ -329,7 +329,7 @@
 	          and audit_status = 0
 			 </if>
 			<if test = "auditFlag != null and auditFlag != 0">
-	          and audit_status in (1,2,5)
+	          and audit_status in (1,2,4,5)
 			 </if>
 			 <if test = "auditStatus != null">
 	          and audit_status = #{auditStatus,jdbcType=INTEGER}

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

@@ -252,7 +252,7 @@ public class AuditController extends WebBaseController{
 				audit.setAuditStatus(1);
 //				ClerkDTO clerkDTO = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
 				
-				staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, clerkCode, auditStatus, auditReason);
+				staffDepartmentRelatedApiService.sendClerkAdd(clerkName, clerkCode, storeId,auditStatus, auditReason);
 			}
 			if(audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
 				//导购删除
@@ -268,7 +268,7 @@ public class AuditController extends WebBaseController{
 			if(audit.getAuditType() == AuditType.CLERK_BIND.getCode()){
 				staffDepartmentRelatedApiService.sendStaffBind(auditStaffId, clerkCode, storeId, auditStatus, auditReason);
 			}else if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()){
-				staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, clerkCode, auditStatus, auditReason);
+				staffDepartmentRelatedApiService.sendClerkAdd(clerkName, clerkCode, storeId,auditStatus, auditReason);
 			}else if (audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
 				staffDepartmentRelatedApiService.sendClerkDel(clerkName, clerkCode,storeId, auditStatus, auditReason);
 			}