Merge branch 'dev' of wangqifan/nanjing_nft into master

src/main/java/com/izouma/nineth/service/GiftOrderService.java

@@ -226,7 +226,7 @@ public class GiftOrderService {
         GiftOrder order = giftOrderRepo.findById(id).orElseThrow(new BusinessException("订单不存在"));
         if (order.getGasPrice().compareTo(BigDecimal.ZERO) == 0) {
             giftNotify(id, PayMethod.ALIPAY, id.toString());
-            return order;
+            return order.getId().toString();
         }
         User invitor = null;
         if (order.getStatus() != OrderStatus.NOT_PAID) {