Merge branch 'master' into develop

app/Models/Order.php

@@ -259,7 +259,7 @@ class Order extends BaseModel
         $updateOrder = ['order_status' => 5, 'order_notes' => $order_notes];
         if ($order['payment_status'] > 1) {
             //判断是余额支付还是服务包支付
-            if ($order['payment_type'] == 2) {
+            if ($order['payment_type'] == 3) {
                 //退服务包的次数
                 $map = [1 => 'phone_minutes', 2 => 'chat_num', 3 => 'appoint_num', 4 => 'vaccine_limit_amount', 5 => 'nurses_limit_amount'];
                 $addNum = $order['product_type'] == 1 ? 10 : 1;