From 542841042c36521918ef21dc55cfbc7c0c84b7f2 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 1 Sep 2023 15:02:54 +0800
Subject: [PATCH] =?UTF-8?q?update=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0=E5=B7=A5=E5=8E=82=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/orderlogic/AbstractOrderLogic.java    | 10 +++-------
 .../service/orderlogic/DelayMerchantOrderLogic.java    |  8 +++-----
 .../service/orderlogic/NotDelayMerchantOrderLogic.java |  8 +++-----
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java
index 1a8e48cbb..0c429a985 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java
@@ -116,21 +116,17 @@ public abstract class AbstractOrderLogic implements InitializingBean {
     /**
      * 订单结算
      */
-    public abstract void orderSettle(TransactionRecordsData data, OrderBasicInfo orderBasicInfo);
-
-    /**
-     * 订单退款
-     */
+    public abstract void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo);
 
     /**
      * 余额支付订单退款
      */
-    public abstract void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo);
+    // public abstract void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo);
 
     /**
      * 在线支付订单退款
      */
-    public abstract void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo);
+    // public abstract void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo);
 
     /**
      * 订单支付成功 支付回调
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java
index 04e35e1c6..154a20e44 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java
@@ -242,7 +242,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
      * 订单结算
      */
     @Override
-    public void orderSettle(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
+    public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
         logger.info("{}-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo));
         // 判断订单状态
         if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
@@ -337,8 +337,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
     /**
      * 余额支付订单退款
      */
-    @Override
-    public void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
+    private void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
         logger.info("{}-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
         // 订单编号
         String orderCode = orderBasicInfo.getOrderCode();
@@ -382,8 +381,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
     /**
      * 在线支付订单退款
      */
-    @Override
-    public void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
+    private void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
         logger.info("{}-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
         // 订单编号
         String orderCode = orderBasicInfo.getOrderCode();
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java
index 32862d12c..f7f40feaf 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java
@@ -225,7 +225,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{
      * @param orderBasicInfo
      */
     @Override
-    public void orderSettle(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
+    public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
         logger.info("{}-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo));
         // 判断订单状态
         if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
@@ -322,8 +322,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{
      *
      * @param orderBasicInfo
      */
-    @Override
-    public void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
+    private void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
         logger.info("{}-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
         // 订单编号
         String orderCode = orderBasicInfo.getOrderCode();
@@ -375,8 +374,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{
      *
      * @param orderBasicInfo
      */
-    @Override
-    public void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
+    private void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
         logger.info("{}-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
         // 订单编号
         String orderCode = orderBasicInfo.getOrderCode();