消息推送

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

@@ -246,6 +246,8 @@ public class BindApiServiceImpl implements BindApiService {
 			
 		}		
 	}
+
+	@Deprecated
 	@Transactional
 	@Override
 	public void clerkSingleUnbind(String fromClerkCode, String departmentId) {
@@ -273,11 +275,11 @@ public class BindApiServiceImpl implements BindApiService {
 		//发送消息
 		if(StringUtils.isNotBlank(fromClerkCode)){
 			//发送消息
-            ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
-            if(leader == null){
-            	leader = new ClerkDTO();
-            }
-            String clerkId = leader.getClerkId();
+			ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
+			if(leader == null){
+				leader = new ClerkDTO();
+			}
+			String clerkId = leader.getClerkId();
 			String storeName = departmentDTO.getDepartmentName();
 			String staffName = clerkName;
 			String leaderName = leader.getClerkName();

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

@@ -890,8 +890,12 @@ public class ClerkController extends WebBaseController {
 //    		String pageUrl = staffDepartmentRelatedApiService.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
 //    		staffDepartmentRelatedApiService.sendSingleMessage(gicClerk.getClerkId(), messageTitle, messageContent, pageUrl);
 
-
-            Map<String, String> fieldMap = new HashMap<String, String>();
+			ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
+			if (gicClerk == null) {
+				logger.info("无需发送消息");
+				return resultResponse(HaoBanErrCode.ERR_1);
+			}
+			Map<String, String> fieldMap = new HashMap<String, String>();
             fieldMap.put("staffName", staff.getStaffName());
             fieldMap.put("clerkName", clerk.getClerkName());
 
@@ -899,8 +903,8 @@ public class ClerkController extends WebBaseController {
             jsonObject.put("storeId", clerk.getStoreId());
 
             NoticeMessageUtil.sendNoticeMessage(clerk.getEnterpriseId()
-                    , clerk.getClerkId()
-                    , NoticeMessageTypeEnum.STORE_ACCOUNT.getType()
+					, gicClerk.getClerkId()
+					, NoticeMessageTypeEnum.STORE_ACCOUNT.getType()
                     , null, fieldMap, jsonObject);
 
 			return resultResponse(HaoBanErrCode.ERR_1);