分销可见转仓商品，审核时候提示

app/Http/Controllers/Admin/GoodsController.php

@@ -429,7 +429,7 @@ class GoodsController extends Controller
 
             if($is_fx>0){
                 //如果是分销，不展示没有库存的和白名单的
-                if( ($v['quantity'] <= 0 && $v['is_white'] != 1) || $v['is_not_fx'] == 1){
+                if( $v['quantity'] <= 0 && $v['is_white'] != 1 ){
                     unset($result[$k]); 
                 }
             }

app/Http/Controllers/Admin/OrderController.php

@@ -118,6 +118,8 @@ class OrderController extends Controller
         foreach($result as $k=>&$v){
             //毛利 40%下
             $v['pre_cost_flag'] = 0;
+            //是否需要转仓
+            $v['is_not_fx'] = 0;
             //获取商品信息
             $v['goods'] = '';
             $goods = DB::table('order_goods_skus')->where('order_id', $v['id'])->where('is_del', 0)->get();
@@ -125,12 +127,16 @@ class OrderController extends Controller
                 $v['pre_cost'] = 0;
                 foreach($goods as $item){
                     $goods_name = Goods::where('id', $item->goods_id)->pluck('name');
-                    $goods_sku_info = GoodsSkus::select('propsName', 'is_weigh', 'referenceCost')->where('id', $item->sku_id)->first();
+                    $goods_sku_info = GoodsSkus::select('propsName', 'is_weigh', 'referenceCost', 'is_not_fx')->where('id', $item->sku_id)->first();
                     if(!empty($goods_sku_info)){
                         $props_name = $goods_sku_info->propsName;
                         $is_weigh = $goods_sku_info->is_weigh;
                         $weigh_note = $is_weigh==1 ? '重量(斤)':'数量';
                         if(!$item->gift_id) $v['pre_cost'] += $goods_sku_info->referenceCost * $item->num;
+
+                        if( $goods_sku_info->is_not_fx == 1 && $v['warehouse']==3 && $v['is_not_fx'] == 0 ){
+                            $v['is_not_fx'] = 1;
+                        }
                     }else{
                         $props_name = '';
                         $weigh_note = '数量';

resources/views/order/orderlist.blade.php

@@ -260,7 +260,7 @@
                                             <a id="verify_refuse2" style="text-decoration:none" onClick='refuse_reason2("{{$a['id']}}")' href="javascript:;" title="反审"><span class="btn btn-danger radius">反审</span></a>
                                             @endif
                                         @else
-                                            <a id="verify" style="text-decoration:none" onClick='order_verify("{{$a['id']}}", "{{$item['status']}}", "{{$item['name']}}", "{{$a['pre_cost_flag']}}")' href="javascript:;" title="{{$item['name']}}"><span class="btn btn-primary radius">{{$item['name']}}</span></a>
+                                            <a id="verify" style="text-decoration:none" onClick='order_verify("{{$a['id']}}", "{{$item['status']}}", "{{$item['name']}}", "{{$a['pre_cost_flag']}}", "{{$a['is_not_fx']}}")' href="javascript:;" title="{{$item['name']}}"><span class="btn btn-primary radius">{{$item['name']}}</span></a>
                                         @endif
                                     @endforeach
                                 @endif
@@ -854,8 +854,13 @@
             });
         }
 
-        function order_verify(id, status, name, pre_cost_flag){
-            if( status == 2 && pre_cost_flag==1){
+        function order_verify(id, status, name, pre_cost_flag, is_not_fx){
+            if( status == 2 && is_not_fx==1){
+                if( !confirm('该订单需要转仓，请联系售后管理员！') ){
+                    return false;
+                }
+            }
+            else if( status == 2 && pre_cost_flag==1){
                 if( !confirm('该订单毛利低于<40%, 是否确定订单价格合理？') ){
                     return false;
                 }