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

修改极光推送条件

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

@@ -440,7 +440,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.getId(), null);
             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

@@ -1280,7 +1280,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         List<Long> adminUsers = adminUserService.getUserIdsByShop(order.getShopId());
         for (Long adminUser : adminUsers) {
             List<String> userRsgIds = memberUserService.getUserRsgIds(adminUser, null);
-            if (userRsgIds != null) {
+            if (userRsgIds != null && !userRsgIds.isEmpty()) {
                 String url = jPushUtils.getUrl(title, order.getId(), adminUser);
                 RequestBody requestBody = jPushUtils.getRequestBody(userRsgIds, alert, title, url);
                 jPushUtils.jPush(requestBody, order.getUserId(), adminUser, order.getId());

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/merchantapply/MerchantApplyServiceImpl.java

@@ -248,7 +248,7 @@ public class MerchantApplyServiceImpl implements MerchantApplyService {
         alert += "\n审核时间: " + LocalDateTime.now().format(formatter);
 
         List<String> userRsgIds = memberUserService.getUserRsgIds(null, merchantApply.getApplyMemberUserId());
-        if (userRsgIds != null) {
+        if (userRsgIds != null && !userRsgIds.isEmpty()) {
             String url = jPushUtils.getUrl(title, merchantApply.getId(), null);
             RequestBody requestBody = jPushUtils.getRequestBody(userRsgIds, alert, title, url);
             jPushUtils.jPush(requestBody, merchantApply.getApplyMemberUserId(), null, merchantApply.getId());
@@ -294,7 +294,7 @@ public class MerchantApplyServiceImpl implements MerchantApplyService {
             return;
         }
         List<String> userRsgIds = memberUserService.getUserRsgIds(sentSystemUserId, null);
-        if (userRsgIds != null) {
+        if (userRsgIds != null && !userRsgIds.isEmpty()) {
             String url = jPushUtils.getUrl(title, merchantApply.getId(), sentSystemUserId);
             RequestBody requestBody = jPushUtils.getRequestBody(userRsgIds, alert, title, url);
             jPushUtils.jPush(requestBody, merchantApply.getApplyMemberUserId(), sentSystemUserId, merchantApply.getId());