Merge remote-tracking branch 'origin/master' into wjh

ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderServiceImpl.java

@@ -784,7 +784,10 @@ public class OrderServiceImpl implements OrderService {
             refundDto.setUserId(dto.getUserId());
             refundDto.setUserName(dto.getUserName());
             refundDto.setType(type);
-            return payService.refund(refundDto);
+            int refund = payService.refund(refundDto);
+            ServiceUtil.assertion(refund != 1, "ID为%s的支付退款失败，请联系管理员处理", refundDto.getId());
+
+            return refund;
         });
 
         return result == null ? 0 : result;