From ac775b0b68f503b88fb4daec3016ff71dfa2d1e3 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 8 Jun 2024 14:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=9B=B8=E5=85=B3=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BB=A3=E7=A0=81,=E5=92=8C=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/PayController.php   | 10 ++++++++++
 app/api/logic/order/OrderLogic.php     |  1 +
 app/common/enum/OrderEnum.php          |  3 +++
 app/common/logic/PayNotifyLogLogic.php | 11 +++++++++--
 app/common/logic/PayNotifyLogic.php    | 25 ++++++++++++++++++++++++-
 5 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/PayController.php b/app/api/controller/PayController.php
index afcc7961..fa468d88 100644
--- a/app/api/controller/PayController.php
+++ b/app/api/controller/PayController.php
@@ -44,6 +44,16 @@ class PayController extends BaseApiController
                         break;
                 }
             }
+        }else{
+            if ($result && $result->event_type == 'REFUND.SUCCESS') {
+                $ciphertext = $result->resource['ciphertext'];
+                if ($ciphertext['refund_status'] === 'SUCCESS') {
+                    //处理订单  -1判断是退的一单还是拆分的订单
+                    PayNotifyLogic::handle('refund', $ciphertext['out_trade_no'], $ciphertext);
+                    $app->wechat->success();
+
+                }
+            }
         }
     }
 
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index f61c16ae..d7434117 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -135,6 +135,7 @@ class OrderLogic extends BaseLogic
                 'vip_price'=>$vipPrice,
                 'total_num' => count($cart_select),//总数
                 'pay_type' => $params['pay_type'] ?? 0,
+                'reservation_time' => $params['reservation_time'] ?? '',
                 'cart_id' => implode(',', $cartId),
                 'store_id' => $params['store_id'] ?? 0,
                 'shipping_type' => $params['shipping_type'] ?? 1//配送方式 1=快递 ，2=门店自提
diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php
index 747e3ae5..35f3e685 100644
--- a/app/common/enum/OrderEnum.php
+++ b/app/common/enum/OrderEnum.php
@@ -101,6 +101,9 @@ class OrderEnum
      * 订单状态
      * @CANCEL_ORDER 取消售后
      */
+    const REFUND_GOODS = -2;
+    const REFUND_PAY = 4;
+
     const CANCEL_ORDER = 5;
 
     //退款状态
diff --git a/app/common/logic/PayNotifyLogLogic.php b/app/common/logic/PayNotifyLogLogic.php
index 99c2aa79..45af10da 100644
--- a/app/common/logic/PayNotifyLogLogic.php
+++ b/app/common/logic/PayNotifyLogLogic.php
@@ -19,8 +19,15 @@ class PayNotifyLogLogic extends BaseLogic
             $model->pay_type = $payType;
             $model->order_sn = $data['out_trade_no'];
             $model->type = $type;
-            $model->amount = $payType == 'wechat_common' ? $data['amount']['payer_total'] : $data['buyer_pay_amount'];
-            $model->out_trade_no = $payType == 'wechat_common' ? $data['transaction_id'] : $data['trade_no'];
+            if($type == PayNotifyLog::TYPE_REFUND){
+                $model->amount = $data['amount']['refund'];
+                $model->out_trade_no = $data['refund_id'];
+            }else{
+                $model->amount = $payType == 'wechat_common' ? $data['amount']['payer_total'] : $data['buyer_pay_amount'];
+                $model->out_trade_no = $payType == 'wechat_common' ? $data['transaction_id'] : $data['trade_no'];
+
+            }
+
             $model->transaction_id = $data['transaction_id'];
             $model->attach = $data['attach'] ?? '';
             if (isset($data['pay_time'])) {
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 2f5a7f3d..8d40b16e 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -6,6 +6,7 @@ use app\common\enum\OrderEnum;
 use app\common\enum\PayEnum;
 use app\common\enum\user\UserShipEnum;
 use app\common\model\dict\DictType;
+use app\common\model\finance\PayNotifyLog;
 use app\common\model\pay\PayNotify;
 use app\common\model\store_finance_flow\StoreFinanceFlow;
 use app\common\model\store_order\StoreOrder;
@@ -31,7 +32,12 @@ class PayNotifyLogic extends BaseLogic
         try {
             if ($action != 'cash_pay' && $action != 'balancePay') {
                 $payNotifyLogLogic = new PayNotifyLogLogic();
-                $payNotifyLogLogic->insert($action, $extra);
+                if($action == 'refund'){
+                    $payNotifyLogLogic->insert($action, $extra,PayNotifyLog::TYPE_REFUND);
+                }else{
+                    $payNotifyLogLogic->insert($action, $extra);
+                }
+
             }
             self::$action($orderSn, $extra);
             Db::commit();
@@ -120,6 +126,23 @@ class PayNotifyLogic extends BaseLogic
         return true;
     }
 
+    //退款
+    public static function refund($orderSn, $extra = [])
+    {
+        //更新状态
+        $order = StoreOrder::where('order_id',$orderSn)->findOrEmpty();
+//        if ($order->isEmpty() || $order->status == OrderEnum::REFUND_PAY) {
+//            return true;
+//        }
+//        $order->status = OrderEnum::REFUND_PAY;
+//        $order->refund_status = OrderEnum::REFUND_STATUS_FINISH;
+//        $order->refund_price = bcdiv($extra['amount']['refund'], 100, 2);
+//        $order->refund_reason_time = time();
+//        $order->refund_num +=  1;
+//        $order->save();
+
+//        self::afterPay($order,$extra['transaction_id']);
+    }
 
     public static function recharge($orderSn, $extra = [])
     {