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

修改极光推送条件

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

@@ -579,7 +579,7 @@ public class AfterSaleServiceImpl implements AfterSaleService {
         alert += "\n时间: " + LocalDateTime.now().format(formatter);
 
         List<String> userRsgIds = memberUserService.getUserRsgIds(null, afterSale.getUserId());
-        if (userRsgIds != null) {
+        if (userRsgIds != null && !userRsgIds.isEmpty()) {
             String url = jPushUtils.getUrl(title, afterSale.getUserId(), afterSale.getId());
             RequestBody requestBody = jPushUtils.getRequestBody(userRsgIds, alert, title, url);
             jPushUtils.jPush(requestBody, afterSale.getUserId(), null, afterSale.getId());

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -509,7 +509,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         alert += "\n产品名称: " + tradeOrderItemMapper.getSupNameByOrderId(order.getId());
 
         List<String> userRsgIds = memberUserService.getUserRsgIds(null, order.getUserId());
-        if (userRsgIds != null) {
+        if (userRsgIds != null && !userRsgIds.isEmpty()) {
             String url = jPushUtils.getUrl(title, order.getUserId(), order.getId());
             RequestBody requestBody = jPushUtils.getRequestBody(userRsgIds, alert, title, url);
             jPushUtils.jPush(requestBody, order.getUserId(), null, order.getId());