app/Console/Commands/Regiment.php

@@ -73,10 +73,12 @@ class Regiment extends Command
                            $regimentRecordList  =   regimentRecord::query()->where('regiment_id','=',$v['id'])->get()->toArray();
                            if ($regimentRecordList){
                                $regimentRecordListIds = array_column($regimentRecordList,'order_id');
+                               $orders_is_pay         = Orders::query()->where('id',$regimentRecordListIds[0])->first()->values('is_pay');
+                               $status                = $orders_is_pay ? 2 : 1;
                                //修改订单
-                               $res         =   Orders::query()->whereIn('id',$regimentRecordListIds)->update(['status'=>1,'update_time'=>$time]);
+                               $res         =   Orders::query()->whereIn('id',$regimentRecordListIds)->update(['status'=>$status,'update_time'=>$time]);
                                if (!$res)   Log::error('run_regiment','修改订单失败');
-                               $res         =   OrdersProduct::query()->whereIn('order_id',$regimentRecordListIds)->update(['status'=>1]);
+                               $res         =   OrdersProduct::query()->whereIn('order_id',$regimentRecordListIds)->update(['status'=>$status]);
                                if (!$res)   Log::error('run_regiment','修改订单产品失败');
                            }
                            //修改状态
@@ -118,10 +120,12 @@ class Regiment extends Command
                     $regimentRecordList  =   regimentRecord::query()->where('regiment_id','=',$v['id'])->get()->toArray();
                     if ($regimentRecordList){
                         $regimentRecordListIds = array_column($regimentRecordList,'order_id');
+                        $orders_is_pay         = Orders::query()->where('id',$regimentRecordListIds[0])->first()->values('is_pay');
+                        $status                = $orders_is_pay ? 2 : 1;
                         //修改订单
-                        $res         =   Orders::query()->whereIn('id',$regimentRecordListIds)->update(['status'=>1]);
+                        $res         =   Orders::query()->whereIn('id',$regimentRecordListIds)->update(['status'=>$status]);
                         if (!$res)   Log::error('run_regiment','修改订单失败');
-                        $res         =   OrdersProduct::query()->whereIn('order_id',$regimentRecordListIds)->update(['status'=>1]);
+                        $res         =   OrdersProduct::query()->whereIn('order_id',$regimentRecordListIds)->update(['status'=>$status]);
                         if (!$res)   Log::error('run_regiment','修改订单产品失败');
                     }
                 }else{

app/Http/Controllers/Api/ShopCart.php

@@ -208,7 +208,7 @@ class ShopCart extends Api{
             if ($payCity && $payCity['city_ids']) {
                 $cityIds = explode(',',$payCity['city_ids']);
                 foreach ($allowCity as $item) {
-                    if ($item == 1 || in_array($item,$cityIds))     $isPay                  = 1;
+                    if (($item == 1 || in_array($item,$cityIds)) && in_array($custom['city_id'],$cityIds))     $isPay                  = 1;
                 }
             }
             $value['is_pay']        = $isPay;

resources/views/admin/regiment_record/index.blade.php

@@ -70,6 +70,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 								@if( $a['status'] == 3 )
 									拼团失败
 								@endif
+								@if( $a['status'] == 3 )
+									拼团待支付
+								@endif
 							</td>
 							<td> {{date('Y/m/d H:i:s',$a['insert_time'])}}</td>
 						</tr>