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

update 新的结算方法

Browse Source
This commit is contained in:
Guoqs
2025-03-06 16:31:59 +08:00
parent 14c12227b5
commit ddba59129d
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ public class OrderRabbitListener {
*/ */
@RabbitListener(queues = RabbitConstants.QUEUE_CHARGE_ORDER_DATA) @RabbitListener(queues = RabbitConstants.QUEUE_CHARGE_ORDER_DATA)
public void receiveChargeOrderData(AfterSettleOrderDTO afterSettleOrderDTO, Channel channel, Message message) throws IOException { public void receiveChargeOrderData(AfterSettleOrderDTO afterSettleOrderDTO, Channel channel, Message message) throws IOException {
log.info("接收到订单结算数据:{}", JSON.toJSONString(afterSettleOrderDTO)); log.info("realTimeOrderSplit-接收到订单结算数据:{}, 开始执行新分账方法", JSON.toJSONString(afterSettleOrderDTO));
// 2025年2月18日09点18分全部订单改为实时分账 // 2025年2月18日09点18分全部订单改为实时分账
// List<String> newLogicStationIdList = YKCUtils.getNewLogicStationIdList(); // List<String> newLogicStationIdList = YKCUtils.getNewLogicStationIdList();
@@ -37,7 +37,7 @@ public class OrderRabbitListener {
// return; // return;
// } // }
log.info("realTimeOrderSplit-订单{}开始执行新分账方法", afterSettleOrderDTO.getOrderCode()); // log.info("realTimeOrderSplit-订单{}开始执行新分账方法", afterSettleOrderDTO.getOrderCode());
try { try {
orderBasicInfoService.realTimeOrderSplit(afterSettleOrderDTO); orderBasicInfoService.realTimeOrderSplit(afterSettleOrderDTO);
} catch (BaseAdaPayException e) { } catch (BaseAdaPayException e) {

15
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1927,14 +1927,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
} }
} }
// 订单结算金额，汇付分账
try {
splittingMethod(afterSettleOrderDTO);
} catch (Exception e) {
logger.error("realTimeOrderSplit-订单:{}, 订单结算金额，汇付分账异常", afterSettleOrderDTO.getOrderCode(), e);
return null;
}
// 订单退款，汇付退款 // 订单退款，汇付退款
try { try {
refundMethod(afterSettleOrderDTO); refundMethod(afterSettleOrderDTO);
@@ -1942,6 +1934,13 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
logger.error("realTimeOrderSplit-订单:{}, 订单退款，汇付退款异常", afterSettleOrderDTO.getOrderCode(), e); logger.error("realTimeOrderSplit-订单:{}, 订单退款，汇付退款异常", afterSettleOrderDTO.getOrderCode(), e);
} }
// 订单结算金额，汇付分账
try {
splittingMethod(afterSettleOrderDTO);
} catch (Exception e) {
logger.error("realTimeOrderSplit-订单:{}, 订单结算金额，汇付分账异常", afterSettleOrderDTO.getOrderCode(), e);
}
// 组装结果集 // 组装结果集
OrderSplitResult result = new OrderSplitResult(); OrderSplitResult result = new OrderSplitResult();
result.setOrderCode(afterSettleOrderDTO.getOrderCode()); result.setOrderCode(afterSettleOrderDTO.getOrderCode());