Merge remote-tracking branch 'origin/master'

app/common/logic/PayNotifyLogic.php

@@ -135,6 +135,7 @@ class PayNotifyLogic extends BaseLogic
         $order->transaction_id = $extra['transaction_id'] ?? '';
         $order->pay_status = PayEnum::ISPAID;
         $order->pay_time = time();
+        $order->shop_order_type = 2;
         $order->save();
     }
 

app/common/service/pay/WorkerWeChatPayService.php

@@ -192,6 +192,7 @@ class WorkerWeChatPayService extends BasePayService
         $server = $this->app->getServer();
         // 支付通知
         $server->handlePaid(function (Message $message) {
+            Log::write(json_encode($message,JSON_UNESCAPED_UNICODE));
             if ($message['trade_state'] === 'SUCCESS') {
                 $extra['transaction_id'] = $message['transaction_id'];
                 $attach = $message['attach'];

app/workerapi/controller/PayController.php

@@ -65,7 +65,6 @@ class PayController extends \app\workerapi\controller\BaseApiController
      */
     public function notifyMnp()
     {
-        Log::write(json_encode($this->request->param(), JSON_UNESCAPED_UNICODE));
         return (new WorkerWeChatPayService(UserTerminalEnum::WECHAT_MMP))->notify();
     }
 }

app/workerapi/logic/shops/ShopOrderLogic.php

@@ -92,7 +92,7 @@ class ShopOrderLogic extends BaseLogic
                 'paw_way' => 2,
                 'order_terminal' => $params['terminal'],
                 'amount_total' => $amount_total,
-                'amount' => $amount,
+                'order_amount' => $amount,
             ]);
 
             //生成订单商品镜像