|
|
@@ -69,7 +69,6 @@ public class GiftOrderService {
|
|
|
private GeneralProperties generalProperties;
|
|
|
private SnowflakeIdWorker snowflakeIdWorker;
|
|
|
private ErrorOrderRepo errorOrderRepo;
|
|
|
- private GiftOrderService giftOrderService;
|
|
|
|
|
|
@Transactional
|
|
|
public GiftOrder gift(Long userId, Long assetId, Long toUserId) {
|
|
|
@@ -226,7 +225,8 @@ public class GiftOrderService {
|
|
|
}
|
|
|
GiftOrder order = giftOrderRepo.findById(id).orElseThrow(new BusinessException("订单不存在"));
|
|
|
if (order.getGasPrice().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
- giftOrderService.giftNotify(id, PayMethod.ALIPAY, id.toString());
|
|
|
+ giftNotify(id, PayMethod.ALIPAY, id.toString());
|
|
|
+ return order;
|
|
|
}
|
|
|
User invitor = null;
|
|
|
if (order.getStatus() != OrderStatus.NOT_PAID) {
|
