From 908f9f54e63358fa66b5163524e5c00512a3652c Mon Sep 17 00:00:00 2001 From: devil Date: Wed, 19 Aug 2020 22:52:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/GoodsService.php | 2 +- application/service/OrderAftersaleService.php | 2 +- application/service/PaymentService.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 58561c124..5c28a2d92 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -396,7 +396,7 @@ class GoodsService if(empty($v['images'])) { // 获取商品封面图片 - $v['images'] = ResourcesService::AttachmentPathHandle(self::GoodsImagesCoverHandle($v['id'], $v['photo'])); + $v['images'] = ResourcesService::AttachmentPathHandle(self::GoodsImagesCoverHandle($v['id'], isset($v['photo']) ? $v['photo'] : [])); } $v['images_old'] = $v['images']; $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); diff --git a/application/service/OrderAftersaleService.php b/application/service/OrderAftersaleService.php index 74945485e..ee512348b 100644 --- a/application/service/OrderAftersaleService.php +++ b/application/service/OrderAftersaleService.php @@ -842,7 +842,7 @@ class OrderAftersaleService } // 订单支付方式校验 - $pay_log = Db::name('PayLog')->alias('pl')->join(['__PAY_LOG_VALUE__'=>'plv'], 'pl.id=plv.pay_log_id')->where(['plv.business_id'=>$order['data']['id'], 'pl.business_type'=>OrderService::$business_type_name])->field('pl.*')->find(); + $pay_log = Db::name('PayLog')->alias('pl')->join(['__PAY_LOG_VALUE__'=>'plv'], 'pl.id=plv.pay_log_id')->where(['plv.business_id'=>$order['data']['id'], 'pl.business_type'=>OrderService::$business_type_name, 'pl.status'=>1])->field('pl.*')->find(); // 手动处理不校验支付日志 if($params['refundment'] != 2) diff --git a/application/service/PaymentService.php b/application/service/PaymentService.php index 6a44f630c..f3a7e3c4e 100755 --- a/application/service/PaymentService.php +++ b/application/service/PaymentService.php @@ -260,7 +260,7 @@ class PaymentService $name = null; if(!empty($business_value)) { - $name = Db::name('PayLog')->alias('pl')->join(['__PAY_LOG_VALUE__'=>'plv'], 'pl.id=plv.pay_log_id')->where(['business_id|business_no'=>$business_value])->value('pl.payment_name'); + $name = Db::name('PayLog')->alias('pl')->join(['__PAY_LOG_VALUE__'=>'plv'], 'pl.id=plv.pay_log_id')->where(['business_id|business_no'=>$business_value])->order('pl.id desc')->value('pl.payment_name'); if(empty($anme) && !empty($payment_id)) { $name = Db::name('Payment')->where(['id'=>intval($payment_id)])->value('name'); -- GitLab