From b0e6cd6219655c9cf480da1fe29140c8f629e3c3 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 30 Dec 2024 14:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E6=96=B0=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E7=AB=99=E7=82=B9=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E7=9A=84,=20=E5=8F=AF=E4=BB=A5=E8=B5=B0=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/programlogic/DelayMerchantProgramLogic.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 288a0a859..cb4b7e487 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -27,6 +27,7 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.AdapayUtil; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; +import com.jsowell.common.util.YKCUtils; import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.pile.domain.*; import com.jsowell.pile.domain.ebike.deviceupload.EBikeMessageCmd03; @@ -478,8 +479,14 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { dto.setOrderDetail(orderDetail); transactionService.doUpdateOrder(dto); + // 不在新分账逻辑站点列表中的, 可以走退款逻辑 + if (!YKCUtils.getNewLogicStationIdList().contains(orderBasicInfo.getStationId())) { + // 订单退款 + refundOrder(orderBasicInfo); + } + // 订单退款 - refundOrder(orderBasicInfo); + // refundOrder(orderBasicInfo); // 组装after参数 AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()