Merge remote-tracking branch 'origin/master'

app/common/logic/PayNotifyLogic.php

@@ -134,7 +134,6 @@ class PayNotifyLogic extends BaseLogic
         // 更新充值订单状态
         $order->transaction_id = $extra['transaction_id'] ?? '';
         $order->pay_status = PayEnum::ISPAID;
-        $order->paid_amount = $order->order_amount;
         $order->pay_time = time();
         $order->save();
     }

app/common/logic/PaymentLogic.php

@@ -321,8 +321,9 @@ class PaymentLogic extends BaseLogic
      * @return array|false|mixed|string|string[]
      * @throws \Exception
      */
-    public static function shopPay($payWay, $from, $order, $terminal, $redirectUrl)
+    public static function shopPay($payWay, $from, $order, $userInfo, $redirectUrl)
     {
+        $terminal = $userInfo['terminal'];
         // 支付编号-仅为微信支付预置(同一商户号下不同客户端支付需使用唯一订单号)
         $paySn = $order['sn'];
         if ($payWay == PayEnum::WECHAT_PAY) {

app/common/service/pay/WorkerWeChatPayService.php

@@ -108,7 +108,6 @@ class WorkerWeChatPayService extends BasePayService
      */
     public function jsapiPay($from, $order, $appId)
     {
-
         $response = $this->app->getClient()->postJson("v3/pay/transactions/jsapi", [
             "appid" => $appId,
             "mchid" => $this->config['mch_id'],

app/workerapi/controller/shops/OrderController.php

@@ -74,7 +74,7 @@ class OrderController extends BaseApiController
         }
         //支付流程
         $redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
-        $result = PaymentLogic::shopPay($params['pay_way'], 'shop_goods', $order, $this->userInfo['terminal'], $redirectUrl);
+        $result = PaymentLogic::shopPay($params['pay_way'], 'shop_goods', $order, $this->userInfo, $redirectUrl);
         if (false === $result) {
             return $this->fail(PaymentLogic::getError(), $params);
         }