Merge branch 'dev/2024/0822/update-app-Y' of Harper/feifan-backend-zx-app into master

更新极光推送通知到系统用户异常

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -338,10 +338,10 @@ public class AfterSaleServiceImpl implements AfterSaleService {
      * @param afterStatus 售后状态
      */
     private void sentJPush(AfterSaleDO afterSale, String afterStatus) {
-        String title = WcChatMessageTemplateIdEnum.AFTER_SALE_CHECK2.getName();
+        String title = WcChatMessageTemplateIdEnum.AFTER_SALE_NO_CHECK2.getName();
 
         String alert = "售后订单号: " + afterSale.getNo();
-        alert += "\n商品名称: " + afterSale.getSpuName();
+        alert += "\n用户昵称: " + memberUserService.getUser(afterSale.getUserId()).getNickname();
         DecimalFormat df = new DecimalFormat("0.00");
         String formattedPrice = df.format((double) afterSale.getRefundPrice() / 100);
         alert += "\n金额: ￥ " + formattedPrice;
@@ -355,7 +355,7 @@ public class AfterSaleServiceImpl implements AfterSaleService {
             // 如果没有权限就不用发送了
             Boolean havePermission = jPushUtils.isHavePermission(adminUser, title);
             if(!havePermission){
-                return;
+                continue;
             }
             List<String> userRsgIds = memberUserService.getUserRsgIds(adminUser, null);
             if (userRsgIds != null && !userRsgIds.isEmpty()) {