update

app/Http/Controllers/Api/V1/OrderController.php

@@ -242,6 +242,9 @@ class OrderController extends AuthController
                 UserCoupon::where('id', $req['user_coupon_id'])->update(['order_id' => $order['id'], 'status' => 2, 'use_time' => time()]);
             }
 
+            //疫苗预约 订单直接完成
+            Order::payCompletedHandle($order['id']);
+
             DB::commit();
         } catch (Exception $e) {
             DB::rollBack();
@@ -505,7 +508,12 @@ class OrderController extends AuthController
             else {
                 $server_name = $order['organization']['name'];
             }
-            $official_arr = [$user['openid'], $order['order_sn'], $keyword2, round($order['total_amount']/100, 2), date('Y-m-d H:i:s', $order['payment_time']), $order['order_patient']['name'], $server_name, $order['order_notes'], config('config.payment_status_map')[$order['payment_status']]];
+
+            $payment_status_text = '';
+            if ($order['product_type'] != 4) {
+                $payment_status_text = '支付状态：'.config('config.payment_status_map')[$order['payment_status']].' ';
+            }
+            $official_arr = [$user['openid'], $order['order_sn'], $keyword2, round($order['total_amount']/100, 2), date('Y-m-d H:i:s', $order['payment_time']), $order['order_patient']['name'], $server_name, $order['order_notes'], $payment_status_text];
             $subscribe_arr = [$user['openid'], $order['order_sn'], $keyword2, $order['order_notes']];
             send_wechat_message(7, $official_arr, $subscribe_arr);
 

config/config.php

@@ -304,7 +304,7 @@ return [
                         'value' => '%s患者在%s的服务终止',
                     ],
                     'remark' => [
-                        'value' => '订单备注：%s; 支付状态：%s; 点击进入小程序查看相关详情，如有疑问，请联系我们',
+                        'value' => '订单备注：%s; %s点击进入小程序查看相关详情，如有疑问，请联系我们',
                     ],
                 ],
             ],