autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-15 07:18:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 调试结算订单逻辑

Browse Source
This commit is contained in:
Guoqs
2025-03-26 21:23:47 +08:00
parent fc47ccf1c4
commit 74a820b3fe
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -16,7 +16,6 @@ import com.jsowell.adapay.service.AdapayService;
import com.jsowell.adapay.vo.OrderSplitResult; import com.jsowell.adapay.vo.OrderSplitResult;
import com.jsowell.adapay.vo.PaymentInfo; import com.jsowell.adapay.vo.PaymentInfo;
import com.jsowell.common.annotation.CostTime; 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.domain.ykc.TransactionRecordsData;
import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.adapay.AdapayStatusEnum; import com.jsowell.common.enums.adapay.AdapayStatusEnum;
@@ -916,6 +915,9 @@ public class TempService {
} }
logger.info("testSettleOrderLogicV2, orderCode:{}, data:{}", orderCode, JSON.toJSONString(data)); logger.info("testSettleOrderLogicV2, orderCode:{}, data:{}", orderCode, JSON.toJSONString(data));
if (data != null) {
testSettleOrderLogic(data, orderBasicInfo);
}
} }
public void testSettleOrderLogic(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) { public void testSettleOrderLogic(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
@@ -937,7 +939,7 @@ public class TempService {
OrderTransactionDTO dto = new OrderTransactionDTO(); OrderTransactionDTO dto = new OrderTransactionDTO();
dto.setOrderBasicInfo(orderBasicInfo); dto.setOrderBasicInfo(orderBasicInfo);
dto.setOrderDetail(orderDetail); dto.setOrderDetail(orderDetail);
transactionService.doUpdateOrder(dto); // transactionService.doUpdateOrder(dto);
// 组装after参数 // 组装after参数
AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder() AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()
@@ -953,7 +955,8 @@ public class TempService {
.orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) // 服务费折扣金额 .orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) // 服务费折扣金额
.orderRefundAmount(orderBasicInfo.getRefundAmount()) // 退款金额 .orderRefundAmount(orderBasicInfo.getRefundAmount()) // 退款金额
.build(); .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);
} }
} }