diff --git a/app/Amqp/Consumer/Refund/GoodOrderRefundFinishConsumer.php b/app/Amqp/Consumer/Refund/GoodOrderRefundFinishConsumer.php index ab20543..bc34516 100644 --- a/app/Amqp/Consumer/Refund/GoodOrderRefundFinishConsumer.php +++ b/app/Amqp/Consumer/Refund/GoodOrderRefundFinishConsumer.php @@ -52,7 +52,7 @@ class GoodOrderRefundFinishConsumer extends ConsumerMessage try { $service = new RefundGoodOrderFinishService(); - $service->orderSno = $data['order_sno']; + $service->orderSno = $data['refund_order_sno']; $service->payType = (int)$data['pay_type']; $service->callbackData = $data['callback_data']; $service->orderType = OrderCode::ORDER_TYPE_GOOD; diff --git a/app/Service/Common/Pay/Wx/WxJsRechargeBaseService.php b/app/Service/Common/Pay/Wx/WxJsRechargeBaseService.php index de0c24e..04bbc6b 100644 --- a/app/Service/Common/Pay/Wx/WxJsRechargeBaseService.php +++ b/app/Service/Common/Pay/Wx/WxJsRechargeBaseService.php @@ -97,13 +97,13 @@ abstract class WxJsRechargeBaseService implements ThirdPayInterface { $this->setConfig(); -// $this->callbackData = $this->request->all(); - try { - $this->callbackData = $this->ysdPay->wechat($this->config)->callback($this->request)->toArray()['resource']['ciphertext']; - }catch (Exception $e) { - $this->log->debug(__CLASS__.'wxPay回调解密失败'.json_encode($e->getMessage())); - throw new ErrException('wxPay回调解密失败'); - } + $this->callbackData = $this->request->all(); +// try { +// $this->callbackData = $this->ysdPay->wechat($this->config)->callback($this->request)->toArray()['resource']['ciphertext']; +// }catch (Exception $e) { +// $this->log->debug(__CLASS__.'wxPay回调解密失败'.json_encode($e->getMessage())); +// throw new ErrException('wxPay回调解密失败'); +// } if (empty($this->callbackData)) { $this->log->debug(__CLASS__.'wxPay获取回调失败'.json_encode($this->request));