autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-14 12:20:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 重构

Browse Source
This commit is contained in:
Guoqs
2024-11-29 13:33:12 +08:00
parent 5f580b3930
commit c09d43f164
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java
View File

@@ -1,6 +1,5 @@
package com.jsowell.mq; package com.jsowell.mq;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.jsowell.common.constant.RabbitConstants; import com.jsowell.common.constant.RabbitConstants;
import com.jsowell.pile.dto.AfterSettleOrderDTO; import com.jsowell.pile.dto.AfterSettleOrderDTO;
import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.OrderBasicInfoService;
@@ -30,11 +29,11 @@ public class OrderRabbitListener {
public void receiveChargeOrderData(AfterSettleOrderDTO afterSettleOrderDTO, Channel channel, Message message) throws IOException { public void receiveChargeOrderData(AfterSettleOrderDTO afterSettleOrderDTO, Channel channel, Message message) throws IOException {
log.info("接收到订单结算数据：{}", afterSettleOrderDTO); log.info("接收到订单结算数据：{}", afterSettleOrderDTO);
try { // try {
orderBasicInfoService.realTimeOrderSplit(afterSettleOrderDTO); // orderBasicInfoService.realTimeOrderSplit(afterSettleOrderDTO);
} catch (BaseAdaPayException e) { // } catch (BaseAdaPayException e) {
throw new RuntimeException(e); // throw new RuntimeException(e);
} // }
//由于配置设置了手动应答，所以这里要进行一个手动应答。注意：如果设置了自动应答，这里又进行手动应答，会出现double ack，那么程序会报错。 //由于配置设置了手动应答，所以这里要进行一个手动应答。注意：如果设置了自动应答，这里又进行手动应答，会出现double ack，那么程序会报错。
channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -479,7 +479,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
transactionService.doUpdateOrder(dto); transactionService.doUpdateOrder(dto);
// 订单退款 // 订单退款
refundOrder(orderBasicInfo); // refundOrder(orderBasicInfo);
// 组装after参数 // 组装after参数
AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder() AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()