Merge remote-tracking branch 'origin/dev' into dev

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/OrderExpirationServiceImpl.java

@@ -185,14 +185,14 @@ public class OrderExpirationServiceImpl implements OrderExpirationService, Comma
                 log.info("訂單退款成功，訂單no: {}", orderNo);
 
                 //同意退款通知
-                LifeNotice lifeNotice = buildLifeNotice(order, "同意退款通知", "您的编号为" + orderNo + "的订单，律师已同意您的退款申请，订单金额将在1-3个工作日原路返还，请注意查收。");
+                LifeNotice lifeNotice = buildUserLifeNotice(order, "同意退款通知", "您的编号为" + orderNo + "的订单，律师已同意您的退款申请，订单金额将在1-3个工作日原路返还，请注意查收。");
                 WebSocketVo webSocketVo = buildWebSocketVo(lifeNotice);
 
                 lifeNoticeMapper.insert(lifeNotice);
                 webSocketProcess.sendMessage(lifeNotice.getReceiverId(), JSONObject.from(webSocketVo).toJSONString());
 
                 //退款到账通知
-                LifeNotice lifeNotice2 = buildLifeNotice(order, "退款到账通知", "您的编号为" + orderNo + "的订单，订单金额已原路返还至您的支付渠道，请查收。");
+                LifeNotice lifeNotice2 = buildUserLifeNotice(order, "退款到账通知", "您的编号为" + orderNo + "的订单，订单金额已原路返还至您的支付渠道，请查收。");
                 WebSocketVo webSocketVo2 = buildWebSocketVo(lifeNotice);
                 lifeNotice2.setCreatedTime(DateUtils.calcMinute(lifeNotice.getCreatedTime(), 2));