update

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

@@ -10,6 +10,7 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Controllers\Controller;
 use App\Models\Area;
+use App\Models\Banner;
 use App\Models\HelpInfo;
 use App\Models\Icons;
 use App\Models\Order;
@@ -307,12 +308,9 @@ class CommonController extends Controller
     public function configList()
     {
         $systemConfig = SystemConfig::whereIn('key', ['phone_notice', 'chat_notice', 'clinic_notice', 'vaccine_notice', 'nurse_notice', 'poster', 'phone', 'protocol', 'recharge_notice', 'service_protocol', 'login_protocol', 'recharge_protocol'])->pluck('value', 'key')->toArray();
+        $banners = Banner::get();
         $data = [
-            'banners' => [
-                'https://t5.9026.com/img/banner1.png',
-                'https://t5.9026.com/img/banner2.png',
-                'https://t5.9026.com/img/banner3.png',
-            ],
+            'banners' => $banners,
             'notices' => [
                 '宝妈小程序正式公测上线啦！',
             ],

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

@@ -151,6 +151,11 @@ class OrderController extends AuthController
         $payment_amount = $req['total_amount'] - $discount_amount;
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
+        //疫苗和儿保订单未结束时不能再次下单
+        if (in_array($req['product_type'], [4,5]) && Order::whereIn('product_type', [4,5])->where('user_id', $user['id'])->whereIn('order_status', [2,3])->exists()) {
+            return out(null, 10012, '您已经下过'.config('config.product_type_map')[$req['product_type']].'订单，并且订单还未完成');
+        }
+
         //检查号源
         if ($product_type == 3) {
             $schedulePeriod = SchedulePeriod::where('docter_id', $req['docter_id'])->where('time_period_id', $req['time_period_id'])->where('schedule_date', $req['schedule_date'])->where('schedule_type', 1)->first();

app/Models/Order.php

@@ -363,6 +363,10 @@ class Order extends BaseModel
             }
         }
         elseif (in_array($product_type, [4,5])) {
+            if (Order::whereIn('product_type', [4,5])->where('user_id', $order['user_id'])->whereIn('order_status', [2,3])->exists()) {
+                exit_out(null, 10012, '您已经下过'.config('config.product_type_map')[$product_type].'订单，并且订单还未完成');
+            }
+
             $schedule_date = date('Y-m-d', $order['order_patient']['appoint_start_time']);
             $schedule_type_map = [4 => 2, 5 => 3];
             $schedulePeriod = SchedulePeriod::where('time_period_id', $order['order_patient']['time_period_id'])->where('schedule_date', $schedule_date)->where('organization_id', $order['organization_id'])->where('schedule_type', $schedule_type_map[$product_type])->first();

config/config.php

@@ -488,7 +488,7 @@ return [
                     'value' => '%s',
                 ],
                 'thing8' => [
-                    'value' => '你有一笔%s咨询订单已成功下单，请耐心等待',
+                    'value' => '你的%s订单已成功下单，请耐心等待',
                 ],
                 'amount10' => [
                     'value' => '%s',
@@ -511,7 +511,7 @@ return [
                     'value' => '%s',
                 ],
                 'thing8' => [
-                    'value' => '您有一笔%s咨询订单已成功下单，请耐心等待',
+                    'value' => '你的%s订单已成功下单，请耐心等待',
                 ],
                 'amount10' => [
                     'value' => '%s',
@@ -606,7 +606,7 @@ return [
                     'value' => '已开通',
                 ],
                 'thing3' => [
-                    'value' => '点击“详情”进入小程序查看服务包详情信息',
+                    'value' => '服务包已开通，有任何疑问请联系客服人员',
                 ],
             ],
         ],
@@ -629,7 +629,7 @@ return [
                     'value' => date('Y-m-d H:i:s'),
                 ],
                 'thing4' => [
-                    'value' => '如有已支付的款项会退回账户，有任何疑问请联系客服人员',
+                    'value' => '如有已支付的款项会退回账户，注意查收',
                 ],
             ],
         ],
@@ -652,7 +652,7 @@ return [
                     'value' => '已开通',
                 ],
                 'thing3' => [
-                    'value' => '点击“详情”进入小程序查看服务包详情信息',
+                    'value' => '服务包即将失效，请及时续费服务',
                 ],
             ],
         ],
@@ -675,8 +675,7 @@ return [
                     'value' => '已失效',
                 ],
                 'thing3' => [
-                    'value' => '点击“详情”进入小程序查看服务包详情信息
-',
+                    'value' => '服务包已到期，请重新下单购买服务',
                 ],
             ],
         ],