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

优化结算订单逻辑

Browse Source
This commit is contained in:
Guoqs
2025-03-26 19:37:05 +08:00
parent 5fc11ac45d
commit 063c4f494f
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,8 +149,6 @@ public abstract class AbstractProgramLogic implements InitializingBean {
*/ */
public abstract void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo); public abstract void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo);
public abstract void settleOrderV2(TransactionRecordsData data, OrderBasicInfo orderBasicInfo);
/** /**
* 电单车结算逻辑 * 电单车结算逻辑
* @param message * @param message

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

@@ -454,8 +454,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
/** /**
* 订单结算/结算订单逻辑/订单结算逻辑 * 订单结算/结算订单逻辑/订单结算逻辑
*/ */
@Override public void settleOrderOld(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
logger.info("【{}】-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo)); logger.info("【{}】-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo));
// 判断订单状态 // 判断订单状态
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) { if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
@@ -528,7 +527,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
* 订单结算/结算订单逻辑/订单结算逻辑 * 订单结算/结算订单逻辑/订单结算逻辑
*/ */
@Override @Override
public void settleOrderV2(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) { public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
logger.info("【{}】-结算订单V2start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo)); logger.info("【{}】-结算订单V2start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo));
// 判断订单状态 // 判断订单状态
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) { if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {

4
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
View File

@@ -421,10 +421,6 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSON.toJSONString(dto)); logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSON.toJSONString(dto));
} }
@Override
public void settleOrderV2(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
}
@Override @Override
public void settleOrderForEBike(EBikeMessageCmd03 message, OrderBasicInfo orderBasicInfo) { public void settleOrderForEBike(EBikeMessageCmd03 message, OrderBasicInfo orderBasicInfo) {