From 6acf94acb5356ee83e4221c3933e5f91fb17eced Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Sat, 1 Nov 2025 14:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/shop/order/listener/OrderPayedListener.java | 7 ++++--- .../shop/order/service/impl/ShopOrderInfoServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java index 9787b2a1..8ba50cb9 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java @@ -187,12 +187,13 @@ public class OrderPayedListener { continue; } - // 同城配送或普通快递，都发送 unipush 推送：您有一个新的订单，请查收！ + // 同城配送或普通快递，都发送 unipush 推送：您有一个新的[同城][预约]订单，请及时拣货配送[请及时查看预约订单]。 String bookingTip = isBookingOrder ? "预约" : ""; + String bookingTiP2 = isBookingOrder ? "请及时查看预约订单。" : "请及时拣货配送。"; String orderType = orderInfoOld.getDelivery_type_id() == StateCode.DELIVERY_TYPE_SAME_CITY ? "同城" + bookingTip : bookingTip; - String title = String.format("您有一笔新的%s订单，请注意查收。", orderType); - String content = String.format("这笔新的%s订单：%s，用户于%s下的单，请注意查收。", orderType, orderId, DateTimeUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss")); + String title = String.format("您有一笔新的%s订单，%s", orderType, bookingTiP2); + String content = String.format("这笔新的%s订单：%s，用户于%s下的单，%s", orderType, orderId, DateTimeUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss"), bookingTiP2); JSONObject payload = new JSONObject(); payload.put("category", CommonConstant.PUSH_MSG_CATE_MCH_ONLINE_ORDER_LIST); payload.put("orderId", orderId); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java index f7e63ebc..6cecc67f 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java @@ -991,8 +991,8 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl