From 0142bf44cc1eb30fbc7d56c0daca5b520878190e Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Sun, 27 Apr 2025 15:33:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E4=BF=AE=E6=94=B9=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backstage/SysWorkReviewController.java | 10 +++++----- .../web/controller/backstage/daily/dailySysServer.java | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java index 06ad7540..f1aa2c1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java @@ -343,18 +343,18 @@ public class SysWorkReviewController extends BaseController { // 审核通过 if(workStatus.equals("3")){ sysUserNotification.setType("3"); - msg = String.format("您的作品<<%s>>已顺利通过审核,", userWork.getWorkName()); + msg = String.format("您的作品<<%s>>已顺利通过审核，", userWork.getWorkName()); for(String key:mapSource.keySet()){ - msg = msg + String.format("正式发布于%s%s进行展示,", key, String.join("、 ", mapSource.get(key))) + mapTime.get(key) ; + msg = msg + String.format("正式发布于%s%s进行展示，", key, String.join("、 ", mapSource.get(key))) + mapTime.get(key) ; } - msg = msg + String.format("诚邀您前往%s,近距离感受作品的魅力.", String.join("、 ", mapSource.keySet())); - msg = msg + "\n温馨提示:作品审核通过后,建议尽量保持内容原貌,避免二次修改.如需调整,作品将触发重新审核流程.可能影响展示进度与效果.感谢您的理解与配合! "; + msg = msg + String.format("诚邀您前往%s，近距离感受作品的魅力。", String.join("、 ", mapSource.keySet())); + msg = msg + "\n温馨提示:作品审核通过后，建议尽量保持内容原貌，避免二次修改。如需调整，作品将触发重新审核流程。可能影响展示进度与效果。感谢您的理解与配合! "; } // 审核不通过 else if(workStatus.equals("4")){ sysUserNotification.setType("4"); - msg = "很遗憾地通知您,您提交的<<" + userWork.getWorkName() + "在审核过程中未能通过,主要原因是内容涉及了不符合平台规定的违法或敏感字样,请重新提交审核"; + msg = "很遗憾地通知您，您提交的<<" + userWork.getWorkName() + "在审核过程中未能通过，主要原因是内容涉及了不符合平台规定的违法或敏感字样，请重新提交审核。"; } else{ return error("请选择审核状态"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java index af0c96ed..5bb2aa30 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java @@ -288,6 +288,8 @@ public class dailySysServer { // 修改订单状态为1 已退款 Long orderId = sysSource.getOrderId(); + // 退款金额 + Long money = 0L; if(orderId != null){ SysOrder sysOrder = sysOrderService.selectSysOrderByOrderId(orderId); @@ -296,6 +298,8 @@ public class dailySysServer { // 修改order_info 状态 OrderInfo orderInfo = orderInfoService.getOrderInfoByOrderInfoIdAndWorkId(sysOrder.getOrderInfoId(), userwork.getWorkId()); + money = sysOrder.getMoney(); + orderInfo.setStatus("1"); orderInfo.setRefundTime(DateUtils.getNowDate()); orderInfoService.updateOrderInfo(orderInfo); @@ -317,7 +321,7 @@ public class dailySysServer { SysUserNotification sysUserNotification = new SysUserNotification(); sysUserNotification.setUserId(userwork.getUserId()); sysUserNotification.setSenderId(1L); - sysUserNotification.setDetail("您购买的"+sysSource.getScenic()+sysSource.getPart()+String.format("%02d", sysSource.getcX())+String.format("%02d", sysSource.getcY())+"资源位已退款"); + sysUserNotification.setDetail("尊敬的创作者,您提交的作品<<"+userwork.getWorkName()+">>作品未在规定时间内通过审核，已原路退款"+money+"元。"); sysUserNotification.setType("4"); sysUserNotification.setStatus("0"); userNotificationService.insertSysUserNotification(sysUserNotification); @@ -412,7 +416,7 @@ public class dailySysServer { SysUserNotification sysUserNotification = new SysUserNotification(); sysUserNotification.setUserId(receiveUserId); sysUserNotification.setSenderId(0L); - sysUserNotification.setDetail("你的作品将在24小时后结束展示"); + sysUserNotification.setDetail(String.format("<<%s>>将于24小时后结束展示，请及时关注作品状态。", userWork.getWorkName())); // 24小时临期消息 sysUserNotification.setType("7"); sysUserNotification.setStatus("0");