Merge branch 'feat-20231019-mahv2' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2620,7 +2620,7 @@ public class WmScorePackageController {
 			log.info("MAHbuild积分包耗时:{}", System.currentTimeMillis() - buildStartMillis);
 		}
 
-		wmBizReminderService.markRead(UpmsType.BizReminderType.ASSIGN_POINTS_OTHER_REMINDER);
+		wmBizReminderService.markRead(UpmsType.BizReminderType.ASSIGN_POINTS_OTHER_REMINDER, sendDeptId);
 
 		return R.ok(wmScorePackagePage);
 	}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmBizReminderService.java

@@ -14,15 +14,17 @@ public interface WmBizReminderService {
 	 * 标记未读
 	 *
 	 * @param bizReminderType 提醒类型
+	 * @param deptId 部门id
 	 */
-	void markUnread(UpmsType.BizReminderType bizReminderType);
+	void markUnread(UpmsType.BizReminderType bizReminderType, Integer deptId);
 
 	/**
 	 * 标记已读
 	 *
 	 * @param bizReminderType 提醒类型
+	 * @param deptId 部门id
 	 */
-	void markRead(UpmsType.BizReminderType bizReminderType);
+	void markRead(UpmsType.BizReminderType bizReminderType, Integer deptId);
 
 	/**
 	 * 获取标记状态

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmBizReminderServiceImpl.java

@@ -26,10 +26,10 @@ public class WmBizReminderServiceImpl implements WmBizReminderService {
 	 * 标记未读提醒
 	 *
 	 * @param bizReminderType 提醒类型
+	 * @param deptId 部门id
 	 */
 	@Override
-	public void markUnread(UpmsType.BizReminderType bizReminderType) {
-		Integer deptId = SecurityUtils.getUser().getDeptId();
+	public void markUnread(UpmsType.BizReminderType bizReminderType, Integer deptId) {
 		String cacheKey = bizReminderType.getKey() + deptId;
 
 		redisTemplate.opsForValue().set(cacheKey, UpmsState.BizReminderReadStatus.UNREAD.getStatus());
@@ -39,10 +39,10 @@ public class WmBizReminderServiceImpl implements WmBizReminderService {
 	 * 标记已读提醒
 	 *
 	 * @param bizReminderType 提醒类型
+	 * @param deptId 部门id
 	 */
 	@Override
-	public void markRead(UpmsType.BizReminderType bizReminderType) {
-		Integer deptId = SecurityUtils.getUser().getDeptId();
+	public void markRead(UpmsType.BizReminderType bizReminderType, Integer deptId) {
 		String cacheKey = bizReminderType.getKey() + deptId;
 
 		redisTemplate.opsForValue().set(cacheKey, UpmsState.BizReminderReadStatus.READ.getStatus());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPayOffServiceImpl.java

@@ -456,8 +456,8 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		noteService.saveOrUpdateBatch(notes);
 
 		if (SubjectLocation.MAH_SETTLE.equals(input.getSubjectLocation())) {
-			// 标记未读提醒
-			wmBizReminderService.markUnread(UpmsType.BizReminderType.ASSIGN_POINTS_OTHER_REMINDER);
+			// 给上级企业标记未读提醒
+			wmBizReminderService.markUnread(UpmsType.BizReminderType.ASSIGN_POINTS_OTHER_REMINDER, input.getMahSettleDeptId());
 		}
 
 		return R.ok(Boolean.TRUE);