diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 4ae028d53..2fdaee54f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -16,7 +16,6 @@ import com.jsowell.adapay.service.AdapayService; import com.jsowell.adapay.vo.OrderSplitResult; import com.jsowell.adapay.vo.PaymentInfo; import com.jsowell.common.annotation.CostTime; -import com.jsowell.common.constant.RabbitConstants; import com.jsowell.common.core.domain.ykc.TransactionRecordsData; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.adapay.AdapayStatusEnum; @@ -916,6 +915,9 @@ public class TempService { } logger.info("testSettleOrderLogicV2, orderCode:{}, data:{}", orderCode, JSON.toJSONString(data)); + if (data != null) { + testSettleOrderLogic(data, orderBasicInfo); + } } public void testSettleOrderLogic(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) { @@ -937,7 +939,7 @@ public class TempService { OrderTransactionDTO dto = new OrderTransactionDTO(); dto.setOrderBasicInfo(orderBasicInfo); dto.setOrderDetail(orderDetail); - transactionService.doUpdateOrder(dto); + // transactionService.doUpdateOrder(dto); // 组装after参数 AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder() @@ -953,7 +955,8 @@ public class TempService { .orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) // 服务费折扣金额 .orderRefundAmount(orderBasicInfo.getRefundAmount()) // 退款金额 .build(); - rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO); + logger.info("testSettleOrderLogic, afterSettleOrderDTO:{}", JSON.toJSONString(afterSettleOrderDTO)); + // rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO); } }