From 6a1f8ff077aa861415bea8fb832bbc9490ae7dfc Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 11 Sep 2020 15:25:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/PaymentService.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Service/v3/Implementations/PaymentService.php b/app/Service/v3/Implementations/PaymentService.php
index 58b25b5..dff2b8d 100644
--- a/app/Service/v3/Implementations/PaymentService.php
+++ b/app/Service/v3/Implementations/PaymentService.php
@@ -130,12 +130,8 @@ class PaymentService implements PaymentServiceInterface
             if ($result['return_code'] == 'SUCCESS' && isset($result['result_code']) && $result['result_code'] == "SUCCESS") {
                 return true;
             } else {
-               throw new ErrorCodeException(ErrorCode::PAYMENT_FAIL);
+               throw new ErrorCodeException(ErrorCode::PAYMENT_FAIL,$result['err_code_des']);
             }
-
-
-
-            return $result;
         } catch (\Exception $e) {
             $this->log->event(LogLabel::ORDER_PAYMENT_LOG, ['payment_do_exception_msg' => $e->getMessage()]);
             throw new ErrorCodeException(ErrorCode::PAYMENT_FAIL, '[退款失败]'.$e->getMessage());

From 2b0bab249140ff568084576d56b09785bfb8b27d Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Fri, 11 Sep 2020 15:28:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=BD=93=E9=9D=A2?=
 =?UTF-8?q?=E4=BB=98=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/v3/OrderMain.php                          | 9 +++++++++
 app/Service/v3/Implementations/OrderListService.php | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Model/v3/OrderMain.php b/app/Model/v3/OrderMain.php
index c3abfc8..3e2c185 100644
--- a/app/Model/v3/OrderMain.php
+++ b/app/Model/v3/OrderMain.php
@@ -91,6 +91,15 @@ class OrderMain extends Model
         return Shipping::getMessage($this->attributes['shipping_type']);
     }
 
+    public function getNoteAttribute($value)
+    {
+        if ($this->attributes['refuse_refund_note'] || $this->attributes['total_refund_note']) {
+               return $this->attributes['refuse_refund_note'] ?: $this->attributes['total_refund_note'];
+        }
+
+        return $value;
+    }
+
     public function market()
     {
         return $this->belongsTo(Market::class, 'market_id', 'id');
diff --git a/app/Service/v3/Implementations/OrderListService.php b/app/Service/v3/Implementations/OrderListService.php
index db7f6c7..99bae87 100644
--- a/app/Service/v3/Implementations/OrderListService.php
+++ b/app/Service/v3/Implementations/OrderListService.php
@@ -161,7 +161,8 @@ class OrderListService implements OrderListServiceInterface
             ->with(['orders' => function($query) {
                 $query->with('store');
             }])
-            ->where(['user_id' => $userId, 'type' => OrderType::OFFLINE]);
+            ->where(['user_id' => $userId, 'type' => OrderType::OFFLINE])
+            ->whereIn('state', [OrderState::PAID,OrderState::DELIVERY,OrderState::COMPLETED]);
 
         $paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize);
         $orders = $paginate->toArray();