From 3ca581b05808786442348b1b1c7603c2ee91b671 Mon Sep 17 00:00:00 2001 From: liaozetao <1107136310@qq.com> Date: Fri, 19 Apr 2024 16:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=B5=A0=E9=80=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nameplate/NameplateAdminService.java | 15 ++++--- .../core/util/I18NMessageSourceUtil.java | 16 ++++++- .../service/dress/UserChatBubbleService.java | 44 ++++++++++--------- .../service/dress/UserInfoCardService.java | 6 ++- .../service/headwear/HeadwearService.java | 12 ++--- 5 files changed, 61 insertions(+), 32 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java index 7c0621ea2..c84c77118 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java @@ -6,6 +6,7 @@ import com.accompany.admin.dto.NameplateDto; import com.accompany.admin.model.AdminUser; import com.accompany.admin.service.base.BaseService; import com.accompany.admin.service.system.AdminUserService; +import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.admin.vo.dress.NameplateAdminVo; import com.accompany.business.constant.nameplate.NameplateStyleTypeEnum; @@ -241,8 +242,11 @@ public class NameplateAdminService extends BaseService { userNameplateService.officialSendNameplateSingle(nameplateId, targetUid, days, remark, updateBy, null, null); if (isSendMsg) { // 赠送铭牌时需要发送小助手通知 - this.sendNameplateSecretaryMessage(targetUid, "小秘書贈送給你銘牌 - [" + nameplate.getName() + "] 有效期" + days - + "天，已經幫你放進裝扮里啦，快點移步查看吧~~"); + String nameplateName = nameplate.getName(); + String i18nId = Nameplate.class.getSimpleName() + StrUtil.DOT + nameplateName; + String name = I18NMessageSourceUtil.getMessage(i18nId, nameplateName, targetUid); + String message = I18NMessageSourceUtil.getMessage(I18nAlertEnum.NAMEPLATE_FOR_SEND, new Object[]{name, days}, targetUid); + this.sendNameplateSecretaryMessage(targetUid, message); } } catch (Exception e) {//吞掉异常，保证其他用户礼物能正常增送 logger.error("赠送铭牌失败：nameplateId={}, erbanNo={}", nameplateId, erbanNo); @@ -272,7 +276,8 @@ public class NameplateAdminService extends BaseService { attach.setSecond(Constant.DefineProtocol.CUSTOM_MESS_SUB_SECRETARY_INTRACTION); JSONObject jsonObject = new JSONObject(); - jsonObject.put("title", "[銘牌消息]"); + String title = I18NMessageSourceUtil.getMessage(I18nAlertEnum.NAMEPLATE_FOR_TITLE, receiverUid); + jsonObject.put("title", title); jsonObject.put("msg", message); jsonObject.put("routerType", Constant.SecretarySkipType.NAMEPLATE); // 0跳转商城，1跳转我的头饰 @@ -316,7 +321,7 @@ public class NameplateAdminService extends BaseService { */ public void recallUserNameplate(Long id) { NameplateRecord record = nameplateRecordMapper.selectById(id); - if (null == record || record.getStatus() == PrivilegeConstant.NameplateRecordStatus.RECALL) { + if (null == record || Objects.equals(record.getStatus(), PrivilegeConstant.NameplateRecordStatus.RECALL)) { return; } Long uid = record.getUid(); @@ -446,7 +451,7 @@ public class NameplateAdminService extends BaseService { upadteNameplate.setId(userNameplate.getId()); upadteNameplate.setUpdateTime(date); upadteNameplate.setNameplateImage(mpPicUrl); - if (NameplateTypeEnum.CUSTOMIZE.getValue().toString().equals(nameplate.getNameplateType())) { + if (NameplateTypeEnum.CUSTOMIZE.getValue().equals(nameplate.getNameplateType())) { upadteNameplate.setWord(nameplate.getFixedWord()); } updateUserNameplates.add(upadteNameplate); diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/util/I18NMessageSourceUtil.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/util/I18NMessageSourceUtil.java index 2e66e9aab..10afe56c6 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/util/I18NMessageSourceUtil.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/util/I18NMessageSourceUtil.java @@ -55,6 +55,20 @@ public class I18NMessageSourceUtil { } public static String getMessage(I18nAlertEnum msgEnum, Object[] params, Locale locale) { + return getMessage(msgEnum.getI18nId(), params, msgEnum.getDefaultStr(), locale); + } + + public static String getMessage(String i18nId, String defaultValue, Long uid) { + Users user = SpringContextHolder.getBean(UsersBaseService.class).getUsersByUid(uid); + if (null == user) { + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + Integer partitionId = user.getPartitionId(); + Locale locale = SpringContextHolder.getBean(PartitionInfoService.class).getDefaultLang(partitionId); + return getMessage(i18nId, null, defaultValue, locale); + } + + public static String getMessage(String i18nId, Object[] params, String defaultValue, Locale locale) { String[] parameters = null; if (params != null && params.length > 0) { parameters = new String[params.length]; @@ -62,7 +76,7 @@ public class I18NMessageSourceUtil { parameters[i] = params[i].toString(); } } - String message = SpringContextHolder.getBean(MessageSource.class).getMessage(msgEnum.getI18nId(), null, msgEnum.getDefaultStr(), locale); + String message = SpringContextHolder.getBean(MessageSource.class).getMessage(i18nId, null, defaultValue, locale); return String.format(message, parameters); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserChatBubbleService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserChatBubbleService.java index 22b6bc762..10e345ecb 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserChatBubbleService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserChatBubbleService.java @@ -10,6 +10,7 @@ */ package com.accompany.business.service.dress; +import cn.hutool.core.util.StrUtil; import com.accompany.business.model.UserPurse; import com.accompany.business.model.dress.ChatBubble; import com.accompany.business.model.dress.UserChatBubble; @@ -135,7 +136,7 @@ public class UserChatBubbleService extends ServiceImpl bubbleForSend.getExpireTime().getTime()) { - expireTime = DateTimeUtil.addDays(now , addDay); + expireTime = DateTimeUtil.addDays(now, addDay); } else { - expireTime = DateTimeUtil.addDays(bubbleForSend.getExpireTime() , addDay); + expireTime = DateTimeUtil.addDays(bubbleForSend.getExpireTime(), addDay); } } // 先判断是购买还是赠送聊天气泡 - if(Constant.UserInfoCardComeFrom.USER_DONATE.equals(comeFrom) || Constant.UserInfoCardComeFrom.BUY.equals(comeFrom)){ + if (Constant.UserInfoCardComeFrom.USER_DONATE.equals(comeFrom) || Constant.UserInfoCardComeFrom.BUY.equals(comeFrom)) { BillObjTypeEnum billObjTypeEnum = Constant.UserInfoCardComeFrom.BUY.equals(comeFrom) ? BillObjTypeEnum.PURCHASE_CHAT_BUBBLE : BillObjTypeEnum.GIVE_CHAT_BUBBLE; // 扣除用户金币 this.userPurseService.subDiamond(uid, price.doubleValue(), billObjTypeEnum.getDesc()); @@ -244,7 +245,7 @@ public class UserChatBubbleService extends ServiceImpl